Changeset 1734 in MondoRescue

Timestamp:

Oct 29, 2007, 2:24:06 PM (16 years ago)

Author:

Bruno Cornec

Message:

• untar-and-softlink => untar (+ interface change)
• suppress useless softlinks creation/removal in boot process
• avoids udevd messages on groups
• Increase # of disks to 99 as in mindi at restore time (should be a conf file parameter)
• skip existing big file creation
• seems to work correctly for USB mindi boot

Location:

branches/2.2.5/mindi/rootfs/sbin

Files:

• init (modified) (1 diff)
• install-additional-tools (modified) (5 diffs)
• untar (moved) (moved from branches/2.2.5/mindi/rootfs/sbin/untar-and-softlink ) (1 diff)

branches/2.2.5/mindi/rootfs/sbin/init

@@ -278 +278 @@
     mount -n -t devpts -o mode=620 none /dev/pts
     mount -n -t tmpfs  none /dev/shm
+    PKLVL=`cut -f1 /proc/sys/kernel/printk`
+    echo 0 > /proc/sys/kernel/printk
     /sbin/udevd --daemon
+    echo $PKLVL > /proc/sys/kernel/printk
 }
 

branches/2.2.5/mindi/rootfs/sbin/install-additional-tools

@@ -19 +19 @@
 LogIt "Starting install-additional-tools"
 mountdir=$GROOVY
+# Should be the same as in mindi => conf param
+MAX_DISKS=99
 mkdir -p $mountdir
 diskno=1
@@ -25 +27 @@
     LogIt "I am assuming the data disks' contents are already in $mountdir."
 else
-    while [ "$diskno" -lt "20" ] ; do
-        LogIt "PLEASE WAIT. Untarring and softlinking disk #$diskno" 2
-        untar-and-softlink $diskno $mountdir /
+    while [ "$diskno" -lt "$MAX_DISKS" ] ; do
+        LogIt "PLEASE WAIT. Untarring disk #$diskno" 2
+        untar $diskno $mountdir
         res=$(($res+$?))
         [ -e "/LAST-DISK" ] && diskno=999
@@ -36 +38 @@
 rm -f /LAST-DISK
 
-echo -e -n "Recombining large files..."
+LogIt "Recombining large files..." 1
 biggienumber=0
 while [ -e "$mountdir/slice-$biggienumber.name" ] ; do
     stub=$mountdir/slice-$biggienumber
     biggiefname=`cat $stub.name`
+    if [ -f $biggiefname ]; then
+        LogIt "$biggiefname already exists - skipped" 1
+        biggienumber=$(($biggienumber+1))
+        continue
+    fi
     biggiefsize=`cat $stub.size`
     rm -f $stub.name $stub.size
@@ -56 +63 @@
         done
 
-    echo "$biggiefname ($biggiefsize KB) restored. $sliceno slices." >> $LOGFILE
+    LogIt "$biggiefname ($biggiefsize KB) restored. $sliceno slices." 1
 
     mkdir -p $biggiefname
@@ -64 +71 @@
     rm -f /tmp/out.dat
     biggienumber=$(($biggienumber+1))
-    echo -e -n "."
 done
-echo -en "Done.                                                              \r"
 rm -f /slice*
 
-LogIt "Resolving softlinks"
-echo -en "Finalizing softlinks..."
+LogIt "Populating / with tar file content..." 1
 
 cd $mountdir
-for path in `find | grep -v /etc/fstab` ; do
-    if [ -d "$path" ] ; then
-        mkdir /$path 2> /dev/null
-    else
-# Patch from Andrew Bulhak
-        if [ -h "/$path" ] ; then
-            # echo "removing symlink /$path"
-            rm -f /$path
-        fi
-# end patch
-        mv -f $path /$path
-    fi
-done
-cp -f etc/fstab /tmp/fstab
-tar cf - sbin bin usr/bin usr/sbin lib usr/lib lib64 usr/lib64 | (cd / ; tar xf -)
+mv etc/fstab etc/raidtab /tmp
 
+liste=`ls`
+if [ "$liste" ]; then
+    tar cf - $liste | (cd / ; tar xf -)
+    rm -fr $liste
+fi
 cd /
-
-for i in modprobe lsmod depmod rmmod ; do
-    [ -e "$mountdir/sbin/$i" ] && ln -sf $mountdir/sbin/$i /sbin/$i
-done
 
 sync;sync;sync
 
-echo "Done."
-
-for j in io.sys msdos.sys embleer.B.bz2 embleer.C.bz2 ; do
-    [ -e "$mountdir/$j" ] && ln -sf $mountdir/$j /$j
-done
-[ -e "$mountdir/etc/fstab" ] && ln -sf $mountdir/etc/fstab /tmp/fstab
-[ -e "$mountdir/etc/raidtab" ] && ln -sf $mountdir/etc/raidtab /tmp/raidtab
+LogIt "Done." 1
 
 which gawk 2> /dev/null > /dev/null

branches/2.2.5/mindi/rootfs/sbin/untar

@@ -16 +16 @@
 mountpoint=/mnt/floppy
 [ -e "/tmp/CDROM-LIVES-HERE" ] && mountpoint=/mnt/cdrom/images
-[ "$#" -eq "3" ] || Die "untar-and-softlink <tarball> <untar_to> <softlink_to>"
+[ "$#" -eq "2" ] || Die "untar <tarball> <untar_to>"
 diskno=$1
 untar_path=$2
-#softlink_path=$3
 tarball=$mountpoint/$diskno.tar.gz
 if [ -e "/tmp/CDROM-LIVES-HERE" ] ; then