X-Git-Url: http://git.onelab.eu/?p=bootcd.git;a=blobdiff_plain;f=initscripts%2Fpl_functions;h=18e6952c1272c2d31a09a8b00c549f0138be9698;hp=81c3a772fb741dec6138316e190d0436185ced17;hb=c2127494a9b277ddb164ff04a79c1724a3e3ae2e;hpb=07fee163dd47c168fe628ae417f3c1a6abb89a7c diff --git a/initscripts/pl_functions b/initscripts/pl_functions index 81c3a77..18e6952 100644 --- a/initscripts/pl_functions +++ b/initscripts/pl_functions @@ -15,9 +15,9 @@ function verbose-file() { file=$1; shift echo "$file" if ! [ -f "$file" ]; then - verbose-message "!!!!!!!!!! missing $file" + verbose-message "!!!!!!!!!! missing $file" else - verbose-run cat $file + verbose-run cat $file fi } @@ -26,10 +26,10 @@ function verbose-file-uncommented-patterns () { egrep_pattern=$2; shift if ! [ -f "$file" ]; then - verbose-message "!!!!!!!!!! missing $file" + verbose-message "!!!!!!!!!! missing $file" else - echo '---------- egrep $egrep_pattern' $file - grep -v '^#' $file | egrep "$egrep_pattern" + echo '---------- egrep $egrep_pattern' $file + grep -v '^#' $file | egrep "$egrep_pattern" fi } @@ -43,7 +43,7 @@ function verbose-forensics () { # XXX : need to check for a running udev for file in /etc/resolv.conf /run/resolvconf/resolv.conf /etc/sysconfig/network-scripts/ifcfg-eth*; do - verbose-file $file + verbose-file $file done verbose-message Configured interfaces verbose-run ls -l /sys/class/net/ @@ -61,14 +61,14 @@ function verbose-forensics () { # try to resolve this hostname as that's the one used for ntp dnss=$(grep '^nameserver' /etc/resolv.conf 2>/dev/null | awk '{print $2;}') if [ -z "$dnss" ] ; then - # not too helpful, but.. - verbose-message "!!!" No server found in /etc/resolv.conf - Resolving hostname at the google public DNS - verbose-run host -W 4 pool.ntp.org 8.8.8.8 + # not too helpful, but.. + verbose-message "!!!" No server found in /etc/resolv.conf - Resolving hostname at the google public DNS + verbose-run host -W 4 pool.ntp.org 8.8.8.8 else - for dns in $dnss; do - verbose-message Resolving hostname at $dns - verbose-run host -W 4 pool.ntp.org $dns - done + for dns in $dnss; do + verbose-message Resolving hostname at $dns + verbose-run host -W 4 pool.ntp.org $dns + done fi verbose-file /root/.ssh/authorized_keys verbose-file-uncommented-patterns /etc/ssh/sshd_config 'Pass|Auth|PAM|Root'