From 999d4832fda535b5224b9b21004e4c734387d1fa Mon Sep 17 00:00:00 2001 From: John Southworth Date: Tue, 5 Jul 2011 10:48:27 -0500 Subject: Bugfix 7277: Make clone system config consistent with the other image tools --- templates/clone/system/config/node.tag/from/node.tag/node.def | 5 ++--- templates/clone/system/config/node.tag/node.def | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'templates/clone') diff --git a/templates/clone/system/config/node.tag/from/node.tag/node.def b/templates/clone/system/config/node.tag/from/node.tag/node.def index d5d7f67..c244559 100644 --- a/templates/clone/system/config/node.tag/from/node.tag/node.def +++ b/templates/clone/system/config/node.tag/from/node.tag/node.def @@ -3,11 +3,10 @@ allowed: reply=( $(compgen -d /live/image/boot/ | grep -v grub) ) for i in `seq 0 $[${#reply[@]}-1]`; do file=${reply[$i]} reply[$i]=${file/#\/live\/image\/boot\//} - reply[$i]="${reply[$i]}://" done - reply+=( "running://" ) + reply+=( "running" ) if [[ -d /live/image/config ]];then - reply+=( "disk-install://" ) + reply+=( "disk-install" ) fi echo "${reply[*]}" run: if [ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/admin" ]; diff --git a/templates/clone/system/config/node.tag/node.def b/templates/clone/system/config/node.tag/node.def index be028c9..6e6e340 100644 --- a/templates/clone/system/config/node.tag/node.def +++ b/templates/clone/system/config/node.tag/node.def @@ -3,7 +3,6 @@ allowed: reply=( $(compgen -d /live/image/boot/ | grep -v grub) ) for i in `seq 0 $[${#reply[@]}-1]`; do file=${reply[$i]} reply[$i]=${file/#\/live\/image\/boot\//} - reply[$i]="${reply[$i]}://" done echo "${reply[*]}" run: if [ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/admin" ]; -- cgit v1.2.3