From b1ce5a80eec2c71c795f95c12ced5427e4dba677 Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Sun, 5 May 2013 22:17:22 +0300 Subject: [PATCH] Revert "vmguest: apply vboxdrv related workaround" This reverts commit ae441691390edbd17a6bb95109f5f87e696ead19 as libglx has been fixed already; see #27340 and #28782 for the details, huge thanks go to Alexey Borisenkov for his thorough investigation and patches as well as to shrek@ and sin@ for their cooperation to get this fixed in Sisyphus. --- features.in/live/live/image-scripts.d/03-services | 1 - features.in/vmguest/config.mk | 1 - 2 files changed, 2 deletions(-) diff --git a/features.in/live/live/image-scripts.d/03-services b/features.in/live/live/image-scripts.d/03-services index 8cb3d7cf..26087854 100755 --- a/features.in/live/live/image-scripts.d/03-services +++ b/features.in/live/live/image-scripts.d/03-services @@ -35,7 +35,6 @@ livecd-setauth livecd-setlocale livecd-net-eth livecd-install-wmaker -livecd-virtualbox-noglx network NetworkManager connman diff --git a/features.in/vmguest/config.mk b/features.in/vmguest/config.mk index e8a5a66b..67457573 100644 --- a/features.in/vmguest/config.mk +++ b/features.in/vmguest/config.mk @@ -6,7 +6,6 @@ use/vmguest: use/vmguest/virtualbox: use/vmguest @$(call add,THE_KMODULES,virtualbox-addition drm) @$(call add,THE_PACKAGES,virtualbox-guest-additions) - @$(call add,THE_PACKAGES,livecd-virtualbox-noglx) ### #28782 # NB: only reasonable for X11-bearing images use/vmguest/kvm: use/vmguest