Changeset 2603 in MondoRescue for branches/2.2.10/mindi/rootfs/sbin

Timestamp:

Mar 22, 2010, 1:56:30 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3757@localhost: bruno | 2010-03-17 15:05:13 +0100

• Adds a new interface param between mondoarchive and mindi for backup-media-type which was missing
• Improve again logging
• Try to improve keymap support
• Remove some remaining hard coded /proc/cmdline
• Adds a cache for the find command for modules launched twice to make it quicker on my Atom netboot in a QEMU VM
• Remove dependency at build time on mindi to only use MINDI_CONF env var

Location:

branches/2.2.10/mindi/rootfs/sbin

Files:

• hack-cfg-if-necessary (modified) (1 diff)
• init (modified) (8 diffs)

branches/2.2.10/mindi/rootfs/sbin/hack-cfg-if-necessary

@@ -17 +17 @@
 
 if [ -f $MINDI_CACHE/mondorestore.cfg ]; then
-    if [ !  grep "backup-media-type iso" $MINDI_CACHE/mondorestore.cfg 2 > /dev/null] ; then
+    grep -q "backup-media-type iso" $MINDI_CACHE/mondorestore.cfg 2> /dev/null
+    if [ $? -ne 0 ] ; then
         LogIt "Config file is fine, BTW."
         exit 0
     fi
-fi
-
-if [ -f $MINDI_CACHE/mondorestore.cfg ]; then
     LogIt "Re-jigging mondorestore.cfg because you backed up to ISOs and then burned them to CDs" 1
     sed -i 's/backup-media-type iso/backup-media-type cdr/' $MINDI_CACHE/mondorestore.cfg

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
+    serial="/foo"
     # 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.)
-    for i in `cat /proc/cmdline` ; do
+    for i in `cat $CMDLINE` ; do
         echo $i | grep -qi serial= && serial=`echo $i | cut -d= -f2`
     done
@@ -376 +377 @@
 
 StartLvms() {
-    if [ "`grep -i nolvm /proc/cmdline`" ]; then
+    if [ "`grep -i nolvm $CMDLINE`" ]; then
         return;
     fi
@@ -497 +498 @@
     local raid_devices i
 
-    if [ "`grep -i noraid /proc/cmdline`" ]; then
+    if [ "`grep -i noraid $CMDLINE`" ]; then
         return;
     fi
@@ -512 +513 @@
         done
     elif which mdrun > /dev/null 2> /dev/null ; then
-        if [ "`grep -i nomd /proc/cmdline`" ]; then
+        if [ "`grep -i nomd $CMDLINE`" ]; then
             return;
         fi
@@ -518 +519 @@
         mdrun
     elif which mdadm > /dev/null 2> /dev/null ; then
-        if [ "`grep -i nomd /proc/cmdline`" ]; then
+        if [ "`grep -i nomd $CMDLINE`" ]; then
             return;
         fi
@@ -636 +637 @@
 ModprobeAllModules() {
 
-    lismod=`find /lib/modules -name '*\.ko*' -o -name '*\.o*'`
+    echo "Preparing to install modules..."
+    # Create a cache first time
+    if [ ! -f /tmp/lismod.txt ]; then
+        find /lib/modules -name '*\.ko*' -o -name '*\.o*' > /tmp/lismod.txt
+    fi
+    lismod=`cat /tmp/lismod.txt`
     # loading forced modules first
     for m in $lismod; do
@@ -650 +656 @@
         k=`basename $m | sed 's/\.ko.*$//'`
         j=`basename $k | sed 's/\.o.*$//'`
+        lsmod | grep -qE '^$j$'
+        if [ $? -eq 0 ];then
+            # Already loaded
+            continue
+        fi
         echo "$DENY_MODS" | grep -q "$j "
         if [ $? -eq 0 ]; then
@@ -730 +741 @@
     export FORCE_MODS=" "
 fi
-if [ "`grep -i excludedevs /proc/cmdline`" ]; then
-    export MINDI_EXCLUDE_DEVS="`cat /proc/cmdline | sed 's~.*excludedevs=\"\(.*\)\".*~\1~'` mondonone"
+if [ "`grep -i excludedevs $CMDLINE`" ]; then
+    export MINDI_EXCLUDE_DEVS="`cat $CMDLINE | sed 's~.*excludedevs=\"\(.*\)\".*~\1~'` mondonone"
     for d in $MINDI_EXCLUDE_DEVS ; do
         echo "Mountlist exclusion == $d"