Changeset 3324 in MondoRescue

Timestamp:

Dec 2, 2014, 1:15:04 PM (9 years ago)

Author:

Bruno Cornec

Message:

• Fix #741: adapt busybox and init location for pre-fedora 18 distros (missing links) !
• Fix start-* script as well

Location:

branches/3.2/mindi

Files:

• mindi (modified) (2 diffs)
• rootfs/etc/init.d/rcS (modified) (3 diffs)

branches/3.2/mindi/mindi

@@ -2676 +2676 @@
     done
 
+    # Ensure that with mindi-busybox 1.21, busybox also exists under /bin
+    if [ ! -e $mountpoint/bin/busybox ]; then
+        (cd $mountpoint/bin ; ln -sf ../usr/bin/busybox .)
+    fi
+
     # Copy an additional ProLiant tool for OBDR support
     if [ -f $MINDI_TMP/OBDR ]; then
@@ -2757 +2762 @@
         cd "$mountpoint"
         # kernel expects init in cpio filesystem
-        ln -sf sbin/init init
+        ln -sf usr/sbin/init init
         # create cpio image file and unmount loop filesystem
         find . -print | cpio -o -H newc | gzip -9 > $rdz_fname 2> /dev/null

branches/3.2/mindi/rootfs/etc/init.d/rcS

@@ -966 +966 @@
 if [ "`grep -i pxe /proc/cmdline`" ] || [ "`grep -i net /proc/cmdline`" ]; then
     # We need to get here exported variables from start-netfs
-    . /sbin/start-netfs
+    . /usr/sbin/start-netfs
 fi
 
@@ -980 +980 @@
     sed -i "s/backup-media-type.*/backup-media-type netfs/" /tmp/mondorestore.cfg
 elif [ "`grep -i usb= /proc/cmdline`" ] || [ "`grep -i usb /tmp/mondorestore.cfg 2>/dev/null | grep media-type`" ]; then
-    . /sbin/start-usb
+    . /usr/sbin/start-usb
 
     # Simulate a local CD
@@ -989 +989 @@
     HandleCDROM
     ExtractDataDisksAndLoadModules
-    # We need to get here exported variables from start-netfs
-    . /sbin/start-netfs
 fi
 res=$?