Changeset 57876 in vbox

Timestamp:

Sep 24, 2015 10:56:43 AM (9 years ago)

Author:

vboxsync

Message:

Installers/linux: handle init script links in sbin in routines.sh.

Location:

trunk/src/VBox/Installer/linux

Files:

• install.sh (modified) (1 diff)
• routines.sh (modified) (2 diffs)
• rpm/VirtualBox.tmpl.spec (modified) (3 diffs)

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

@@ -402 +402 @@
         ln -sf $INSTALLATION_DIR/VBox.sh /usr/bin/VBoxDTrace
     fi
-    ln -sf $INSTALLATION_DIR/vboxdrv.sh /sbin/rcvboxdrv
     # Unity and Nautilus seem to look here for their icons
     ln -sf $INSTALLATION_DIR/icons/128x128/virtualbox.png /usr/share/pixmaps/virtualbox.png

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

@@ -237 +237 @@
     name="$2"
 
-    test -x "$script" && test ! "$name" = "" ||
-        { echo "$self: invalid arguments" >&2; return 1; }
+    test -x "${script}" && test ! "${name}" = "" ||
+        { echo "${self}: invalid arguments" >&2; return 1; }
+    ln -s "${script}" "/sbin/rc${name}"
     test -x "`which systemctl 2>/dev/null`" &&
         { systemd_wrap_init_script "$script" "$name"; return; }
     if test -d /etc/rc.d/init.d; then
-        cp "$script" "/etc/rc.d/init.d/$name" &&
-            chmod 755 "/etc/rc.d/init.d/$name"
+        cp "${script}" "/etc/rc.d/init.d/${name}" &&
+            chmod 755 "/etc/rc.d/init.d/${name}"
     elif test -d /etc/init.d; then
-        cp "$script" "/etc/init.d/$name" &&
-            chmod 755 "/etc/init.d/$name"
+        cp "${script}" "/etc/init.d/${name}" &&
+            chmod 755 "/etc/init.d/${name}"
     else
         { echo "${self}: error: unknown init type" >&2; return 1; }
@@ -259 +260 @@
     name="$1"
 
-    test -n "$name" ||
+    test -n "${name}" ||
         { echo "$self: missing argument"; return 1; }
+    rm -f "/sbin/rc${name}"
     rm -f /lib/systemd/system/"$name".service /usr/lib/systemd/system/"$name".service
     rm -f "/etc/rc.d/init.d/$name"

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

@@ -172 +172 @@
 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
@@ -316 +312 @@
 fi
 if [ $BUILD_MODULES -eq 1 ]; then
-  /sbin/rcvboxdrv setup || true
+  /usr/lib/virtualbox/vboxdrv.sh setup || true
 else
   if lsmod | grep -q "vboxdrv[^_-]"; then
-    /sbin/rcvboxdrv stop || true
+    /usr/lib/virtualbox/vboxdrv.sh stop || true
   fi
 fi
@@ -367 +363 @@
 %{?rpm_suse: %{py_sitedir}/*}
 %{!?rpm_suse: %{python_sitelib}/*}
-/sbin/rcvboxdrv
-/sbin/rcvboxballoonctrl-service
-/sbin/rcvboxautostart-service
-/sbin/rcvboxweb-service
 /etc/vbox
 /usr/bin/*