diff options
author | Renato Botelho <renato@netgate.com> | 2015-09-11 13:53:23 -0300 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2015-09-11 13:53:23 -0300 |
commit | 568346d4daf38b4e61bf9aa469e6a5e5d2a7ffc7 (patch) | |
tree | a38658e870ce0aa5864452fd22721d54f577ef8d /src | |
parent | 6d5e25ce116dadc4b7963c4affe13f271c1493ea (diff) | |
parent | 30855514e07b2980e4f433b0f68afb480e32ba81 (diff) | |
download | pfsense-568346d4daf38b4e61bf9aa469e6a5e5d2a7ffc7.zip pfsense-568346d4daf38b4e61bf9aa469e6a5e5d2a7ffc7.tar.gz |
Merge branch 'master' into bootstrap
Diffstat (limited to 'src')
-rwxr-xr-x | src/etc/rc.initial | 2 | ||||
-rwxr-xr-x | src/usr/local/sbin/pfsense-upgrade.sh | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/etc/rc.initial b/src/etc/rc.initial index b103bf7..0abed19 100755 --- a/src/etc/rc.initial +++ b/src/etc/rc.initial @@ -128,7 +128,7 @@ case ${opmode} in /usr/local/sbin/pfSsh.php ;; 13) - php -f /etc/rc.initial.firmware_update + /bin/sh /usr/local/sbin/pfsense-upgrade.sh ;; 14) php -f /etc/rc.initial.toggle_sshd diff --git a/src/usr/local/sbin/pfsense-upgrade.sh b/src/usr/local/sbin/pfsense-upgrade.sh index 6081442..450d1c9 100755 --- a/src/usr/local/sbin/pfsense-upgrade.sh +++ b/src/usr/local/sbin/pfsense-upgrade.sh @@ -229,7 +229,6 @@ second_step() { unset need_reboot if [ ! -f "${upgrade_in_progress}" ]; then first_step -else need_reboot=1 fi |