Changeset 63889 in vbox

Timestamp:

Sep 19, 2016 2:19:48 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

110759

Message:

bugref:3809: Linux installer maintenance: Additions installer more clean-ups.

Location:

trunk/src/VBox/Additions/linux

Files:

• Makefile.kmk (modified) (6 diffs)
• installer/install.sh.in (modified) (1 diff)
• installer/module-autologon.sh (modified) (1 diff)
• installer/vboxadd-x11.sh (modified) (7 diffs)
• installer/vboxadd.sh (modified) (4 diffs)

trunk/src/VBox/Additions/linux/Makefile.kmk

@@ -42 +42 @@
 VBOX_LNX_ADD_INST_SBIN_DIR        := $(VBOX_LNX_ADD_INST_OUT_DIR)sbin/
 VBOX_LNX_ADD_INST_LIB_DIR         := $(VBOX_LNX_ADD_INST_OUT_DIR)lib/
-VBOX_LNX_ADD_INST_SHARE_DIR       := $(VBOX_LNX_ADD_INST_OUT_DIR)share/
+VBOX_LNX_ADD_INST_OTHER_DIR       := $(VBOX_LNX_ADD_INST_OUT_DIR)other/
 VBOX_LNX_ADD_INST_MOD_DIR         := $(VBOX_LNX_ADD_INST_OUT_DIR)lib/$(VBOX_LNX_ADD_PACKAGE_NAME)/
 VBOX_LNX_ADD_INST_KMOD_DIR        := $(VBOX_LNX_ADD_INST_OUT_DIR)src/
@@ -172 +172 @@
         $(addprefix $(VBOX_LNX_ADD_INST_LIB_DIR),$(VBOX_LNX_ADD_STRIP_LIB)) \
         $(addprefix $(VBOX_LNX_ADD_INST_MOD_DIR),$(VBOX_LNX_ADD_STRIP_MOD)) \
-        $(addprefix $(VBOX_LNX_ADD_INST_MOD_DIR),$(VBOX_LNX_ADD_MOD)) \
+        $(addprefix $(VBOX_LNX_ADD_INST_OTHER_DIR),$(VBOX_LNX_ADD_MOD)) \
         $(addprefix $(VBOX_LNX_ADD_INST_MOD_DIR),$(VBOX_LNX_ADD_STRIP_OBJ)) \
         $(addprefix $(VBOX_LNX_ADD_INST_KMOD_DIR),$(VBOX_LNX_ADD_KMOD_FILES)) \
@@ -310 +310 @@
 
 INSTALLS += lnx_add_inst-exec
-lnx_add_inst-exec_INST     = $(VBOX_LNX_ADD_INST_MOD_DIR)
+lnx_add_inst-exec_INST     = $(VBOX_LNX_ADD_INST_OTHER_DIR)
 lnx_add_inst-exec_INSTTYPE = stage
 lnx_add_inst-exec_EXEC_SOURCES  = \
@@ -318 +318 @@
 
 INSTALLS += lnx_add_inst-noexec
-lnx_add_inst-noexec_INST     = $(VBOX_LNX_ADD_INST_SHARE_DIR)$(VBOX_LNX_ADD_PACKAGE_NAME)/
+lnx_add_inst-noexec_INST     = $(VBOX_LNX_ADD_INST_OTHER_DIR)
 lnx_add_inst-noexec_INSTTYPE = stage
 lnx_add_inst-noexec_SOURCES  = \
@@ -403 +403 @@
         $(QUIET)tar --dereference --owner 0 --group 0 -cRf $(patsubst %.bz2,%,$@) \
                 -C $(VBOX_LNX_ADD_INST_OUT_DIR) \
-                LICENSE bin init lib sbin share src \
+                LICENSE bin init lib other sbin src \
                 $(if $(filter $(KBUILD_TYPE),debug),debug)
         $(QUIET)pbzip2 $(patsubst %.bz2,%,$@)
@@ -409 +409 @@
         $(QUIET)tar --dereference --owner 0 --group 0 --ignore-failed-read -cjRf $@ \
                 -C $(VBOX_LNX_ADD_INST_OUT_DIR) \
-                LICENSE bin init lib sbin share src \
+                LICENSE bin init lib other sbin src \
                 $(if $(filter $(KBUILD_TYPE),debug),debug)
 endif

trunk/src/VBox/Additions/linux/installer/install.sh.in

@@ -365 +365 @@
 link_into_fs "lib" "$lib_path"
 add_symlink "$INSTALLATION_DIR/lib/$PACKAGE" /usr/lib/"$PACKAGE"
-link_into_fs "share" "/usr/share"
 link_into_fs "src" "/usr/src"
 

trunk/src/VBox/Additions/linux/installer/module-autologon.sh

@@ -105 +105 @@
 
     # Link to required greeter files into $greeter_dir.
-    add_symlink "$INSTALLATION_DIR/share/VBoxGuestAdditions/vbox-greeter.desktop" "$greeter_dir/vbox-greeter.desktop"
+    add_symlink "$INSTALLATION_DIR/other/vbox-greeter.desktop" "$greeter_dir/vbox-greeter.desktop"
 
     # Backup and activate greeter config.

trunk/src/VBox/Additions/linux/installer/vboxadd-x11.sh

@@ -32 +32 @@
 LOG="/var/log/vboxadd-install-x11.log"
 CONFIG_DIR="/var/lib/VBoxGuestAdditions"
