diff options
author | Scott Ullrich <sullrich@pfsense.org> | 2008-07-31 20:57:32 +0000 |
---|---|---|
committer | Scott Ullrich <sullrich@pfsense.org> | 2008-07-31 20:57:32 +0000 |
commit | 13d219d74dd6ef50d8a09f00003d39e5541730d0 (patch) | |
tree | cbe9a441605792c9ea14c3a71e420ca6e77e926a | |
parent | 26aa0611aca1483ab112d18fba7aa31e8f8f30f8 (diff) | |
download | pfsense-13d219d74dd6ef50d8a09f00003d39e5541730d0.zip pfsense-13d219d74dd6ef50d8a09f00003d39e5541730d0.tar.gz |
Output echos in the correct order.
-rw-r--r-- | etc/phpshellsessions/cvssync | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/etc/phpshellsessions/cvssync b/etc/phpshellsessions/cvssync index 1aca41c..a50a74c 100644 --- a/etc/phpshellsessions/cvssync +++ b/etc/phpshellsessions/cvssync @@ -127,12 +127,10 @@ exec("rm -rf ${CODIR}/pfSense/root/.shrc"); exec("rm -rf ${CODIR}/pfSense/root/.tcshrc"); exec("rm -f ${CODIR}/pfSense/etc/syslog.conf 2>/dev/null"); -echo "Installing new files...\n"; +echo "===> Installing new files...\n"; exec("cd $CODIR/pfSense ; tar -cpf - . | (cd / ; tar -Uxpf -)"); -echo "CVS Sync Complete\n"; - post_cvssync_commands(); echo "===> Checkout complete. Your system is now sync'd. Scripting terminating.\n"; @@ -143,22 +141,22 @@ function post_cvssync_commands() { exec("rm -rf /tmp/xcache/* 2>/dev/null"); - echo "Upgrading configuration...\n"; - + echo "===> Upgrading configuration (if needed)...\n"; convert_config(); + + echo "===> Syncing system passwords...\n"; sync_webgui_passwords(); echo "Restarting check_reload_status...\n"; exec("killall check_reload_status"); mwexec_bg("nohup /usr/bin/nice -n20 /usr/local/sbin/check_reload_status"); - echo "Configuring filter..."; + echo "===> Configuring filter..."; exec("/etc/rc.filter_configure_sync"); exec("pfctl -f /tmp/rules.debug"); echo "\n"; - echo "Signaling PHP and Lighty restart..."; + echo "===> Signaling PHP and Lighty restart..."; mwexec_bg("sleep 5 ; killall php ; touch /tmp/restart_webgui"); - echo "\nCVSSync completed.\n"; } |