Changeset 2444 in MondoRescue for branches/2.2.10/mindi/rootfs

Timestamp:

Sep 30, 2009, 4:44:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

• priority given to env var for tmpdir
• fuse FS excluded from tmpdir computation
• Improves udev timeout handling
• fuse device is needed at restore time for sshfs
• Avoids comment analysis in the new code handling deplist.d
• Avoids error message if some ssh conf files do not exist
• Improvements on sshfs/ssh management in restore mode
• Include now all minimal requirements for sshfs
• Fix udev support in init for Mandriva 2009.1 (udevadm settle is blocking)
• Improve deplist.d/* files
• adds libnss for ssh support in boot disk
• Solve a memory management issue in DSF module (strtok => mr_strtok)
• DSF now also supports partitions in addition to full disks
• Adds debug in open_and_list_dir
• Improve user management for NetFS cases
• ssh in the restore env needs some dlopened libs (libnss_compat|files)
• Warning emited in case of duplicate mountpoints or devices in fstab found
• Use only the AWK veriable everywhere and not the awk command
• Simplify GetInitrdFilesystemToUse which doesn't need to detect everything, but just know if it's initramfs (new mode) or a compressed FS ext2/3 (older mode) as initrd is anyway re-made by mindi. Should fix #353

(Backport from 2.2.9)

Location:

branches/2.2.10/mindi/rootfs

Files:

• etc/passwd (modified) (2 diffs)
• etc/udev-links.conf (modified) (1 diff)
• sbin/init (modified) (2 diffs)
• sbin/start-netfs (modified) (1 diff)

branches/2.2.10/mindi/rootfs/etc/passwd

@@ +1 @@
+root::0:0::/:/bin/bash
 halt:x:7:0:halt:/sbin:/sbin/halt
-operator:x:11:0:operator:/root:/bin/bash
-root::0:0::/root:/bin/bash
+operator:x:11:0:operator:/:/bin/bash
 shutdown:x:6:0:shutdown:/sbin:/sbin/shutdown
 sync:x:5:0:sync:/sbin:/bin/sync
@@ -8 +8 @@
 daemon:x:2:2:daemon:/sbin:
 adm:x:3:4:adm:/var/adm:
-lp:x:4:7:lp:/var/spool/lpd:
-mail:x:8:12:mail:/var/spool/mail:
-postmaster:x:14:12:postmaster:/var/spool/mail:/bin/bash
-news:x:9:13:news:/usr/lib/news:
-uucp:x:10:14:uucp:/var/spool/uucppublic:
 man:x:13:15:man:/usr/man:
 guest:x:405:100:guest:/dev/null:/dev/null

branches/2.2.10/mindi/rootfs/etc/udev-links.conf

@@ -56 +56 @@
 
 M null      c   1 3
+M fuse      c   10 229

branches/2.2.10/mindi/rootfs/sbin/init

@@ -301 +301 @@
     fi
     # Depending on udevd version it gives back the hand or not :-(
-    if [ ! "`ps | grep udevd`" ]; then
+    ps | grep udevd 2> /dev/null 1> /dev/null
+    if [ $? -ne 0 ]; then
         /sbin/udevd --daemon &
+        echo "Waiting for udev to start..."
         sleep 5
     fi
@@ -309 +311 @@
         /sbin/udevtrigger
     fi
+    echo "Waiting for udev to discover..."
     create_dev_makedev
     # Newer version use udevadm for that
-    if [ -x /sbin/udevadm ]; then
-            /sbin/udevadm settle --timeout=10
-    elif [ -x /sbin/udevsettle ]; then
-        /sbin/udevsettle
+    if [ -x /sbin/udevsettle ]; then
+        /sbin/udevsettle --timeout=10
+    elif [ -x /sbin/udevadm ]; then
+        /sbin/udevadm trigger 
+        /sbin/udevadm settle --timeout=10
     fi
     # It seems we need to have more static devs on some distro were

branches/2.2.10/mindi/rootfs/sbin/start-netfs

@@ -81 +81 @@
     if [ "$proto" = "sshfs" ]; then
         LogIt "Mounting SSHFS share ($netfsmount) on /tmp/isodir..."
-        sshfs -o ro $netfsmount /tmp/isodir
+        # We need a correct console for ssh
+        ln -sf /dev/console /dev/tty
+        sshfs -o ro,StrictHostKeyChecking=no $netfsmount /tmp/isodir
     elif [ "$proto" != "" ]; then
         LogIt "Mounting Network share ($netfsmount) on /tmp/isodir..."