diff options
| author | Chris Buechler <cmb@pfsense.org> | 2009-06-24 20:22:01 -0400 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2009-06-24 20:22:01 -0400 |
| commit | fc1e7d9fa2a69ba4fb4ff058c1c3aded5ebd8176 (patch) | |
| tree | 1748564fdf6bda64402da739731249aaef5223af | |
| parent | 2b9fbe3ab59fa958715e8b2ccb17dcb730f880b2 (diff) | |
| download | pfsense-fc1e7d9fa2a69ba4fb4ff058c1c3aded5ebd8176.zip pfsense-fc1e7d9fa2a69ba4fb4ff058c1c3aded5ebd8176.tar.gz | |
Skip sleep if argument is specified, and update bogons at end of setup wizard.
| -rwxr-xr-x | etc/rc.update_bogons.sh | 6 | ||||
| -rw-r--r-- | usr/local/www/wizards/setup_wizard.xml | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/etc/rc.update_bogons.sh b/etc/rc.update_bogons.sh index 8c9d6d5..469ef70 100755 --- a/etc/rc.update_bogons.sh +++ b/etc/rc.update_bogons.sh @@ -11,8 +11,10 @@ value=`od -A n -d -N2 /dev/random | awk '{ print $1 }'` echo "rc.update_bogons.sh is sleeping for $value" | logger -# Sleep for that time. -sleep $value +# Sleep for that time, unless an argument is specified. +if [ ! $1 ]; then + sleep $value +fi echo "rc.update_bogons.sh is beginning the update cycle." | logger diff --git a/usr/local/www/wizards/setup_wizard.xml b/usr/local/www/wizards/setup_wizard.xml index bc09aed..cd3805c 100644 --- a/usr/local/www/wizards/setup_wizard.xml +++ b/usr/local/www/wizards/setup_wizard.xml @@ -411,6 +411,7 @@ <description>A reload is now in progress. Please wait. <p> The system will automatically try to access $myurl in 120 seconds. <p> You can click on the icon above to access the site more quickly. <meta http-equiv="refresh" content="60; url=$myurl" ></description> <stepafterformdisplay> + mwexec_bg("/etc/rc.update_bogons.sh now"); reload_all(); </stepafterformdisplay> </step> |
