From eec79ba0b96caefa3579439b70c71c9656694205 Mon Sep 17 00:00:00 2001 From: John Southworth <john.southworth@vyatta.com> Date: Tue, 3 May 2011 12:46:36 -0500 Subject: Change behavior of image tools as per discussion in design meeting * Copy and delete are simplier * 'update config' has been moved to 'clone system config' --- templates/clone/system/config/node.def | 1 + templates/clone/system/config/node.tag/from/node.def | 1 + templates/clone/system/config/node.tag/from/node.tag/node.def | 10 ++++++++++ templates/clone/system/config/node.tag/node.def | 10 ++++++++++ templates/update/config/node.def | 1 - templates/update/config/node.tag/from/node.def | 1 - templates/update/config/node.tag/from/node.tag/node.def | 10 ---------- templates/update/config/node.tag/node.def | 10 ---------- 8 files changed, 22 insertions(+), 22 deletions(-) create mode 100644 templates/clone/system/config/node.def create mode 100644 templates/clone/system/config/node.tag/from/node.def create mode 100644 templates/clone/system/config/node.tag/from/node.tag/node.def create mode 100644 templates/clone/system/config/node.tag/node.def delete mode 100644 templates/update/config/node.def delete mode 100644 templates/update/config/node.tag/from/node.def delete mode 100644 templates/update/config/node.tag/from/node.tag/node.def delete mode 100644 templates/update/config/node.tag/node.def (limited to 'templates') diff --git a/templates/clone/system/config/node.def b/templates/clone/system/config/node.def new file mode 100644 index 0000000..0b1b387 --- /dev/null +++ b/templates/clone/system/config/node.def @@ -0,0 +1 @@ +help: Clone system configuration diff --git a/templates/clone/system/config/node.tag/from/node.def b/templates/clone/system/config/node.tag/from/node.def new file mode 100644 index 0000000..6c2682c --- /dev/null +++ b/templates/clone/system/config/node.tag/from/node.def @@ -0,0 +1 @@ +help: Image to clone from 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 new file mode 100644 index 0000000..d099dc8 --- /dev/null +++ b/templates/clone/system/config/node.tag/from/node.tag/node.def @@ -0,0 +1,10 @@ +help: Image to update from +allowed: reply=( $(compgen -f /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://" ) + echo "${reply[*]}" +run: sudo ${vyatta_sbindir}/vyatta-image-tools.pl --update $4 $6 diff --git a/templates/clone/system/config/node.tag/node.def b/templates/clone/system/config/node.tag/node.def new file mode 100644 index 0000000..415b665 --- /dev/null +++ b/templates/clone/system/config/node.tag/node.def @@ -0,0 +1,10 @@ +help: Image to update +allowed: reply=( $(compgen -f /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://" ) + echo "${reply[*]}" +run: sudo ${vyatta_sbindir}/vyatta-image-tools.pl --updateone $4 diff --git a/templates/update/config/node.def b/templates/update/config/node.def deleted file mode 100644 index 4bf41da..0000000 --- a/templates/update/config/node.def +++ /dev/null @@ -1 +0,0 @@ -help: Update image config diff --git a/templates/update/config/node.tag/from/node.def b/templates/update/config/node.tag/from/node.def deleted file mode 100644 index 413f817..0000000 --- a/templates/update/config/node.tag/from/node.def +++ /dev/null @@ -1 +0,0 @@ -help: Image to update from diff --git a/templates/update/config/node.tag/from/node.tag/node.def b/templates/update/config/node.tag/from/node.tag/node.def deleted file mode 100644 index d540b9c..0000000 --- a/templates/update/config/node.tag/from/node.tag/node.def +++ /dev/null @@ -1,10 +0,0 @@ -help: Image to update from -allowed: reply=( $(compgen -f /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://" ) - echo "${reply[*]}" -run: sudo ${vyatta_sbindir}/vyatta-image-tools.pl --update $3 $5 diff --git a/templates/update/config/node.tag/node.def b/templates/update/config/node.tag/node.def deleted file mode 100644 index 8a4a2eb..0000000 --- a/templates/update/config/node.tag/node.def +++ /dev/null @@ -1,10 +0,0 @@ -help: Image to update -allowed: reply=( $(compgen -f /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://" ) - echo "${reply[*]}" -run: sudo ${vyatta_sbindir}/vyatta-image-tools.pl --updateone $3 -- cgit v1.2.3