Changeset 3444 in MondoRescue

Timestamp:

Aug 29, 2015, 2:32:48 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Fix a missing instruction and homogeneize logs with prefixes

File:

• branches/3.2/mindi/rootfs/usr/sbin/start-netfs (modified) (9 diffs)

branches/3.2/mindi/rootfs/usr/sbin/start-netfs

@@ -53 +53 @@
     # Network configuration stored during archive
     # or on cmdline so network wanted => starting it
-    LogIt "Starting Network..."
+    LogIt "INFO: Starting Network..."
 
     # Activate loobback
@@ -82 +82 @@
             if [ "$hwaddr" = "$hwaddr_found" ]; then
                 # No renaming took place use it
+                LogIt "INFO: Using device $ipdev (Mac Addr: $hwaddr_found)"
             fi
         else
@@ -93 +94 @@
                 if [ "$hwaddr" = "$mac" ]; then
                     # This is the new device for the MAC address of our card at backup time
-                    LogIt "Interface with MAC address $hwaddr changed from $ipdev to $hwdev"
-                    LogIt "Using $hwdev for network configuration from now on"
+                    LogIt "INFO: Interface with MAC address $hwaddr changed from $ipdev to $hwdev"
+                    LogIt "INFO: Using $hwdev for network configuration from now on"
                     ipdev=$hwdev
                     break
@@ -102 +103 @@
             if [ "$oldipdev" = "$ipdev" ]; then
                 # We didn't find a new device for this MAC
-                LogIt "NOTE: Interface $ipdev kept despite it doesn't match the $hwaddr MAC address"
+                LogIt "WARN: Interface $ipdev kept despite it doesn't match the $hwaddr MAC address"
                 ipdev=$oldipdev
             fi
@@ -116 +117 @@
 
     if [ "$ipmode" = "DHCP" ]; then
-        LogIt "Making DHCP request on $ipdev"
+        LogIt "INFO: Making DHCP request on $ipdev"
         udhcpc -i $ipdev
     else
-        LogIt "Configuring $ipdev statically ($ipaddress/$ipnetmask/$ipgateway)"
+        LogIt "INFO: Configuring $ipdev statically ($ipaddress/$ipnetmask/$ipgateway)"
         ifconfig $ipdev $ipaddress netmask $ipnetmask broadcast $ipbroadcast
         route add default gw $ipgateway
@@ -129 +130 @@
     if [ _"$iproute" != _"" ]; then
         iproute=`echo $iproute | sed -i 's/:/ /g'`
-        LogIt "Adding static route with route add $iproute"
+        LogIt "INFO: Adding static route with route add $iproute"
         route add $iproute
     fi
 
     # ping server helps waking interface up
-    LogIt "Pinging Remote server..."
+    LogIt "INFO: Pinging Remote server..."
     netfs_server_ipaddr=`echo $netfsmount | cut -d: -f1 | cut -d@ -f2`
     ping -c $ipcount $netfs_server_ipaddr 
@@ -140 +141 @@
     # Which is our protocol for file sharing
     if [ "$proto" = "" ]; then
-        LogIt "No protocol specified, defaulting to NFS"
+        LogIt "WARN: No protocol specified, defaulting to NFS"
         proto="nfs"
     fi
 
     if [ "$proto" = "sshfs" ]; then
-        LogIt "Mounting SSHFS share ($netfsmount) on /tmp/isodir..."
+        LogIt "INFO: Mounting SSHFS share ($netfsmount) on /tmp/isodir..."
         # We need a correct console for ssh
         ln -sf /dev/console /dev/tty
         sshfs -o ro,StrictHostKeyChecking=no $netfsopt $netfsmount /tmp/isodir
     elif [ "$proto" = "smbfs" ]; then
-        LogIt "Mounting SMBFS share ($netfsmount) on /tmp/isodir..."
+        LogIt "INFO: Mounting SMBFS share ($netfsmount) on /tmp/isodir..."
         mount -t cifs $netfsmount /tmp/isodir -o ro $netfsopt 
     elif [ "$proto" != "" ]; then
@@ -157 +158 @@
             /sbin/rpcbind -w &
         fi
-        LogIt "Mounting Network share ($netfsmount) on /tmp/isodir..."
+        LogIt "INFO: Mounting Network share ($netfsmount) on /tmp/isodir..."
         touch /etc/mtab
         mount -t $proto -o nolock,ro $netfsopt $netfsmount /tmp/isodir
     else
-        LogIt "Unknown protocol $proto"
+        LogIt "ERROR: Unknown protocol $proto"
     fi
     
-    LogIt "Mounting Remote image ${imgname}-1.iso in $dirimg on /mnt/cdrom in loopback"
+    LogIt "INFO: Mounting Remote image ${imgname}-1.iso in $dirimg on /mnt/cdrom in loopback"
     mount -o ro,loop -t iso9660 /tmp/isodir/$dirimg/${imgname}-1.iso /mnt/cdrom
 
@@ -170 +171 @@
     if [ "`echo $pre | grep -E '^/tmp/isodir'`" ]; then
         cp $pre /tmp
-        LogIt "Copying $pre under /tmp"
+        LogIt "INFO: Copying $pre under /tmp"
     fi
     if [ "`echo $post | grep -E '^/tmp/isodir'`" ]; then
         cp $post /tmp
-        LogIt "Copying $post under /tmp"
+        LogIt "INFO: Copying $post under /tmp"
     fi
 fi