Changeset 57809 in vbox for trunk/src/VBox/Installer/linux

Timestamp:

Sep 17, 2015 4:12:55 PM (9 years ago)

Author:

vboxsync

Message:

Reverted bad commit r102754.

Location:

trunk/src/VBox/Installer/linux

Files:

• Makefile.kmk (modified) (1 diff)
• install.sh (modified) (1 diff)
• prerm-common.sh (modified) (1 diff)
• rpm/VirtualBox.tmpl.spec (modified) (9 diffs)
• rpm/rules (modified) (1 diff)

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

@@ -210 +210 @@
           ExtensionPacks/VNC/ExtPack-license.rtf \
           ExtensionPacks/VNC/ExtPack-license.txt,) \
-        postinst-common.sh \
-        prerm-common.sh \
-        routines.sh \
         VBoxSysInfo.sh \
         vboxautostart-service.sh \

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

@@ -348 +348 @@
     fi
 
-    cp uninstall.sh $INSTALLATION_DIR
+    cp uninstall.sh routines.sh $INSTALLATION_DIR
+    echo "routines.sh" >> $CONFIG_DIR/$CONFIG_FILES
     echo "uninstall.sh" >> $CONFIG_DIR/$CONFIG_FILES
 

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

@@ -50 +50 @@
 remove_init_script vboxweb-service
 # Stop kernel module and uninstall runlevel script
-stop_init_script vboxdrv 2>/dev/null
+stop_init_script vboxdrv
 delrunlevel vboxdrv
 remove_init_script vboxdrv

trunk/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec

@@ -171 +171 @@
   mv accessible $RPM_BUILD_ROOT/usr/lib/virtualbox
 fi
-mv vboxdrv.sh $RPM_BUILD_ROOT/usr/lib/virtualbox
-ln -sf /usr/lib/virtualbox/vboxdrv.sh $RPM_BUILD_ROOT/sbin/rcvboxdrv
-mv vboxballoonctrl-service.sh $RPM_BUILD_ROOT/usr/lib/virtualbox
-ln -sf /usr/lib/virtualbox/vboxballoonctrl-service.sh $RPM_BUILD_ROOT/sbin/rcvboxballoonctrl-service
-mv vboxautostart-service.sh $RPM_BUILD_ROOT/usr/lib/virtualbox
-ln -sf /usr/lib/virtualbox/vboxautostart-service.sh $RPM_BUILD_ROOT/sbin/rcvboxautostart-service
-mv vboxweb-service.sh $RPM_BUILD_ROOT/usr/lib/virtualbox
-ln -sf /usr/lib/virtualbox/vboxweb-service.sh $RPM_BUILD_ROOT/sbin/rcvboxweb-service
-mv postinst-common.sh $RPM_BUILD_ROOT/usr/lib/virtualbox
-mv prerm-common.sh $RPM_BUILD_ROOT/usr/lib/virtualbox
-mv routines.sh $RPM_BUILD_ROOT/usr/lib/virtualbox
+install -D -m 755 vboxdrv.init $RPM_BUILD_ROOT%{_initrddir}/vboxdrv
+ln -sf %{_initrddir}/vboxdrv $RPM_BUILD_ROOT/sbin/rcvboxdrv
+install -D -m 755 vboxballoonctrl-service.init $RPM_BUILD_ROOT%{_initrddir}/vboxballoonctrl-service
+install -D -m 755 vboxautostart-service.init $RPM_BUILD_ROOT%{_initrddir}/vboxautostart-service
+install -D -m 755 vboxweb-service.init $RPM_BUILD_ROOT%{_initrddir}/vboxweb-service
+%if %{?rpm_suse:1}%{!?rpm_suse:0}
+ln -sf ../etc/init.d/vboxballoonctrl-service $RPM_BUILD_ROOT/sbin/rcvboxballoonctrl-service
+ln -sf ../etc/init.d/vboxautostart-service $RPM_BUILD_ROOT/sbin/rcvboxautostart-service
+ln -sf ../etc/init.d/vboxweb-service $RPM_BUILD_ROOT/sbin/rcvboxweb-service
+%endif
 ln -s VBox $RPM_BUILD_ROOT/usr/bin/VirtualBox
 ln -s VBox $RPM_BUILD_ROOT/usr/bin/virtualbox
@@ -205 +204 @@
 
 %pre
-set -x
-echo Running pre...
 # defaults
 [ -r /etc/default/virtualbox ] && . /etc/default/virtualbox
