Changeset 56881 in vbox

Timestamp:

Jul 9, 2015 4:57:23 AM (10 years ago)

Author:

vboxsync

Message:

Installers/linux: /etc/init.d/service may not exist, use /sbin/rcservice instead.

Location:

trunk

Files:

• doc/manual/en_US/user_AdvancedTopics.xml (modified) (2 diffs)
• doc/manual/en_US/user_GuestAdditions.xml (modified) (1 diff)
• doc/manual/en_US/user_Installation.xml (modified) (2 diffs)
• src/VBox/Additions/linux/installer/vboxadd.sh (modified) (2 diffs)
• src/VBox/Installer/linux/install.sh (modified) (2 diffs)

trunk/doc/manual/en_US/user_AdvancedTopics.xml

@@ -592 +592 @@
 
       <para>After this, you will need to at least compile the kernel modules
-      by running the command <screen>  /usr/lib/VBoxGuestAdditions/vboxadd setup</screen>
+      by running the command <screen>  rcvboxadd setup</screen>
       as root (you will need to replace <emphasis>lib</emphasis> by
       <emphasis>lib64</emphasis> on some 64bit guests), and on older guests
@@ -599 +599 @@
       that the modules get loaded.</para>
 
-      <para>To setup the time synchronization service, run the command
-      <screen>  /usr/lib/VBoxGuestAdditions/vboxadd-service setup</screen> and
+      <para>To setup the time synchronization service,
       add the service vboxadd-service to the default runlevel. To set up the
-      X11 and OpenGL part of the Guest Additions, run the command <screen>  /usr/lib/VBoxGuestAdditions/vboxadd-x11 setup</screen>
+      X11 and OpenGL part of the Guest Additions, run the command
+      <screen>  rcvboxadd-x11 setup</screen>
       (you do not need to enable any services for this).</para>
 
-      <para>To recompile the guest kernel modules, use this command: <screen>  /usr/lib/VBoxGuestAdditions/vboxadd setup</screen>
+      <para>To recompile the guest kernel modules, use this command:
+      <screen>  rcvboxadd setup</screen>
       After compilation you should reboot your guest to ensure that the new
       modules are actually used.</para>

trunk/doc/manual/en_US/user_GuestAdditions.xml

@@ -601 +601 @@
             or not installed, the guest kernel modules will need to be
             recreated manually whenever the guest kernel is updated using
-            the command <screen>/etc/init.d/vboxadd setup</screen> as root.
+            the command <screen>rcvboxadd setup</screen> as root.
             </para>
           </listitem>

trunk/doc/manual/en_US/user_Installation.xml

@@ -392 +392 @@
             reinstalled by executing (as root):</para>
 
-            <screen>/etc/init.d/vboxdrv setup</screen>
+            <screen>rcvboxdrv setup</screen>
           </listitem>
         </orderedlist></para>
@@ -429 +429 @@
         appropriate Linux kernel headers (see <xref
         linkend="externalkernelmodules" />). After correcting any problems, do
-        <screen>sudo /etc/init.d/vboxdrv setup</screen>This will start a
+        <screen>sudo rcvboxdrv setup</screen>This will start a
         second attempt to build the module.</para>
 

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

@@ -455 +455 @@
     # 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
+    ln -sf "$lib_path/$PACKAGE/vboxadd-x11" /sbin/rcvboxadd-x11
     # At least Fedora 11 and Fedora 12 require the correct security context when
     # executing this command from service scripts. Shouldn't hurt for other
@@ -529 +532 @@
     # Remove other files
     rm /sbin/mount.vboxsf 2>/dev/null
+    rm /sbin/rcvboxadd 2>/dev/null
+    rm /sbin/rcvboxadd-x11 2>/dev/null
     rm /etc/udev/rules.d/60-vboxadd.rules 2>/dev/null
 }

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

@@ -112 +112 @@
     check_binary "/usr/bin/VBoxBalloonCtrl" "$install_dir" &&
     check_binary "/usr/bin/VBoxAutostart" "$install_dir" &&
-    check_binary "/usr/bin/vboxwebsrv" "$install_dir"
-    check_binary "/usr/bin/vbox-img" "$install_dir"
+    check_binary "/usr/bin/vboxwebsrv" "$install_dir" &&
+    check_binary "/usr/bin/vbox-img" "$install_dir" &&
+    check_binary "/sbin/rcvboxdrv" "$install_dir"
 }
 
@@ -417 +418 @@
         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