diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2009-06-27 16:48:11 -0400 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2009-06-27 16:48:11 -0400 |
| commit | ff258b43453057a82a850d79a502862bea202639 (patch) | |
| tree | 204e2590ea1c359c1dac807aae7b49b1c751cc37 /etc | |
| parent | ed88d0a8d3b77a6f0cb75c07792fe1c77e12ae77 (diff) | |
| download | pfsense-ff258b43453057a82a850d79a502862bea202639.zip pfsense-ff258b43453057a82a850d79a502862bea202639.tar.gz | |
Sync working nanobsd upgrade code with 1.2.X
Diffstat (limited to 'etc')
| -rwxr-xr-x | etc/rc.firmware | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/etc/rc.firmware b/etc/rc.firmware index 9adb745..cfea6c6 100755 --- a/etc/rc.firmware +++ b/etc/rc.firmware @@ -187,12 +187,16 @@ pfSenseNanoBSDupgrade) TOFLASH="${BOOT_DRIVE}s${SLICE}" COMPLETE_PATH="${BOOT_DRIVE}s${SLICE}a" GLABEL_SLICE="pfsense1" + UFS_ID="1" + OLD_UFS_ID="0" else SLICE="1" OLDSLICE="2" TOFLASH="${BOOT_DRIVE}s${SLICE}" COMPLETE_PATH="${BOOT_DRIVE}s${SLICE}a" - GLABEL_SLICE="pfsense0" + GLABEL_SLICE="pfsense0" + UFS_ID="0" + OLD_UFS_ID="1" fi # Output specifc information that this script is using @@ -241,16 +245,16 @@ ENDOFF echo "/sbin/tunefs -L ${GLABEL_SLICE} /dev/$COMPLETE_PATH" >> /cf/upgrade_log.txt /sbin/tunefs -L ${GLABEL_SLICE} /dev/$COMPLETE_PATH >> /cf/upgrade_log.txt 2>&1 - # Set active boot source - echo "" >> /cf/upgrade_log.txt - echo "/usr/sbin/boot0cfg -s ${SLICE} -v /dev/${BOOT_DRIVE}" >> /cf/upgrade_log.txt - /usr/sbin/boot0cfg -s ${SLICE} -v /dev/${BOOT_DRIVE} >> /cf/upgrade_log.txt 2>&1 - # Set active mount slice in fdisk echo "" >> /cf/upgrade_log.txt echo "gpart set -a active -i ${SLICE} ${BOOT_DRIVE}" >> /cf/upgrade_log.txt gpart set -a active -i ${SLICE} ${BOOT_DRIVE} + # Set active boot source + echo "" >> /cf/upgrade_log.txt + echo "/usr/sbin/boot0cfg -s ${SLICE} -v /dev/${BOOT_DRIVE}" >> /cf/upgrade_log.txt + /usr/sbin/boot0cfg -s ${SLICE} -v /dev/${BOOT_DRIVE} >> /cf/upgrade_log.txt 2>&1 + # restore config cp -p /tmp/configbak/* /conf 2>/dev/null @@ -268,7 +272,7 @@ ENDOFF fi # Update fstab - sed -i "" "s/pfsense${OLDSLICE}/pfsense${SLICE}/g" /tmp/$GLABEL_SLICE/etc/fstab + sed -i "" "s/pfsense${OLD_UFS_ID}/pfsense${UFS_ID}/g" /tmp/$GLABEL_SLICE/etc/fstab echo "" >> /cf/upgrade_log.txt cat /tmp/$GLABEL_SLICE/etc/fstab >> /cf/upgrade_log.txt @@ -283,6 +287,9 @@ ENDOFF date >> /cf/upgrade_log.txt echo "" >> /cf/upgrade_log.txt + # Trigger a package reinstallation on reobot + touch /cf/needs_package_sync + # remount /cf ro /etc/rc.conf_mount_ro /bin/sync |