+
+# check for active VMs of the installed (old) package
+VBOXSVC_PID=`pidof VBoxSVC 2>/dev/null || true`
+if [ -n "$VBOXSVC_PID" ]; then
+  # executed before the new package is installed!
+  if [ -f /etc/init.d/vboxballoonctrl-service ]; then
+    # try graceful termination; terminate the balloon control service first
+    /etc/init.d/vboxballoonctrl-service stop 2>/dev/null || true
+  fi
+  if [ -f /etc/init.d/vboxautostart-service ]; then
+    # try graceful termination; terminate the autostart service first
+    /etc/init.d/vboxautostart-service stop 2>/dev/null || true
+  fi
+  if [ -f /etc/init.d/vboxweb-service ]; then
+    # try graceful termination; terminate the webservice first
+    /etc/init.d/vboxweb-service stop 2>/dev/null || true
+  fi
+  # ask the daemon to terminate immediately
+  kill -USR1 $VBOXSVC_PID
+  sleep 1
+  if pidof VBoxSVC > /dev/null 2>&1; then
+    echo "A copy of VirtualBox is currently running.  Please close it and try again."
+    echo "Please note that it can take up to ten seconds for VirtualBox (in particular"
+    echo "the VBoxSVC daemon) to finish running."
+    exit 1
+  fi
+fi
 
 # check for old installation
@@ -222 +246 @@
 fi
 
-# check for active VMs of the installed (old) package
-# Execute the installed packages pre-uninstaller if present.
-/usr/lib/virtualbox/prerm-common.sh 2>/dev/null
-# Stop services from older versions without pre-uninstaller.
-/etc/init.d/vboxballoonctrl-service stop 2>/dev/null
-/etc/init.d/vboxautostart-service stop 2>/dev/null
-/etc/init.d/vboxweb-service stop 2>/dev/null
-VBOXSVC_PID=`pidof VBoxSVC 2>/dev/null || true`
-if [ -n "$VBOXSVC_PID" ]; then
-  # ask the daemon to terminate immediately
-  kill -USR1 $VBOXSVC_PID
-  sleep 1
-  if pidof VBoxSVC > /dev/null 2>&1; then
-    echo "A copy of VirtualBox is currently running.  Please close it and try again."
-    echo "Please note that it can take up to ten seconds for VirtualBox (in particular"
-    echo "the VBoxSVC daemon) to finish running."
-    exit 1
-  fi
-fi
-
 # XXX remove old modules from previous versions (disable with INSTALL_NO_VBOXDRV=1 in /etc/default/virtualbox)
 if [ "$INSTALL_NO_VBOXDRV" != "1" ]; then
@@ -252 +256 @@
 
 %post
-set -x
-echo Running post...
 #include installer-common.sh
 
@@ -288 +290 @@
 # and /dev/vboxdrv and /dev/vboxusb/*/* device nodes
 install_device_node_setup root 0600 /usr/share/virtualbox "${usb_group}"
+%if %{?rpm_redhat:1}%{!?rpm_redhat:0}
+/sbin/chkconfig --add vboxdrv
+/sbin/chkconfig --add vboxballoonctrl-service
+/sbin/chkconfig --add vboxautostart-service
+/sbin/chkconfig --add vboxweb-service
+%endif
+%if %{?rpm_suse:1}%{!?rpm_suse:0}
+%{fillup_and_insserv -f -y -Y vboxdrv vboxballoonctrl-service vboxautostart-service vboxweb-service}
+%endif
 %if %{?rpm_mdv:1}%{!?rpm_mdv:0}
 /sbin/ldconfig
+%_post_service vboxdrv
+%_post_service vboxballoonctrl-service
+%_post_service vboxautostart-service
+%_post_service vboxweb-service
 %update_menus
 %endif
@@ -320 +335 @@
 fi
 if [ $BUILD_MODULES -eq 1 ]; then
-  /sbin/rcvboxdrv setup || true
+  /etc/init.d/vboxdrv setup || true
 else
   if lsmod | grep -q "vboxdrv[^_-]"; then
-    /sbin/rcvboxdrv stop || true
+    /etc/init.d/vboxdrv stop || true
   fi
   if [ $REGISTER_MODULES -eq 1 ]; then
@@ -331 +346 @@
     fi
   fi
-fi
-# Install and start the new service scripts.
-/usr/lib/virtualbox/prerm-common.sh
-/usr/lib/virtualbox/postinst-common.sh /usr/lib/virtualbox --start > /dev/null
+  /etc/init.d/vboxdrv start > /dev/null
+fi
+/etc/init.d/vboxballoonctrl-service start > /dev/null
+/etc/init.d/vboxautostart-service start > /dev/null
+/etc/init.d/vboxweb-service start > /dev/null
 
 
 %preun
-set -x
-echo Running preun...
 # $1==0: remove the last version of the package
 # $1==1: install the first time
 # $1>=2: upgrade
