Changeset 39334 in vbox for trunk/src/VBox/Installer

Timestamp:

Nov 16, 2011 3:21:10 PM (13 years ago)

Author:

vboxsync

Message:

Installers/linux: restore debug logging in kernel modules (host).

Location:

trunk/src/VBox/Installer/linux

Files:

• Makefile.kmk (modified) (1 diff)
• install.sh (modified) (2 diffs)
• vboxdrv.sh.in (modified) (1 diff)

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

@@ -366 +366 @@
                 -e "s;_ARCH_;$(KBUILD_TARGET_ARCH);g" \
                 -e "s;_HARDENED_;$(VBOX_WITH_HARDENING);g" \
+                -e "s;_BUILDTYPE_;$(KBUILD_TYPE);g" \
+                -e "s;_USERNAME_;$(USERNAME);g" \
                 -e "s;_PYTHON_;$(VBOX_WITH_PYTHON);g" \
                 -e '/#include installer-common.sh/ {' \

trunk/src/VBox/Installer/linux/install.sh

@@ -28 +28 @@
 ARCH="_ARCH_"
 HARDENED="_HARDENED_"
+# The "BUILD_" prefixes prevent the variables from being overwritten when we
+# read the configuration from the previous installation.
+BUILD_BUILDTYPE="_BUILDTYPE_"
+BUILD_USERNAME="_USERNAME_"
 CONFIG_DIR="/etc/vbox"
 CONFIG="vbox.cfg"
@@ -444 +448 @@
     echo "INSTALL_REV='$SVNREV'" >> $CONFIG_DIR/$CONFIG
     echo "# Build type and user name for logging purposes" >> $CONFIG_DIR/$CONFIG
-    echo "BUILD_TYPE='$BUILD_TYPE'" >> $CONFIG_DIR/$CONFIG
-    echo "USERNAME='$USERNAME'" >> $CONFIG_DIR/$CONFIG
+    echo "BUILD_TYPE='$BUILD_BUILDTYPE'" >> $CONFIG_DIR/$CONFIG
+    echo "USERNAME='$BUILD_USERNAME'" >> $CONFIG_DIR/$CONFIG
 
     # Make kernel module

trunk/src/VBox/Installer/linux/vboxdrv.sh.in

@@ -40 +40 @@
 [ -f /lib/lsb/init-functions ] || NOLSB=yes
 [ -f /etc/vbox/vbox.cfg ] && . /etc/vbox/vbox.cfg
+export BUILD_TYPE
+export USERNAME
+export USER=$USERNAME
 
 if [ -n "$INSTALL_DIR" ]; then