From: Andrea R. <ar...@sy...> - 2006-01-02 08:34:09
|
Author: arighi Date: 2006-01-02 06:45:31 -0600 (Mon, 02 Jan 2006) New Revision: 3391 Modified: trunk/etc/autoinstallscript.template trunk/initrd_source/skel/etc/init.d/functions Log: - added MONITOR_CONSOLE=yes|no option - fix: removed some error messages with si_monitor.log - fix: report the correct completed status with tmpfs staging Modified: trunk/etc/autoinstallscript.template =================================================================== --- trunk/etc/autoinstallscript.template 2006-01-02 06:59:33 UTC (rev 3390) +++ trunk/etc/autoinstallscript.template 2006-01-02 12:45:31 UTC (rev 3391) @@ -213,6 +213,9 @@ RETRY=7 FLAMETHROWER_TARPIPE=y flamethrower_client + if [ ! -z $MONITOR_SERVER ]; then + stop_report_task 100 + fi else # Use rsync if [ $NO_LISTING ]; then @@ -231,11 +234,18 @@ rsync -aHS${VERBOSE_OPT} --exclude=lost+found/ --exclude=/proc/* --numeric-ids \ ${IMAGESERVER}::${IMAGENAME}/ ${DIR}/ || shellout + if [ ! -z $MONITOR_SERVER ]; then + stop_report_task 100 + fi + # Move from staging in tmpfs to disk rsync -aHS${VERBOSE_OPT} --exclude=lost+found/ --numeric-ids ${DIR}/ /a/ else logmsg "rsync -aHS${VERBOSE_OPT} --exclude=lost+found/ --exclude=/proc/* --numeric-ids ${IMAGESERVER}::${IMAGENAME}/ /a/" rsync -aHS${VERBOSE_OPT} --exclude=lost+found/ --exclude=/proc/* --numeric-ids ${IMAGESERVER}::${IMAGENAME}/ /a/ || shellout + if [ ! -z $MONITOR_SERVER ]; then + stop_report_task 100 + fi fi fi @@ -252,10 +262,6 @@ # Leave notice of which image is installed on the client echo $IMAGENAME > /a/etc/systemimager/IMAGE_LAST_SYNCED_TO || shellout -if [ ! -z $MONITOR_SERVER ]; then - stop_report_task 100 -fi - # Copy the raidtab into the image. cp -f /etc/raidtab /a/etc/raidtab Modified: trunk/initrd_source/skel/etc/init.d/functions =================================================================== --- trunk/initrd_source/skel/etc/init.d/functions 2006-01-02 06:59:33 UTC (rev 3390) +++ trunk/initrd_source/skel/etc/init.d/functions 2006-01-02 12:45:31 UTC (rev 3391) @@ -90,12 +90,16 @@ # Check if the network is up before trying to send data to the # monitor server. if [ ! -z $MONITOR_SERVER ]; then - # Log message into the global monitor log. - echo $@ >> /tmp/si_monitor.log 2>/dev/null # Send the message to the monitor daemon. - ifconfig 2>&1 | grep "inet addr" | grep -v "127.0.0.1" >/dev/null 2>&1 - if [ $? -eq 0 ]; then - send_monitor_msg "log=$@" + if [ "x$MONITOR_CONSOLE" = "xyes" ]; then + # Log message into the global monitor log. + if ((`mount 2>/dev/null | grep ' / ' | grep -q '(rw)'`)); then + echo $@ >> /tmp/si_monitor.log + fi + ifconfig 2>&1 | grep "inet addr" | grep -v "127.0.0.1" >/dev/null 2>&1 + if [ $? -eq 0 ]; then + send_monitor_msg "log=$@" + fi fi fi } @@ -188,6 +192,7 @@ echo "MONITOR_SERVER=$MONITOR_SERVER" >> /tmp/variables.txt echo "MONITOR_PORT=$MONITOR_PORT" >> /tmp/variables.txt + echo "MONITOR_CONSOLE=$MONITOR_CONSOLE" >> /tmp/variables.txt } # ################################################################################ |