Changeset 98681 in vbox

Timestamp:

Feb 21, 2023 4:01:22 PM (2 years ago)

Author:

vboxsync

Message:

Installer/*: Similar adjustments for VBOX_WITH_WEBSERVICES. Fix for solaris typo two commits back. bugref:10030

Location:

trunk/src/VBox/Installer

Files:

• linux/install.sh (modified) (1 diff)
• linux/postinst-common.sh (modified) (2 diffs)
• solaris/Makefile.kmk (modified) (3 diffs)
• solaris/makepackage.sh (modified) (5 diffs)

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

@@ -340 +340 @@
     fi
     ln -sf $INSTALLATION_DIR/VBox.sh /usr/bin/VBoxAutostart
-    ln -sf $INSTALLATION_DIR/VBox.sh /usr/bin/vboxwebsrv
+    if [ -f $INSTALLATION_DIR/vboxwebsrv ]; then
+        ln -sf $INSTALLATION_DIR/VBox.sh /usr/bin/vboxwebsrv
+    fi
     ln -sf $INSTALLATION_DIR/vbox-img /usr/bin/vbox-img
     ln -sf $INSTALLATION_DIR/vboximg-mount /usr/bin/vboximg-mount

trunk/src/VBox/Installer/linux/postinst-common.sh

@@ -70 +70 @@
     install_init_script "${MY_PATH}/vboxautostart-service.sh" vboxautostart-service
 fi
-install_init_script "${MY_PATH}/vboxweb-service.sh" vboxweb-service
+if [ -f ${MY_PATH}/vboxweb-service.sh ]; then
+    install_init_script "${MY_PATH}/vboxweb-service.sh" vboxweb-service
+fi
 finish_init_script_install
 
@@ -84 +86 @@
 fi
 delrunlevel vboxweb-service
-addrunlevel vboxweb-service
+if [ -f ${MY_PATH}/vboxweb-service.sh ]; then
+    addrunlevel vboxweb-service
+fi
 
 ln -sf "${MY_PATH}/postinst-common.sh" /sbin/vboxconfig

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

@@ -179 +179 @@
 SOLARIS_SMF_FILES = \
         virtualbox-zoneaccess.xml \
-        $(if-expr defined(VBOX_WITH_FE_BALLOONCTRL),mvirtualbox-balloonctrl.xml,) \
+        $(if-expr defined(VBOX_WITH_FE_BALLOONCTRL),virtualbox-balloonctrl.xml,) \
         $(if-expr defined(VBOX_WITH_FE_AUTOSTART),virtualbox-autostart.xml,) \
         $(if-expr defined(VBOX_WITH_WEBSERVICES),virtualbox-webservice.xml,)
@@ -689 +689 @@
                 $(if-expr !defined(VBOX_WITH_FE_BALLOONCTRL),--without-VBoxBalloonCtrl,) \
                 $(if-expr !defined(VBOX_WITH_FE_AUTOSTART),--without-VBoxAutostart,) \
+                $(if-expr !defined(VBOX_WITH_WEBSERVICES),--without-vboxwebsrv,) \
                 $(VBOX_PATH_SI_SCRATCH_PKG) \
                 $(PKG_FILENAME) \
@@ -740 +741 @@
                 $(if-expr !defined(VBOX_WITH_FE_BALLOONCTRL),--without-VBoxBalloonCtrl,) \
                 $(if-expr !defined(VBOX_WITH_FE_AUTOSTART),--without-VBoxAutostart,) \
+                $(if-expr !defined(VBOX_WITH_WEBSERVICES),--without-vboxwebsrv,) \
                 $(VBOX_PATH_SI_SCRATCH_PKG) \
                 $(PKG_FILENAME_SMF_STYLE) \

trunk/src/VBox/Installer/solaris/makepackage.sh

@@ -29 +29 @@
 #
 # Usage:
-#       makepackage.sh [--hardened] [--ips] [--without-VBoxBugReport] \
+#       makepackage.sh [--hardened] [--ips] [--without-VBoxBugReport] [--without-VBoxBalloonCtrl] \
+#           [--without-VBoxAutostart] [--without-vboxwebsrv] \
 #           $(PATH_TARGET)/install packagename {$(KBUILD_TARGET_ARCH)|neutral} $(VBOX_SVN_REV)
 
@@ -40 +41 @@
 OPT_WITHOUT_VBoxBalloonCtrl=""
 OPT_WITHOUT_VBoxAutostart=""
+OPT_WITHOUT_vboxwebsrv=""
 while [ $# -ge 1 ];
 do
@@ -58 +60 @@
         --without-VBoxAutostart)
             OPT_WITHOUT_VBoxAutostart="yes"
+            ;;
+        --without-vboxwebsrv)
+            OPT_WITHOUT_vboxwebsrv="yes"
             ;;
         *)
@@ -310 +315 @@
 
 # Add hardlinks for executables to launch the 32-bit or 64-bit executable
-for f in VBoxManage VBoxSDL VBoxAutostart vboxwebsrv VBoxZoneAccess VBoxSVC VBoxTestOGL VirtualBox VirtualBoxVM vbox-img VBoxHeadless; do
+for f in VBoxManage VBoxSDL VBoxAutostart VBoxZoneAccess VBoxSVC VBoxTestOGL VirtualBox VirtualBoxVM vbox-img VBoxHeadless; do
     package_spec_append_hardlink VBoxISAExec $f "$PKG_BASE_DIR" "$VBOX_INSTALLED_DIR"
 done
@@ -322 +327 @@
     package_spec_append_hardlink VBoxISAExec VBoxAutostart "$PKG_BASE_DIR" "$VBOX_INSTALLED_DIR"
 fi
+if [ -z "${OPT_WITHOUT_vboxwebsrv}" ]; then
+    package_spec_append_hardlink VBoxISAExec vboxwebsrv "$PKG_BASE_DIR" "$VBOX_INSTALLED_DIR"
+fi
 
 package_spec_fixup_content