Changeset 2594 in MondoRescue

Timestamp:

Mar 17, 2010, 3:55:16 AM (14 years ago)

Author:

Bruno Cornec

Message:

r3735@localhost: bruno | 2010-03-14 19:50:12 +0100

• Avoids remaining error messages at restore time in new mindi
• Adapt group file to include latest one needed by udev
• Explicitely add a dep on libnss_files.so.2 needed for uid resolution at restore time

Location:

branches/2.2.10/mindi

Files:

• deplist.d/minimal.conf (modified) (1 diff)
• rootfs/etc/group (modified) (1 diff)
• rootfs/sbin/ide-opt (modified) (1 diff)
• rootfs/sbin/init (modified) (4 diffs)
• rootfs/sbin/install-additional-tools (modified) (1 diff)

branches/2.2.10/mindi/deplist.d/minimal.conf

@@ -68 +68 @@
 /etc/termcap
 /etc/bashrc
+# For id resolution
+/etc/nsswitch.conf
+/lib/libnss_files.so.2
 
 # Compression

branches/2.2.10/mindi/rootfs/etc/group

@@ -24 +24 @@
 fuse::106:
 nogroup::65534:
+cdwriter:x:80:saned
+video:x:82:
+dialout:x:83:

branches/2.2.10/mindi/rootfs/sbin/ide-opt

@@ -1 +1 @@
 #!/bin/sh
 
-#echo "Optimize access to IDE drives? (Type 'YES' or just press <enter>)"
-#echo "Warning - this can result in filesystem corruption."
-#read response
-#if [ "$response" = "YES" ] || [ "$response" = "yes" ] ; then
-    > /tmp/oid.log
-    echo -e -n "Optimizing IDE drive access..."
+> /tmp/oid.log
+echo -e -n "Optimizing IDE drive access..."
 
-    cdrom_lives_here=`cat $MINDI_CACHE/CDROM-LIVES-HERE`
-    if [ "$?" -ne "0" ] ; then
+cdrom_lives_here=`cat $MINDI_CACHE/CDROM-LIVES-HERE 2> /dev/null`
+if [ "$?" -ne "0" ] ; then
     echo "I don't know where the CDROM lives. Optimization cancelled."
     exit 1
-    fi
+fi
 
-    for dev in hda hdb hdc hdd hde hdf hdg hdh ; do
+for dev in hda hdb hdc hdd hde hdf hdg hdh ; do
     echo " " > /tmp/oid1.log
     if [ "$cdrom_lives_here" = "$dev" ] ; then
-# -c 1
-        hdparm -u 1 -d 1 /dev/$dev > /tmp/oid1.log 2> /dev/null
+        hdparm -u 1 -d 1 /dev/$dev > /tmp/oid1.log 2> /dev/null
     else
-# -X34 -X66
-        hdparm -u1 -d1 -c1 -m8 -W1 /dev/$dev > /tmp/oid1.log 2> /dev/null
+        hdparm -u1 -d1 -c1 -m8 -W1 /dev/$dev > /tmp/oid1.log 2> /dev/null
     fi
     cat /tmp/oid1.log >> /tmp/oid.log
-    done
-    echo "Done. See /tmp/oid.log for logs."
-#else
-#    echo "Fair enough. I shan't optimize IDE access."
-#fi
+done
+echo "Done. See /tmp/oid.log for logs."
 
 echo "'ide-opt' has tried to optimize IDE access. If you saw lots of warnings,"

branches/2.2.10/mindi/rootfs/sbin/init

@@ -91 +91 @@
     openvt -l /bin/sh /sbin/wait-for-petris
     openvt -l /usr/bin/tail -f $LOGFILE
-    # May avoid shell error messages
-    # chmod 666 /dev/tty* /dev/console
     # By default first serial line is configured as tty
     # Required to have a correct serial console support (MP on ia64 or VSP with iLO2 e.g.)
@@ -313 +311 @@
         /sbin/udevadm settle --timeout=10
     fi
-    # It seems we need to have more static devs on some distro were
-    # udev as some other requirements to be covered later on.
+    # It seems we need to have more static devs on some distro where
+    # udev has some other requirements to be covered later on.
     # So in the mean time:
     for d in `ls /dev.static`; do
@@ -321 +319 @@
         fi
     done
-    rm -rf /dev.static
     echo $PKLVL > /proc/sys/kernel/printk
 }
@@ -680 +677 @@
     if [ -e "$MINDI_CACHE/USE-UDEV" ] ; then
         if [ -x /sbin/udevadm ]; then
-            /sbin/udevadm trigger --retry-failed
+            udaver=`/sbin/udevadm --version`
+            if [ $udaver -lt 146 ]; then
+                /sbin/udevadm trigger --retry-failed
+            else
+                # After version 146 option --retry-failed doesn't exist anymore
+                /sbin/udevadm trigger
+            fi
         fi
     fi

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

@@ -60 +60 @@
     cd $old_pwd
     echo -e -n "\r"
-    [ ! -e "$MINDI_CACHE/CDROM-LIVES-HERE" ] && umount $mountpoint
+    [ ! -e "$MINDI_CACHE/CDROM-LIVES-HERE" ] && [ -e "$tarball" ] && umount $mountpoint
     sleep 1
 fi