Changeset 230 in MondoRescue

Timestamp:

Dec 17, 2005, 1:46:17 AM (18 years ago)

Author:

bcornec

Message:

merge -r228:229 $SVN_M/branches/2.05

Location:

trunk/mindi/rootfs

Files:

• sbin/init (modified) (1 diff)
• sbin/install-additional-tools (modified) (1 diff)
• symlinks.tgz (modified) ( previous)

trunk/mindi/rootfs/sbin/init

@@ -642 +642 @@
         dirimg=`grep nfs-server-path /tmp/mondo-restore.cfg | cut -d' ' -f2-`
         if [ "$dirimg" = "" ]; then
-            imgname="/"
+            dirimg="/"
         fi
         LogIt "Mounting NFS image $imgname-1.iso in $dirimg on /mnt/cdrom in loopback"

trunk/mindi/rootfs/sbin/install-additional-tools

@@ -110 +110 @@
 
 # Was disabled in mid-March 2002 (?). Dunno why. Re-enabled July 11th, 2002.
-for path in /sbin /bin /usr/bin /usr/sbin /lib /usr/lib /lib/* /usr/lib/* ; do
-    [ ! -e "$path" ] && mkdir -p "$path"
-    for i in `ls $mountdir/$path 2> /dev/null` ; do
-    rm -f $path/$i 2> /dev/null
-        mv $mountdir/$path/$i $path 2> /dev/null
-    done   
-done
+# BERLIOS: This doesn't work for symlink with new busybox in PXE mode
+#for path in /sbin /bin /usr/bin /usr/sbin /lib /usr/lib /lib/* /usr/lib/* ; do
+    #[ ! -e "$path" ] && mkdir -p "$path"
+    #for i in `ls $mountdir/$path 2> /dev/null` ; do
+    #rm -f $path/$i 2> /dev/null
+        #mv $mountdir/$path/$i $path 2> /dev/null
+    #done   
+#done
+
+cd $mountdir 
+tar cf - sbin bin usr/bin usr/sbin lib usr/lib | (cd / ; tar xf -)
+cd /