Changeset 3563 in MondoRescue for branches/3.0-mindi-2.1/mindi/rootfs/sbin

Timestamp:

Apr 11, 2016, 7:43:30 PM (8 years ago)

Author:

Bruno Cornec

Message:

Many additional backports from 3.2 and 3.0 future

• Improved support for systemd
• Launch start-netfs when a network conf is detected in the conf file to avoid an error later on in automatic mode

Location:

branches/3.0-mindi-2.1/mindi/rootfs/sbin

Files:

• find-and-mount-cdrom (modified) (1 diff)
• post-init (modified) (2 diffs)
• start-netfs (modified) (2 diffs)

branches/3.0-mindi-2.1/mindi/rootfs/sbin/find-and-mount-cdrom

@@ -1 +1 @@
 #!/bin/sh
-
+#
+# $Id$
+#
 
 TryToFindCDROM() {

branches/3.0-mindi-2.1/mindi/rootfs/sbin/post-init

@@ -5 +5 @@
 #------------------------------------------------------------
 
-
-sleep 1
-
-echo "Here is my /tmp/mountlist.txt" >> $LOGFILE
-cat /tmp/mountlist.txt >> $LOGFILE
+if [ -f "/tmp/mountlist.txt" ]; then
+    echo "Here is my /tmp/mountlist.txt" >> $LOGFILE
+    cat /tmp/mountlist.txt >> $LOGFILE
+fi
 
 iso=`grep iso /proc/cmdline`
@@ -68 +67 @@
 fi
 
+# Now suppress msg redirection to avoid poluting log file
+exec 2>&4 >&5 4>&- 5>&-
+
 if [ "$compare" ] ; then
     LogIt "------------------COMPARE MODE-----------------" 1

branches/3.0-mindi-2.1/mindi/rootfs/sbin/start-netfs

@@ -70 +70 @@
 
         # If same system, map to the right MAC address
-        hwaddr_found=`ifconfig $ipdev | /bin/grep HWaddr | awk '{print $NF}'`
-        if [ "$hwaddr" != "$hwaddr_found" ]; then
-            ipdev_new=`ifconfig -a | /bin/grep $hwaddr | awk '{print $1}'`
-            if [ "$ipdev_new" != "" ]; then
-                LogIt "Interface $ipdev changed to $ipdev_new (MAC: $hwaddr)"
-                ipdev=$ipdev_new
-            else
-                LogIt "NOTE: Interface $ipdev kept despite it doesn't match the $hwaddr MAC address"
+        if [ "$hwaddr" != "" ]; then
+            hwaddr_found=`ifconfig $ipdev | grep HWaddr | awk '{print $NF}'`
+            if [ "$hwaddr" != "$hwaddr_found" ]; then
+                ipdev_new=`ifconfig -a | grep $hwaddr | awk '{print $1}'`
+                if [ "$ipdev_new" != "" ]; then
+                    LogIt "Interface $ipdev changed to $ipdev_new (MAC: $hwaddr)"
+                    ipdev=$ipdev_new
+                else
+                    LogIt "NOTE: Interface $ipdev kept despite it doesn't match the $hwaddr MAC address"
+                fi
             fi
         fi
@@ -115 +117 @@
     elif [ "$proto" = "smbfs" ]; then
         LogIt "Mounting SMBFS share ($netfsmount) on /tmp/isodir..."
-        mount -t cifs $netfsopt $netfsmount /tmp/isodir -o ro 
+        mount -t cifs $netfsmount /tmp/isodir -o ro $netfsopt 
     elif [ "$proto" != "" ]; then
         if [ -x /sbin/rpcbind ]; then
-            "Startng rpcbind daemon..."
-            /sbin/rpcbind &
+            echo "Starting rpcbind daemon..."
+            /sbin/rpcbind -w &
         fi
         LogIt "Mounting Network share ($netfsmount) on /tmp/isodir..."