From e213b6fc50d8bdcc34eaed732a2d64dbda376e61 Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Sun, 5 Jul 2009 18:48:24 -0400 Subject: [PATCH] Remove foot shooting code that was commented out. It is not necessary for this. Enhance a comment about why we need boot0cfg --- etc/rc.firmware | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/etc/rc.firmware b/etc/rc.firmware index 0926fa980a..ba6ea7e78f 100755 --- a/etc/rc.firmware +++ b/etc/rc.firmware @@ -215,11 +215,6 @@ pfSenseNanoBSDupgrade) echo "" >> /conf/upgrade_log.txt echo "NanoBSD upgrade starting" >> /conf/upgrade_log.txt echo "" >> /conf/upgrade_log.txt - - # Foot shooting is fun! - this might be too much. nanobsd does not need this. - #echo "" >> /conf/upgrade_log.txt - #echo "/sbin/sysctl kern.geom.debugflags=16" >> /conf/upgrade_log.txt - #/sbin/sysctl kern.geom.debugflags=16 >> /conf/upgrade_log.txt 2>&1 # Remove TOFLASH and get ready for new flash image echo "" >> /conf/upgrade_log.txt @@ -308,7 +303,8 @@ pfSenseNanoBSDupgrade) sync - # Set active boot source - this might be too much. nanobsd does not need this. + # Set active boot source - NanoBSD does not do this but otherwise we + # end up with the wrong partition being active. echo "" >> /conf/upgrade_log.txt echo "/usr/sbin/boot0cfg -s ${SLICE} -v /dev/${BOOT_DRIVE}" >> /conf/upgrade_log.txt /usr/sbin/boot0cfg -s ${SLICE} -v /dev/${BOOT_DRIVE} >> /conf/upgrade_log.txt 2>&1 @@ -339,11 +335,6 @@ pfSenseNanoBSDupgrade) # Trigger a package reinstallation on reobot touch /conf/needs_package_sync - # Enough fun for now. - this might be too much. nanobsd does not need this. - #echo "" >> /conf/upgrade_log.txt - #echo "/sbin/sysctl kern.geom.debugflags=0" >> /conf/upgrade_log.txt - #/sbin/sysctl kern.geom.debugflags=0 >> /conf/upgrade_log.txt 2>&1 - # remount /cf ro /etc/rc.conf_mount_ro /bin/sync