diff options
| author | John Southworth <john.southworth@vyatta.com> | 2011-07-05 10:48:27 -0500 |
|---|---|---|
| committer | John Southworth <john.southworth@vyatta.com> | 2011-07-05 10:48:27 -0500 |
| commit | 999d4832fda535b5224b9b21004e4c734387d1fa (patch) | |
| tree | 97fabab6ec7e80fc0d3434ba40b0a6d358eaf710 /templates/clone/system | |
| parent | b79e099c6ad85d4a1b10707aa3adb8a20c15f72c (diff) | |
| download | vyatta-op-999d4832fda535b5224b9b21004e4c734387d1fa.tar.gz vyatta-op-999d4832fda535b5224b9b21004e4c734387d1fa.zip | |
Bugfix 7277: Make clone system config consistent with the other image tools
Diffstat (limited to 'templates/clone/system')
| -rw-r--r-- | templates/clone/system/config/node.tag/from/node.tag/node.def | 5 | ||||
| -rw-r--r-- | templates/clone/system/config/node.tag/node.def | 1 |
2 files changed, 2 insertions, 4 deletions
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" ]; |