Changeset 2850 in MondoRescue for branches/2.2.10/mindi/rootfs/sbin/init

Timestamp:

Jul 24, 2011, 4:12:44 AM (14 years ago)

Author:

Bruno Cornec

Message:

svn merge -r 2773:2849 2.2.9 in 2.2.10

• Adds 3 binaries called potentially by udev o support USB key mount at restore time (Victor Gattegno)
• Really support both mkisofs and genisoimage everywhere
• Try to handle netfs_user better in all cases (NFS and SSHFS)
  • Improve logging in init script
  • Format improvement
  • Removes a warning when trying to launch udevadm and it doesn't exist (RHEL 5 e.g.)
  • Fix syntax description in mondoarchive man page for -E & -I with |
• Adds download entries for new distro supported (Mageia, Fedora 15, Ubuntu 11.04)

-Fix mindi-get-perl-modules when perl dirs in @INC are symlinks (case on Ubuntu 11.04)

• Fix option --findkernel in case of Xen kernel so that mondoarchive get a correct answer instead of an empty one.
• Fix multi-media restore by umounting it before looping to ask for the next (as if already mounted, will not pass to the next alone)
• Fix 485 by replacing a wrong call to mr_asprintf which was provoking core dumped.
• Fix -E and -I example in man page which were lacking the '|' as separator
• Fix #484 by adding support for the arcmsr driver (to support the Areca ARC-1220 RAID Controller)
  • Avoids error msgs if no mondo-restore.cfg file exists (when mindi used stdalone)
  • Adds the swapon feature to mindi-busybox
  • Attempt to fix Xen kernel support by avoiding to remove xen kernel fro; the possible_kernels list too early, whereas it's used afterwards to get them.
  • Fix #481 by supporting the new kbd file in latest Ubuntu 10.10+ (victor.gattegno_at_hp.com)
• Update from Lester Wade on P2V doc including RHEL6 validation and some minor additions
• removes telinit call in busybox o try to fix problems whn reboot at end of restore.
• if -E option for mondoarchive was not specified, variable excp points to NULL, so string exclude_pathes contained '(null)' instead of being avoided (derived from a patch from taguchi_at_ff.iij4u.or.jp)
• fix -maxdepth option for find command. it sould be '-maxdepth .. -name ..', not '-name .. -maxdepth ..' (patch from taguchi_at_ff.iij4u.or.jp)
• Adds an extraversion for revision support
• Adds support for ifconfig and ping for PXE+NFS boot for this version of mindi-busybox
• Example of MINDI_ADDITIONAL_BOOT_PARAMS in mindi.conf added
• fix a compilation error
• Remove an absolute ref in the docs web page

File:

• branches/2.2.10/mindi/rootfs/sbin/init (modified) (13 diffs)

branches/2.2.10/mindi/rootfs/sbin/init

@@ -102 +102 @@
     if which loadkeys > /dev/null 2> /dev/null ; then
         loadkeys $fname
+        LogIt "Using $fname keyboard map." 1
     else
         LogIt "Using default US keyboard map." 1
@@ -240 +241 @@
 
 # Taken from udev management in Mandriva 2008.0. Kudos guys
