diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2009-06-26 19:31:04 -0400 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2009-06-26 19:31:04 -0400 |
| commit | bbae22d6381f02c83ada19856ab682e03c1f66b5 (patch) | |
| tree | 34ff1ac3c461091ff37ddb877ccf53fbd4af39b8 /etc/rc.firmware | |
| parent | c16601e61c70fd7d336bbe9d0db70ca523561cc0 (diff) | |
| download | pfsense-bbae22d6381f02c83ada19856ab682e03c1f66b5.zip pfsense-bbae22d6381f02c83ada19856ab682e03c1f66b5.tar.gz | |
Check for pfsense and not pfsense1
Diffstat (limited to 'etc/rc.firmware')
| -rwxr-xr-x | etc/rc.firmware | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/etc/rc.firmware b/etc/rc.firmware index 4680e20..c66e173 100755 --- a/etc/rc.firmware +++ b/etc/rc.firmware @@ -177,7 +177,7 @@ pfSenseNanoBSDupgrade) # resolve glabel to the real boot dev entry REAL_BOOT_DEVICE=`/sbin/glabel list | /usr/bin/grep -B2 ufs/${BOOT_DEVICE} | /usr/bin/head -n 1 | /usr/bin/cut -f3 -d' '` # grab the boot device, example ad1, ad0 - BOOT_DRIVE=`/sbin/glabel list | /usr/bin/grep -B2 ufs/pfsense1 | /usr/bin/head -n 1 | /usr/bin/cut -f3 -d' ' | /usr/bin/cut -d's' -f1` + BOOT_DRIVE=`/sbin/glabel list | /usr/bin/grep -B2 ufs/pfsense | /usr/bin/head -n 1 | /usr/bin/cut -f3 -d' ' | /usr/bin/cut -d's' -f1` # test the slice. if we are on slice 1 we need to flash 2 and vica versa if [ `echo $REAL_BOOT_DEVICE | /usr/bin/grep "s1"` ]; then SLICE="2" @@ -196,17 +196,17 @@ pfSenseNanoBSDupgrade) # Remove TOFLASH and get ready for new flash image dd if=/dev/zero of=/dev/${TOFLASH} bs=1m count=1 - echo "dd if=/dev/zero of=/dev/${TOFLASH} bs=1m count=1" | logger -p daemon.info -i -t Upgrade + echo "dd if=/dev/zero of=/dev/${TOFLASH} bs=1m count=1" #>/dev/null 2>&1 # Stream gzipped image to dd and explode image to new area - echo "/usr/bin/gunzip -S "" -c $IMG | /bin/dd of=/dev/${TOFLASH} bs=16k" | logger -p daemon.info -i -t Upgrade + echo "/usr/bin/gunzip -S "" -c $IMG | /bin/dd of=/dev/${TOFLASH} bs=16k" | /usr/bin/gunzip -S "" -c $IMG | /bin/dd of=/dev/${TOFLASH} bs=16k #>/dev/null 2>&1 # Ensure that our new system is sound and bail if it is not and file a notice - echo "/sbin/fsck_ffs -n /dev/${TOFLASH}a" | logger -p daemon.info -i -t Upgrade - /sbin/fsck_ffs -n /dev/${TOFLASH}a + echo "/sbin/fsck_ffs -n /dev/${TOFLASH}a" + /sbin/fsck_ffs -y /dev/${TOFLASH}a if [ $? != 0 ]; then /usr/local/bin/php -q -d auto_prepend_file=config.inc <<ENDOFF <?php @@ -219,7 +219,7 @@ ENDOFF exit 1 fi - echo "/usr/sbin/boot0cfg -s ${SLICE} -v /dev/${REAL_BOOT_DEVICE}" | logger -p daemon.info -i -t Upgrade + echo "/usr/sbin/boot0cfg -s ${SLICE} -v /dev/${REAL_BOOT_DEVICE}" /usr/sbin/boot0cfg -s ${SLICE} -v /dev/${REAL_BOOT_DEVICE} #>/dev/null 2>&1 |
