Changeset 903 in MondoRescue for trunk/mindi/rootfs/sbin/init

Timestamp:

Oct 25, 2006, 1:49:52 AM (19 years ago)

Author:

Bruno Cornec

Message:

merge -r862:888 $SVN_M/branches/stable

File:

• trunk/mindi/rootfs/sbin/init (modified) (3 diffs)

trunk/mindi/rootfs/sbin/init

@@ -328 +328 @@
     fi
 
-}
-
-
-SwapTheMountExecs() {
-    if [ -e "/bin/mount.libc5" ] ; then
-        LogIt "Swapping busybox's mount with libc5 mount"
-        mv /bin/mount /bin/mount.bb
-        mv /bin/mount.libc5 /bin/mount
-        sync
-    fi
 }
 
@@ -468 +458 @@
     ExtractDataDisksAndLoadModules
 elif [ "`grep -i pxe /proc/cmdline`" ]; then
-    /sbin/start-nfs
+    # We need to get here exported variables from start-nfs
+    . /sbin/start-nfs
 
     # Simulate a local CD
@@ -477 +468 @@
     HandleCDROMorFloppies
     ExtractDataDisksAndLoadModules
-    /sbin/start-nfs
+    # We need to get here exported variables from start-nfs
+    . /sbin/start-nfs
 fi
 res=$?
-SwapTheMountExecs
 ConfigureLoggingDaemons
 if [ -e "/tmp/USE-DEVFS" ] ; then