diff options
| author | John Southworth <john.southworth@vyatta.com> | 2011-05-03 12:46:36 -0500 |
|---|---|---|
| committer | John Southworth <john.southworth@vyatta.com> | 2011-05-03 12:46:36 -0500 |
| commit | eec79ba0b96caefa3579439b70c71c9656694205 (patch) | |
| tree | 2146f696241d9a0fa7c5fe3b5addbe54489de42a /templates | |
| parent | 9e63d55a7bc21a92f0cbb23ad551fb06b51b3b91 (diff) | |
| download | vyatta-op-eec79ba0b96caefa3579439b70c71c9656694205.tar.gz vyatta-op-eec79ba0b96caefa3579439b70c71c9656694205.zip | |
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'
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/clone/system/config/node.def | 1 | ||||
| -rw-r--r-- | templates/clone/system/config/node.tag/from/node.def | 1 | ||||
| -rw-r--r-- | templates/clone/system/config/node.tag/from/node.tag/node.def (renamed from templates/update/config/node.tag/from/node.tag/node.def) | 2 | ||||
| -rw-r--r-- | templates/clone/system/config/node.tag/node.def (renamed from templates/update/config/node.tag/node.def) | 2 | ||||
| -rw-r--r-- | templates/update/config/node.def | 1 | ||||
| -rw-r--r-- | templates/update/config/node.tag/from/node.def | 1 |
6 files changed, 4 insertions, 4 deletions
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/update/config/node.tag/from/node.tag/node.def b/templates/clone/system/config/node.tag/from/node.tag/node.def index d540b9c..d099dc8 100644 --- a/templates/update/config/node.tag/from/node.tag/node.def +++ b/templates/clone/system/config/node.tag/from/node.tag/node.def @@ -7,4 +7,4 @@ allowed: reply=( $(compgen -f /live/image/boot/ | grep -v grub) ) done reply+=( "running://" ) echo "${reply[*]}" -run: sudo ${vyatta_sbindir}/vyatta-image-tools.pl --update $3 $5 +run: sudo ${vyatta_sbindir}/vyatta-image-tools.pl --update $4 $6 diff --git a/templates/update/config/node.tag/node.def b/templates/clone/system/config/node.tag/node.def index 8a4a2eb..415b665 100644 --- a/templates/update/config/node.tag/node.def +++ b/templates/clone/system/config/node.tag/node.def @@ -7,4 +7,4 @@ allowed: reply=( $(compgen -f /live/image/boot/ | grep -v grub) ) done reply+=( "running://" ) echo "${reply[*]}" -run: sudo ${vyatta_sbindir}/vyatta-image-tools.pl --updateone $3 +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 |