summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrbalocca <rbalocca@vyatta.com>2008-07-07 14:44:03 -0700
committerrbalocca <rbalocca@vyatta.com>2008-07-07 14:44:03 -0700
commitb01513f78395ef8556e870c56d8641886be58b9d (patch)
treedeae0bfba0597da63f799e55a8ed832c01ecd386
parentaa42717ba0a6ee114b79fd8a62c00c974072c024 (diff)
parent95d9651eb951d10572503d783aea0e02d44e98d5 (diff)
downloadvyatta-cfg-quagga-b01513f78395ef8556e870c56d8641886be58b9d.tar.gz
vyatta-cfg-quagga-b01513f78395ef8556e870c56d8641886be58b9d.zip
Merge branch 'hollywood' of git:/git/vyatta-cfg-system into hollywood
-rwxr-xr-xscripts/install-system11
1 files changed, 7 insertions, 4 deletions
diff --git a/scripts/install-system b/scripts/install-system
index b5eefe62..a7a0b066 100755
--- a/scripts/install-system
+++ b/scripts/install-system
@@ -528,16 +528,19 @@ copy_config () {
if [ -z "$config" ]; then
config="$fdconfdir/config.boot"
else
- config="$config\n$fdconfdir/config.boot"
+ config="$config $fdconfdir/config.boot"
fi
fi
if [ -n "$config" ]; then
echo "I found the following configuration files"
- echo -e "$config"
- default=$(echo -e $config| head -1)
+ for file in $config
+ do
+ echo $file
+ done
+
+ default=$(echo -e $config | awk '{ print $1 }')
- resp=''
while [ -z "$configfile" ]
do
echo -n "Which one should I copy to $INSTALL_DRIVE? [$default]: "