diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-02-16 13:57:50 -0800 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-02-16 13:57:50 -0800 |
| commit | c0e7f980b9d71c4d3a47446e2ef31ed1d3096036 (patch) | |
| tree | 633c5d4b12413c9982437636acaf5c6ecd3cdbfb | |
| parent | 464c848d9a821de9f98495d5d8802ac0eb00314a (diff) | |
| parent | 36b4c35454371643a7be0b508b2b97e7af1b0fa4 (diff) | |
| download | vyatta-cfg-system-c0e7f980b9d71c4d3a47446e2ef31ed1d3096036.tar.gz vyatta-cfg-system-c0e7f980b9d71c4d3a47446e2ef31ed1d3096036.zip | |
Merge branch 'kenwood' of suva.vyatta.com:/git/vyatta-cfg-system into kenwood
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rwxr-xr-x | scripts/install/install-get-partition | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 939f3a27..65035ba8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vyatta-cfg-system (0.17.2) unstable; urgency=low + + * Bugfix 5327: Don't try to save config from images with none. + + -- Bob Gilligan <gilligan@vyatta.com> Tue, 16 Feb 2010 11:57:24 -0800 + vyatta-cfg-system (0.17.1) unstable; urgency=low * use more specific version before which modprobe files in vyatta-cfg diff --git a/scripts/install/install-get-partition b/scripts/install/install-get-partition index 37ec5580..f6977850 100755 --- a/scripts/install/install-get-partition +++ b/scripts/install/install-get-partition @@ -549,7 +549,7 @@ save_old_info() { image_dirs=/mnt/tmp/boot/* for dir in $image_dirs; do - if [ -f $dir/live-rw/opt/vyatta/etc/config/.vyatta_config ]; then + if [ -f $dir/live-rw/config/.vyatta_config ]; then item=${dir##/mnt/tmp/boot/} images=($item ${images[@]}) |