-CONFIG="config"
+CONFIG="${CONFIG_DIR}/config"
 MODPROBE=/sbin/modprobe
 
@@ -170 +170 @@
 setup()
 {
+    if test -r "${CONFIG}"; then
+      . "${CONFIG}"
+    else
+      fail "Configuration file ${CONFIG} not found"
+    fi
+    test -n "$INSTALL_DIR" -a -n "$INSTALL_VER" ||
+      fail "Configuration file ${CONFIG} not complete"
     lib_dir="$LIB/VBoxGuestAdditions"
-    share_dir="/usr/share/VBoxGuestAdditions"
-    test -x "$lib_dir" -a -x "$share_dir" ||
+    res_dir="${INSTALL_DIR}/other"
+    test -x "$lib_dir" -a -x "$res_dir" ||
         fail "Invalid Guest Additions configuration found."
     # By default we want to configure X
@@ -381 +388 @@
         {
             rm -f "/usr/share/xserver-xorg/pci/vboxvideo.ids"
-            ln -s "$share_dir/vboxvideo.ids" /usr/share/xserver-xorg/pci 2>/dev/null
+            ln -s "$res_dir/vboxvideo.ids" /usr/share/xserver-xorg/pci 2>/dev/null
             test -n "$automouse" && setupxorgconf=""
         }
@@ -394 +401 @@
                         generated="$generated  `printf "$i\n"`"
                     else
-                        "$lib_dir/x11config.sh" $autokeyboard $automouse $nopsaux $vmsvga "$i"
+                        "$res_dir/x11config.sh" $autokeyboard $automouse $nopsaux $vmsvga "$i"
                     fi
                     configured="true"
@@ -407 +414 @@
             if test -z "$configured"; then
                 touch "$main_cfg"
-                "$lib_dir/x11config.sh" $autokeyboard $automouse $nopsaux $vmsvga --noBak "$main_cfg"
+                "$res_dir/x11config.sh" $autokeyboard $automouse $nopsaux $vmsvga --noBak "$main_cfg"
                 touch "${nobak_cfg}"
             fi
@@ -430 +437 @@
         # open device files
         Fedora\ release\ 7* | Fedora\ release\ 8* )
-            semodule -i "$share_dir/vbox_x11.pp" > /dev/null 2>&1
+            semodule -i "$res_dir/vbox_x11.pp" > /dev/null 2>&1
             ;;
         # Similar for the accelerated graphics check on Fedora 15
         Fedora\ release\ 15* )
-            semodule -i "$share_dir/vbox_accel.pp" > /dev/null 2>&1
+            semodule -i "$res_dir/vbox_accel.pp" > /dev/null 2>&1
             ;;
     esac
@@ -453 +460 @@
 
     # And set up VBoxClient to start when the X session does
-    install_x11_startup_app "$lib_dir/98vboxadd-xclient" "$share_dir/vboxclient.desktop" VBoxClient VBoxClient-all ||
+    install_x11_startup_app "$res_dir/98vboxadd-xclient" "$res_dir/vboxclient.desktop" VBoxClient VBoxClient-all ||
         fail "See the log file $LOG for more information."
-    ln -s "$lib_dir/98vboxadd-xclient" /usr/bin/VBoxClient-all 2>/dev/null
+    ln -s "$res_dir/98vboxadd-xclient" /usr/bin/VBoxClient-all 2>/dev/null
 }
 

trunk/src/VBox/Additions/linux/installer/vboxadd.sh

@@ -206 +206 @@
             setup
             $MODPROBE vboxguest >/dev/null 2>&1 || {
-                "$lib_path/$PACKAGE/vboxadd-x11" cleanup 2>> "${LOG}"
+                "${INSTALL_DIR}/init/vboxadd-x11" cleanup 2>> "${LOG}"
                 fail "modprobe vboxguest failed"
             }
@@ -229 +229 @@
 
     # Put the X.Org driver in place.  This is harmless if it is not needed.
-    "$lib_path/$PACKAGE/vboxadd-x11" setup 2>> "${LOG}"
+    "${INSTALL_DIR}/init/vboxadd-x11" setup 2>> "${LOG}"
     # Install the guest OpenGL drivers.  For now we don't support
     # multi-architecture installations
@@ -383 +383 @@
     # Put mount.vboxsf in the right place
     ln -sf "$lib_path/$PACKAGE/mount.vboxsf" /sbin
-    # And an rc file to re-build the kernel modules and re-set-up the X server.
-    ln -sf "$lib_path/$PACKAGE/vboxadd" /sbin/rcvboxadd
     # And a post-installation script for rebuilding modules when a new kernel
     # is installed.
@@ -468 +466 @@
 
     # Clean-up X11-related bits
-    "$lib_path/$PACKAGE/vboxadd-x11" cleanup 2>> "${LOG}"
+    "${INSTALL_DIR}/init/vboxadd-x11" cleanup 2>> "${LOG}"
 
     # Remove other files
     rm /sbin/mount.vboxsf 2>/dev/null
-    rm /sbin/rcvboxadd 2>/dev/null
     rm -f /etc/kernel/postinst.d/vboxadd /etc/kernel/prerm.d/vboxadd
     rmdir -p /etc/kernel/postinst.d /etc/kernel/prerm.d 2>/dev/null