diff options
Diffstat (limited to 'system/virtualbox-ose-addons/rc.vboxadd.diff')
| -rw-r--r-- | system/virtualbox-ose-addons/rc.vboxadd.diff | 62 |
1 files changed, 36 insertions, 26 deletions
diff --git a/system/virtualbox-ose-addons/rc.vboxadd.diff b/system/virtualbox-ose-addons/rc.vboxadd.diff index 4f5c8fe72eb42..189123c454fe6 100644 --- a/system/virtualbox-ose-addons/rc.vboxadd.diff +++ b/system/virtualbox-ose-addons/rc.vboxadd.diff @@ -1,6 +1,6 @@ ---- vboxadd.sh.orig 2010-03-25 20:54:37.000000000 +0100 -+++ vboxadd.sh 2010-03-27 18:17:26.464988367 +0100 -@@ -310,142 +310,13 @@ +--- tmp/vboxadd.sh 2010-06-25 16:24:10.000000000 +0200 ++++ mnt/progs/slack/test/VirtualBox-3.2.6_OSE/src/VBox/Additions/linux/installer/vboxadd.sh 2010-07-07 15:59:28.710046357 +0200 +@@ -307,152 +307,13 @@ # setup_script setup() { @@ -10,9 +10,9 @@ - find /lib/modules/`uname -r` -name "vboxvideo\.*" 2>/dev/null|xargs rm -f 2>/dev/null - succ_msg - fi -- if find /lib/modules/`uname -r` -name "vboxvfs\.*" 2>/dev/null|grep -q vboxvfs; then -- begin "Removing old VirtualBox vboxvfs kernel module" -- find /lib/modules/`uname -r` -name "vboxvfs\.*" 2>/dev/null|xargs rm -f 2>/dev/null +- if find /lib/modules/`uname -r` -name "vboxsf\.*" 2>/dev/null|grep -q vboxsf; then +- begin "Removing old VirtualBox vboxsf kernel module" +- find /lib/modules/`uname -r` -name "vboxsf\.*" 2>/dev/null|xargs rm -f 2>/dev/null - succ_msg - fi - if find /lib/modules/`uname -r` -name "vboxguest\.*" 2>/dev/null|grep -q vboxguest; then @@ -23,24 +23,31 @@ - begin "Building the VirtualBox Guest Additions kernel modules" - if ! sh /usr/share/$PACKAGE/test/build_in_tmp \ - --no-dkms --no-print-directory > $LOG 2>&1; then -- fail "`printf "Your system does not seem to be set up to build kernel modules.\nLook at $LOG to find out what went wrong"`" -- fi -- echo -- if ! sh /usr/share/$PACKAGE/test_drm/build_in_tmp \ -- --no-dkms --no-print-directory >> $LOG 2>&1; then -- printf "\nYour guest system does not seem to have sufficient OpenGL support to enable\naccelerated 3D effects (this requires Linux 2.6.27 or later in the guest\nsystem). This Guest Additions feature will be disabled.\n\n" +- fail_msg +- printf "Your system does not seem to be set up to build kernel modules.\nLook at $LOG to find out what went wrong. Once you have corrected it, you can\nrun\n\n /etc/init.d/vboxadd setup\n\nto build them." +- BUILDVBOXGUEST="" +- BUILDVBOXSF="" - BUILDVBOXVIDEO="" +- else +- if ! sh /usr/share/$PACKAGE/test_drm/build_in_tmp \ +- --no-dkms --no-print-directory >> $LOG 2>&1; then +- printf "\nYour guest system does not seem to have sufficient OpenGL support to enable\naccelerated 3D effects (this requires Linux 2.6.27 or later in the guest\nsystem). This Guest Additions feature will be disabled.\n\n" +- BUILDVBOXVIDEO="" +- fi - fi -- begin "Building the main Guest Additions module" -- if ! $BUILDVBOXGUEST \ -- --save-module-symvers /tmp/vboxguest-Module.symvers \ -- --no-print-directory install >> $LOG 2>&1; then -- fail "Look at $LOG to find out what went wrong" +- echo +- if [ -n "$BUILDVBOXGUEST" ]; then +- begin "Building the main Guest Additions module" +- if ! $BUILDVBOXGUEST \ +- --save-module-symvers /tmp/vboxguest-Module.symvers \ +- --no-print-directory install >> $LOG 2>&1; then +- fail "Look at $LOG to find out what went wrong" +- fi +- succ_msg - fi -- succ_msg -- if [ -n "$BUILDVBOXVFS" ]; then +- if [ -n "$BUILDVBOXSF" ]; then - begin "Building the shared folder support module" -- if ! $BUILDVBOXVFS \ +- if ! $BUILDVBOXSF \ - --use-module-symvers /tmp/vboxguest-Module.symvers \ - --no-print-directory install >> $LOG 2>&1; then - fail "Look at $LOG to find out what went wrong" @@ -99,10 +106,12 @@ - chcon -u system_u -t mount_exec_t "$lib_path/$PACKAGE/mount.vboxsf" > /dev/null 2>&1 - - succ_msg -- if running_vboxguest || running_vboxadd; then -- printf "You should restart your guest to make sure the new modules are actually used\n\n" -- else -- start +- if [ -n "$BUILDVBOXGUEST" ]; then +- if running_vboxguest || running_vboxadd; then +- printf "You should restart your guest to make sure the new modules are actually used\n\n" +- else +- start +- fi - fi + echo "Not implemented! Please use the virtualbox-kernel-addons.SlackBuild available at SlackBuilds.org instead." } @@ -114,7 +123,7 @@ - DKMS=`which dkms 2>/dev/null` - if [ -n "$DKMS" ]; then - echo "Attempt to remove old DKMS modules..." -- for mod in vboxadd vboxguest vboxvfs vboxvideo; do +- for mod in vboxadd vboxguest vboxvfs vboxsf vboxvideo; do - $DKMS status -m $mod | while read line; do - if echo "$line" | grep -q added > /dev/null || - echo "$line" | grep -q built > /dev/null || @@ -132,11 +141,12 @@ - find /lib/modules -name vboxadd\* | xargs rm 2>/dev/null - find /lib/modules -name vboxguest\* | xargs rm 2>/dev/null - find /lib/modules -name vboxvfs\* | xargs rm 2>/dev/null +- find /lib/modules -name vboxsf\* | xargs rm 2>/dev/null - find /lib/modules -name vboxvideo\* | xargs rm 2>/dev/null - depmod - - # Remove old module sources -- rm -rf /usr/src/vboxadd-* /usr/src/vboxguest-* /usr/src/vboxvfs-* /usr/src/vboxvideo-* +- rm -rf /usr/src/vboxadd-* /usr/src/vboxguest-* /usr/src/vboxvfs-* /usr/src/vboxsf-* /usr/src/vboxvideo-* - - # Remove other files - rm /sbin/mount.vboxsf 2>/dev/null |