diff options
| author | Bob Gilligan <gilligan@vyatta.com> | 2010-03-08 14:16:53 -0800 |
|---|---|---|
| committer | Bob Gilligan <gilligan@vyatta.com> | 2010-03-09 13:42:27 -0800 |
| commit | 311112ae904372d2dba0ee63c0ea75426700bd6f (patch) | |
| tree | 3c6d086e6d76d513d7efc3c628c20fcf9730e484 | |
| parent | 001aed5c7ec9aac70235e86cc91c38eebe6221b8 (diff) | |
| download | vyatta-cfg-system-311112ae904372d2dba0ee63c0ea75426700bd6f.tar.gz vyatta-cfg-system-311112ae904372d2dba0ee63c0ea75426700bd6f.zip | |
Bugfix 5414: Use correct install root reference when copying back SSH keys.
(cherry picked from commit f457da66e387d10a71ae823ce55e7a4c69f87ed2)
| -rwxr-xr-x | scripts/install/install-get-partition | 3 | ||||
| -rwxr-xr-x | scripts/install/install-postinst-new | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/scripts/install/install-get-partition b/scripts/install/install-get-partition index f6977850..250cec68 100755 --- a/scripts/install/install-get-partition +++ b/scripts/install/install-get-partition @@ -467,6 +467,9 @@ save_old_keys() { # reset modes on keys (should already be set) chmod 600 /mnt/ssh/*_key 2>&1 chmod 644 /mnt/ssh/*.pub 2>&1 + echo "SSH keys have been saved." + else + echo "OK. SSH keys not saved." fi } diff --git a/scripts/install/install-postinst-new b/scripts/install/install-postinst-new index e099e030..65c6cd7f 100755 --- a/scripts/install/install-postinst-new +++ b/scripts/install/install-postinst-new @@ -81,7 +81,7 @@ copy_config () { # copy ssh keys if [ -d /mnt/ssh ]; then echo "Copying SSH keys." - cp -p /mnt/ssh/* $rootfsdir/etc/ssh + cp -p /mnt/ssh/* ${INST_ROOT}/etc/ssh fi } |