[Fai-commit] r3635 - trunk/lib

[fai-commit at lists.alioth.debian.org]

Author: lange
Date: 2006-07-22 23:54:32 +0000 (Sat, 22 Jul 2006)
New Revision: 3635

Modified:
   trunk/lib/fai-divert
   trunk/lib/fai-mount-disk
   trunk/lib/get-boot-info
   trunk/lib/subroutines
   trunk/lib/subroutines-linux
Log:
minor changes


Modified: trunk/lib/fai-divert
===================================================================
--- trunk/lib/fai-divert	2006-07-22 23:48:45 UTC (rev 3634)
+++ trunk/lib/fai-divert	2006-07-22 23:54:32 UTC (rev 3635)
@@ -37,7 +37,7 @@
 	#! /bin/sh
 	# diversion of $1 created by FAI
 	exit 0
-EOF
+    EOF
     chmod a+rx $FAI_ROOT/$1
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Modified: trunk/lib/fai-mount-disk
===================================================================
--- trunk/lib/fai-mount-disk	2006-07-22 23:48:45 UTC (rev 3634)
+++ trunk/lib/fai-mount-disk	2006-07-22 23:54:32 UTC (rev 3635)
@@ -38,7 +38,7 @@
 		echo "/etc/$fstab found in $partition"
 		fstabpart=$partition   # used in fstab_mount
 		fstablist="$fstablist $partition"
-		fstabcount=$((fstabcount+1))
+		(( fstabcount += 1 ))
 	    fi
 	done
     done

Modified: trunk/lib/get-boot-info
===================================================================
--- trunk/lib/get-boot-info	2006-07-22 23:48:45 UTC (rev 3634)
+++ trunk/lib/get-boot-info	2006-07-22 23:54:32 UTC (rev 3635)
@@ -48,7 +48,7 @@
 
     # some network driver do not echo eth0,..; they are not detected
     netdevices_all=$(dmesg| perl -ne 'print $&,"\n" if m/\beth[0-9]\b/')
-    tmp=$(ifconfig -a | grep ^eth | awk '{ print $1 }')
+    tmp=$(ifconfig -a | awk '/^eth/ { print $1 }')
     netdevices_all="$netdevices_all $tmp"
     netdevices_all=$(for dev in $netdevices_all; do echo $dev; done| sort | uniq)
 
@@ -100,13 +100,13 @@
     NETMASK=${ips%%:*}
     BROADCAST=${IPADDR%\.*}.255
 
-    cat >> $bootlog <<EOF
-IPADDR=$IPADDR
-SERVER=$SERVER
-NETMASK=$NETMASK
-GATEWAYS=$GATEWAYS
-BROADCAST=$BROADCAST
-EOF
+    cat >> $bootlog <<-EOF
+	IPADDR=$IPADDR
+	SERVER=$SERVER
+	NETMASK=$NETMASK
+	GATEWAYS=$GATEWAYS
+	BROADCAST=$BROADCAST
+    EOF
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 get_fixed_info() {

Modified: trunk/lib/subroutines
===================================================================
--- trunk/lib/subroutines	2006-07-22 23:48:45 UTC (rev 3634)
+++ trunk/lib/subroutines	2006-07-22 23:54:32 UTC (rev 3635)
@@ -87,7 +87,7 @@
     local i=0
     while jobsrunning; do
 	[ $(($i % 3)) -eq 0 ] && echo "Waiting for background jobs to finish."
-	i=$(($i+1))
+	(( i += 1 ))
 	sleep 10
     done
 }

Modified: trunk/lib/subroutines-linux
===================================================================
--- trunk/lib/subroutines-linux	2006-07-22 23:48:45 UTC (rev 3634)
+++ trunk/lib/subroutines-linux	2006-07-22 23:54:32 UTC (rev 3635)
@@ -219,7 +219,7 @@
     local frsh
     local doexit=0
     local hostname=$(hostname)
-    local ipaddr=$(cat $LOGDIR/boot.log | grep IPADDR | cut -d\' -f2)
+    local ipaddr=$(grep IPADDR $LOGDIR/boot.log | cut -d\' -f2)
     frsh="$FAI_REMOTESH -l $LOGUSER ${SERVER}"
 
     if [ -z "$SERVER" ] ; then