From 296c15ab9819d01948f719cc09c1afd4e4265eca Mon Sep 17 00:00:00 2001 From: John Southworth Date: Tue, 28 Jun 2011 11:32:51 -0500 Subject: Add a disk-install uri for old disk based installs in image tools --- templates/clone/system/config/node.tag/from/node.tag/node.def | 3 +++ templates/clone/system/config/node.tag/node.def | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) (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 42ef94e..6061efd 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 @@ -6,6 +6,9 @@ allowed: reply=( $(compgen -f /live/image/boot/ | grep -v grub) ) reply[$i]="${reply[$i]}://" done reply+=( "running://" ) + if [[ -d /live/image/config ]];then + reply+=( "disk-install://" ) + fi echo "${reply[*]}" run: if [ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/admin" ]; then diff --git a/templates/clone/system/config/node.tag/node.def b/templates/clone/system/config/node.tag/node.def index d54a4cf..d4a04c0 100644 --- a/templates/clone/system/config/node.tag/node.def +++ b/templates/clone/system/config/node.tag/node.def @@ -5,7 +5,6 @@ allowed: reply=( $(compgen -f /live/image/boot/ | grep -v grub) ) reply[$i]=${file/#\/live\/image\/boot\//} reply[$i]="${reply[$i]}://" done - reply+=( "running://" ) echo "${reply[*]}" run: if [ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/admin" ]; then -- cgit v1.2.3