From f457da66e387d10a71ae823ce55e7a4c69f87ed2 Mon Sep 17 00:00:00 2001
From: Bob Gilligan <gilligan@vyatta.com>
Date: Mon, 8 Mar 2010 14:16:53 -0800
Subject: Bugfix 5414: Use correct install root reference when copying back SSH
 keys.

---
 scripts/install/install-get-partition | 3 +++
 scripts/install/install-postinst-new  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'scripts/install')

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
 }
 
-- 
cgit v1.2.3