diff options
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rwxr-xr-x | scripts/install/install-get-partition | 13 |
2 files changed, 19 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 8dd8fda7..5977f12d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +vyatta-cfg-system (0.16.28) unstable; urgency=low + + * Bugfix 5229: Save old config info when installing on pre-existing + RAID group. + + -- Bob Gilligan <gilligan@vyatta.com> Tue, 26 Jan 2010 16:25:04 -0800 + vyatta-cfg-system (0.16.27) unstable; urgency=low * Bugfix 5220: Use correct path to config directory on installed diff --git a/scripts/install/install-get-partition b/scripts/install/install-get-partition index 9ca5d9c3..37ec5580 100755 --- a/scripts/install/install-get-partition +++ b/scripts/install/install-get-partition @@ -168,12 +168,23 @@ check_for_old_raid () { warn_of_dire_consequences ROOT_PARTITION=$INSTALL_DRIVE + ROOT_PARTITION_TYPE=new # make sure we aren't working on a mounted part unmount "$INSTALL_DRIVE" # check for an old config on the partition - check_config_partition "$ROOT_PARTITION" + mkdir -p /mnt/tmp + output=$(mount -r /dev/"$ROOT_PARTITION" /mnt/tmp 2>&1) + if [ $? != 0 ]; then + echo "Cannot mount $ROOT_PARTITION to check for old config file" + lecho "Cannot mount $ROOT_PARTITION"."\n" + lecho "mount $ROOT_PARTITION /mnt/tmp\n" + lecho "$output" + else + save_old_info "$ROOT_PARTITION" + umount /mnt/tmp + fi # create the filesystem on the part make_filesystem "$ROOT_PARTITION" |