[Fai-commit] r4085 - in trunk: bin lib
fai-commit at lists.alioth.debian.org
fai-commit at lists.alioth.debian.org
Thu Oct 12 13:40:43 UTC 2006
Author: lange
Date: 2006-10-12 13:40:43 +0000 (Thu, 12 Oct 2006)
New Revision: 4085
Modified:
trunk/bin/faireboot
trunk/lib/get-config-dir
trunk/lib/subroutines
trunk/lib/subroutines-linux
Log:
rename sndmon() to sendmon()
Modified: trunk/bin/faireboot
===================================================================
--- trunk/bin/faireboot 2006-10-12 13:35:57 UTC (rev 4084)
+++ trunk/bin/faireboot 2006-10-12 13:40:43 UTC (rev 4085)
@@ -27,7 +27,7 @@
umount -ar
killall udevd
-sndmon "FAIREBOOT"
+sendmon "FAIREBOOT"
echo "$HOSTNAME now rebooting"
if [ "X" == "X$SSH_CLIENT" -a "$TERM" != "dumb" ]; then
Modified: trunk/lib/get-config-dir
===================================================================
--- trunk/lib/get-config-dir 2006-10-12 13:35:57 UTC (rev 4084)
+++ trunk/lib/get-config-dir 2006-10-12 13:40:43 UTC (rev 4085)
@@ -10,7 +10,7 @@
### END SUBROUTINE INFO
if [ -z "$FAI_CONFIG_SRC" ]; then
- sndmon "TASKERROR get_fai_dir 21"
+ sendmon "TASKERROR get_fai_dir 21"
die "Error: Provide the URL to obtain the fai config storage in \$FAI_CONFIG_SRC"
fi
@@ -26,7 +26,7 @@
if which get-config-dir-$method &>/dev/null ; then
get-config-dir-$method
else
- sndmon "TASKERROR get_fai_dir 22"
+ sendmon "TASKERROR get_fai_dir 22"
die "Error: get-config-dir-"$method "not found"
fi
Modified: trunk/lib/subroutines
===================================================================
--- trunk/lib/subroutines 2006-10-12 13:35:57 UTC (rev 4084)
+++ trunk/lib/subroutines 2006-10-12 13:40:43 UTC (rev 4085)
@@ -112,13 +112,13 @@
# skip task
rm $LOGDIR/skip.$taskname # TODO: remove skip files at the very end
[ "$verbose" ] && echo "Skiping task_$taskname"
- sndmon "TASKSKIP $taskname"
+ sendmon "TASKSKIP $taskname"
else
echo "Calling task_$taskname"
- sndmon "TASKBEGIN $taskname"
+ sendmon "TASKBEGIN $taskname"
task_error=0 # task can set this variable to indicate an error
task_$taskname
- sndmon "TASKEND $taskname $task_error"
+ sendmon "TASKEND $taskname $task_error"
fi
# since the subroutine is not needed any more, we can undefine it
unset task_$taskname
@@ -148,14 +148,14 @@
fi
if [ -x $hfile ]; then
echo "Calling hook: $hook.$cl"
- sndmon "HOOK $hook.$cl"
+ sendmon "HOOK $hook.$cl"
# execute the hook
$hfile $dflag
check_status $hook.$cl $?
fi
if [ -x $hfile.source ]; then
echo "Source hook: $hook.$cl.source"
- sndmon "HOOK $hook.$cl.source"
+ sendmon "HOOK $hook.$cl.source"
# source this hook
. $hfile.source $dflag
check_status $hook.$cl.source $?
@@ -240,7 +240,7 @@
if [ -z "$FAI_ACTION" ]; then
echo "No action in \$FAI_ACTION defined."
- sndmon "TASKERROR action 21"
+ sendmon "TASKERROR action 21"
task_faiend
exit
fi
@@ -279,7 +279,7 @@
$FAI/hooks/$FAI_ACTION
else
echo "ERROR: User defined action $FAI/hooks/$FAI_ACTION not found."
- sndmon "TASKERROR action 22"
+ sendmon "TASKERROR action 22"
task_faiend
fi
;;
@@ -296,7 +296,7 @@
task_defclass() {
if [ ! -d $FAI/class ]; then
- sndmon "TASKERROR defclass 21"
+ sendmon "TASKERROR defclass 21"
echo "Directory $FAI/class not found. Following subdirectories are found:"
find $FAI -maxdepth 1 -type d -printf "%p\n"
die "Aborting."
@@ -397,7 +397,7 @@
# reboot without prompting if FAI_FLAG reboot is set
[ "$flag_reboot" -lt "1" ] && read
echo "Rebooting $HOSTNAME now"
- sndmon REBOOT
+ sendmon REBOOT
cd /
sync
@@ -453,7 +453,7 @@
if [ -f $stamp ]; then
echo "Error while executing commands in subshell."
echo "$stamp was not removed."
- sndmon "TASKERROR install 21"
+ sendmon "TASKERROR install 21"
die "Please look at the log files in $LOGDIR for errors."
fi
}
@@ -480,7 +480,7 @@
if [ -f $stamp ]; then
echo "Error while executing commands in subshell."
echo "$stamp was not removed."
- sndmon "TASKERROR install 21"
+ sendmon "TASKERROR install 21"
die "Please look at the log files in $LOGDIR for errors."
fi
}
@@ -518,7 +518,7 @@
if [ -f $stamp ]; then
echo "Error while executing commands in subshell."
echo "$stamp was not removed."
- sndmon "TASKERROR softupdate 21"
+ sendmon "TASKERROR softupdate 21"
die "Please look at the log files in $LOGDIR for errors."
fi
umount $FAI_ROOT/fai
Modified: trunk/lib/subroutines-linux
===================================================================
--- trunk/lib/subroutines-linux 2006-10-12 13:35:57 UTC (rev 4084)
+++ trunk/lib/subroutines-linux 2006-10-12 13:40:43 UTC (rev 4085)
@@ -82,7 +82,7 @@
[ -z "$monserver" ] && monserver=$SERVER
faimond=1
sendhostname=$HOSTNAME # save current hostname
- if sndmon check; then
+ if sendmon check; then
echo "Monitoring to server $monserver enabled."
else
faimond=0
@@ -103,7 +103,7 @@
# setup_harddisks must create $LOGDIR/disk_var.sh file
if [ ! -s $LOGDIR/disk_var.sh ]; then
cat $LOGDIR/format.log
- sndmon "TASKERROR partition 21"
+ sendmon "TASKERROR partition 21"
die "setup_harddisks did not create $LOGDIR/disk_var.sh file."
fi
# now define variable for root and boot partition and boot device
@@ -152,7 +152,7 @@
if mount $romountopt $FAI_DEBMIRROR $FAI_ROOT/$MNTPOINT; then
[ "$debug" ] && echo "Mirror mounted from $FAI_DEBMIRROR to $FAI_ROOT/$MNTPOINT"
else
- sndmon "TASKERROR mirror $?"
+ sendmon "TASKERROR mirror $?"
die "Can't mount $FAI_DEBMIRROR"
fi
}
@@ -279,7 +279,7 @@
fi
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-sndmon() {
+sendmon() {
# send message to monitor daemon
[ "$faimond" -eq 0 ] && return 0
More information about the Fai-commit
mailing list