-make_extra_nodes () {
+MakeExtraNodes () {
     # there are a few things that sysfs does not export for us.
     # these things are listed in /etc/udev/links.conf
@@ -255 +256 @@
 }
 
-create_dev_makedev() {
+CreateDevMakedev() {
   if [ -e /sbin/MAKEDEV ]; then
     ln -sf /sbin/MAKEDEV /dev/MAKEDEV
@@ -266 +267 @@
     # Inspiration from Mandriva 2008.0 startup script
     echo "Preparing udev environment..."
+    LogIt "Preparing udev environment..."
     mv /dev /dev.static
     mkdir /dev
     mount -n -o size=5M,mode=0755 -t tmpfs none /dev
-    make_extra_nodes
+    MakeExtraNodes
     mount -n -t devpts -o mode=620 none /dev/pts
     mount -n -t tmpfs  none /dev/shm
@@ -289 +291 @@
         echo "Waiting for udev to start..."
         sleep 5
+        LogIt "udev started manually"
     fi
     mkdir -p /dev/.udev/queue/
@@ -295 +298 @@
     fi
     echo "Waiting for udev to discover..."
-    create_dev_makedev
+    CreateDevMakedev
     # Newer version use udevadm for that
     if [ -x /sbin/udevsettle ]; then
         /sbin/udevsettle --timeout=10
+        LogIt "Discovering with udevsettle"
     elif [ -x /sbin/udevadm ]; then
-        /sbin/udevadm trigger 
+        UdevadmTrigger
         /sbin/udevadm settle --timeout=10
+        LogIt "Discovering with udevadm"
     fi
     # It seems we need to have more static devs on some distro where
@@ -343 +348 @@
 
 
-#RunDevfsd() {
-#    loc=`which devfsd 2> /dev/null`
-#    if [ "$loc" != "" ] ; then
-#        LogIt "Starting devfsd"
-#        devfsd /dev &
-#        sleep 5
-#    fi
-#}
-
-
-
 StartUSBKbd() {
 # Prepare minimal USB env in case we have USB kbd such as with iLO
@@ -374 +368 @@
         LogIt "Scanning LVM's..." 1
         if which lvm ; then
-            modprobe -q dm-mod
-            modprobe -q dm_mod
-            lvm vgscan --mknodes
+            modprobe -q dm-mod
+            modprobe -q dm_mod
+            lvm vgscan --mknodes
         else
-            vgscan
+            vgscan
         fi
 
@@ -413 +407 @@
         /tmp/start-lvm &
         for i in 1 2 3 4 5 ; do
-            echo -en "."
-            sleep 1
+            echo -en "."
+            sleep 1
         done
         rm -f /tmp/start-lvm
@@ -427 +421 @@
 
     # Taken from the init script of EMC PowerPath on RHEL
-    if [ -f /etc/emcp_devicesDB.dat ]; then 
-        if [ -f /etc/emcp_devicesDB.idx ]; then
-            /etc/opt/emcpower/emcpmgr map -p > /dev/null 2>&1
-        fi
-    fi
-
-    /sbin/powermt config > /dev/null 2>&1
-    #  Wait for udev to finish creating emcpower devices
-    #
-    pdfound=1
-    for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do
-        pdfound=1
-        for pd in `/bin/ls -d /sys/block/emcpower* 2> /dev/null`; do
-           bpd=`basename $pd`
-           if [ ! -e /dev/$bpd ]; then
-              pdfound=0
-              sleep 2
-              break;
-           fi
-        done
-        if [ "$pdfound" -eq 1 ]; then
+    if [ -f /etc/emcp_devicesDB.dat ]; then 
+        if [ -f /etc/emcp_devicesDB.idx ]; then
+            /etc/opt/emcpower/emcpmgr map -p > /dev/null 2>&1
+        fi
+    fi
+
+    /sbin/powermt config > /dev/null 2>&1
+    #   Wait for udev to finish creating emcpower devices
+    #
+    pdfound=1
+    for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do
+        pdfound=1
+        for pd in `/bin/ls -d /sys/block/emcpower* 2> /dev/null`; do
+            bpd=`basename $pd`
+            if [ ! -e /dev/$bpd ]; then
+                pdfound=0
+                sleep 2
+                break;
+            fi
+        done
+        if [ "$pdfound" -eq 1 ]; then
             break
-        fi
-    done
-    if [ "$pdfound" -eq 0 ]; then
-       echo "Unable to start PowerPath"
-    fi
-
-    /sbin/powermt load      > /dev/null 2>&1
-    /etc/opt/emcpower/emcpmgr map   > /dev/null 2>&1
-    /etc/opt/emcpower/powercf -C    > /dev/null 2>&1
-    if [ ! -e /etc/powermt.custom ]; then 
-       /sbin/powermt save       > /dev/null 2>&1
-    fi 
-    /sbin/powermt register  > /dev/null 2>&1
-    /sbin/powermig transition -startup -noprompt   > /dev/null 2>&1
+        fi
+    done
+    if [ "$pdfound" -eq 0 ]; then
+        echo "Unable to start PowerPath"
+    fi
+
+    /sbin/powermt load      > /dev/null 2>&1
+    /etc/opt/emcpower/emcpmgr map   > /dev/null 2>&1
+    /etc/opt/emcpower/powercf -C    > /dev/null 2>&1
+    if [ ! -e /etc/powermt.custom ]; then 
+        /sbin/powermt save      > /dev/null 2>&1
+    fi 
+    /sbin/powermt register  > /dev/null 2>&1
+    /sbin/powermig transition -startup -noprompt    > /dev/null 2>&1
 }
 
@@ -482 +476 @@
                 /sbin/dmsetup ls --target multipath --exec "/sbin/kpartx -a -p p"
             fi
+            LogIt "Multipath started"
         fi
     fi
@@ -678 +673 @@
 
 ExtractDataDisksAndLoadModules() {
-    echo "Installing additional tools ..."
+    LogIt "Installing additional tools ..." 1
     install-additional-tools
     # Keep the kernel silent again
@@ -898 +893 @@
 # Not sure it's still needed, but shouldn't hurt
 if [ "$USE_UDEV" = "yes" ]; then
-    if [ -x /sbin/udevadm ]; then
-        UdevadmTrigger
-    fi
+    UdevadmTrigger
 
 fi