+%if %{?rpm_suse:1}%{!?rpm_suse:0}
+%stop_on_removal vboxballoonctrl-service
+%stop_on_removal vboxautostart-service
+%stop_on_removal vboxweb-service
+%endif
+%if %{?rpm_mdv:1}%{!?rpm_mdv:0}
+%_preun_service vboxballoonctrl-service
+%_preun_service vboxautostart-service
+%_preun_service vboxweb-service
+%endif
+%if %{?rpm_redhat:1}%{!?rpm_redhat:0}
 if [ "$1" = 0 ]; then
-  /usr/lib/virtualbox/prerm-common.sh || exit 1
+  /sbin/service vboxballoonctrl-service stop > /dev/null
+  /sbin/chkconfig --del vboxballoonctrl-service
+  /sbin/service vboxautostart-service stop > /dev/null
+  /sbin/chkconfig --del vboxautostart-service
+  /sbin/service vboxweb-service stop > /dev/null
+  /sbin/chkconfig --del vboxweb-service
+fi
+%endif
+
+if [ "$1" = 0 ]; then
+  # check for active VMs
+  VBOXSVC_PID=`pidof VBoxSVC 2>/dev/null || true`
+  if [ -n "$VBOXSVC_PID" ]; then
+    kill -USR1 $VBOXSVC_PID
+    sleep 1
+    if pidof VBoxSVC > /dev/null 2>&1; then
+      echo "A copy of VirtualBox is currently running.  Please close it and try again."
+      echo "Please note that it can take up to ten seconds for VirtualBox (in particular"
+      echo "the VBoxSVC daemon) to finish running."
+      exit 1
+    fi
+  fi
+fi
+%if %{?rpm_suse:1}%{!?rpm_suse:0}
+%stop_on_removal vboxdrv
+%endif
+%if %{?rpm_mdv:1}%{!?rpm_mdv:0}
+%_preun_service vboxdrv
+%endif
+if [ "$1" = 0 ]; then
+%if %{?rpm_redhat:1}%{!?rpm_redhat:0}
+  /sbin/service vboxdrv stop > /dev/null
+  /sbin/chkconfig --del vboxdrv
+%endif
   rm -f /etc/udev/rules.d/60-vboxdrv.rules
   rm -f /etc/vbox/license_agreed
@@ -356 +414 @@
 
 %postun
-set -x
-echo Running postun...
+%if %{?rpm_redhat:1}%{!?rpm_redhat:0}
+if [ "$1" -ge 1 ]; then
+  /sbin/service vboxdrv restart > /dev/null 2>&1
+  /sbin/service vboxballoonctrl-service restart > /dev/null 2>&1
+  /sbin/service vboxautostart-service restart > /dev/null 2>&1
+  /sbin/service vboxweb-service restart > /dev/null 2>&1
+fi
+%endif
+%if %{?rpm_suse:1}%{!?rpm_suse:0}
+%restart_on_update vboxdrv vboxballoonctrl-service vboxautostart-service vboxweb-service
+%insserv_cleanup
+%endif
 %if %{?rpm_mdv:1}%{!?rpm_mdv:0}
 /sbin/ldconfig
@@ -379 +447 @@
 %doc UserManual*.pdf
 %doc %{!?is_ose: VirtualBox*.chm}
+%{_initrddir}/vboxdrv
+%{_initrddir}/vboxballoonctrl-service
+%{_initrddir}/vboxautostart-service
+%{_initrddir}/vboxweb-service
 %{?rpm_suse: %{py_sitedir}/*}
 %{!?rpm_suse: %{python_sitelib}/*}
 /sbin/rcvboxdrv
-/sbin/rcvboxballoonctrl-service
-/sbin/rcvboxautostart-service
-/sbin/rcvboxweb-service
+%{?rpm_suse: /sbin/rcvboxballoonctrl-service}
+%{?rpm_suse: /sbin/rcvboxautostart-service}
+%{?rpm_suse: /sbin/rcvboxweb-service}
 /etc/vbox
 /usr/bin/*

trunk/src/VBox/Installer/linux/rpm/rules

@@ -249 +249 @@
             -e "s|%VERSION%|$(VBOX_VERSION_STRING)|g" \
             -e "s|%GROUP%|$(if $(VBOX_WITHOUT_HARDENING),vboxusers,root)|g" \
-            vboxdrv.sh.in > $(archdir)/vboxdrv.sh
-        cp vboxballoonctrl-service.sh $(archdir)
-        cp vboxautostart-service.sh $(archdir)
-        cp vboxweb-service.sh $(archdir)
+            vboxdrv.sh.in > $(archdir)/vboxdrv.init
+        cp vboxballoonctrl-service.sh $(archdir)/vboxballoonctrl-service.init
+        cp vboxautostart-service.sh $(archdir)/vboxautostart-service.init
+        cp vboxweb-service.sh $(archdir)/vboxweb-service.init
         cp VBox.sh $(archdir)
         mv rpm/VirtualBox-$(ver) rpm/$(rpmname)