diff options
| -rwxr-xr-x | etc/rc.firmware | 4 | ||||
| -rwxr-xr-x | etc/sshd | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/etc/rc.firmware b/etc/rc.firmware index f40193b..2a5d5da 100755 --- a/etc/rc.firmware +++ b/etc/rc.firmware @@ -212,8 +212,8 @@ pfSenseNanoBSDupgrade) # Ensure that our new system is sound and bail if it is not and file a notice echo "" >> /cf/upgrade_log.txt - echo "/sbin/fsck_ffs -n /dev/$COMPLETE_PATH" >> /cf/upgrade_log.txt - /sbin/fsck_ffs -n /dev/$COMPLETE_PATH >> /cf/upgrade_log.txt 2>&1 + echo "/sbin/fsck_ffs -y /dev/$COMPLETE_PATH" >> /cf/upgrade_log.txt + /sbin/fsck_ffs -y /dev/$COMPLETE_PATH >> /cf/upgrade_log.txt 2>&1 if [ $? != 0 ]; then file_notice "UpgradeFailure" "{\$g['product_name']} upgrade has failed. Your system has been left in a usable state." rm /var/run/firmware.lock @@ -50,6 +50,7 @@ /* restore ssh data for nanobsd platform */ if($g['platform'] == "nanobsd" and file_exists("/conf/sshd/ssh_host_key")) { if(!file_exists("/etc/ssh/ssh_host_key.pub")) { + echo "Restoring SSH from /conf/sshd/"; cp("/conf/sshd/* /etc/ssh/"); } } |
