diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-06-24 13:20:39 +0200 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2018-06-24 13:20:39 +0200 |
| commit | 997291b8a6a66953c6a6270c2dda323769452581 (patch) | |
| tree | da24c0099caede14445289dca8d76560c08de1d9 /templates/clone/system/config | |
| parent | 3610a467094e80a39b6627f6b7655430917b9bd3 (diff) | |
| parent | add153b13de56f97624b2dc433fdbe21b36dbeed (diff) | |
| download | vyatta-op-lithium.tar.gz vyatta-op-lithium.zip | |
Merge branch 'current' into lithiumlithium
Conflicts:
Makefile.am
debian/changelog
templates/restart/dns/forwarding/node.def
templates/show/version/added/node.def
templates/show/version/all/node.def
templates/show/version/deleted/node.def
templates/show/version/downgraded/node.def
templates/show/version/node.def
templates/show/version/upgraded/node.def
Diffstat (limited to 'templates/clone/system/config')
| -rw-r--r-- | templates/clone/system/config/node.tag/from/node.tag/node.def | 6 | ||||
| -rw-r--r-- | templates/clone/system/config/node.tag/node.def | 4 |
2 files changed, 5 insertions, 5 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 c244559..d883c8c 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 @@ -1,11 +1,11 @@ help: Image to update from -allowed: reply=( $(compgen -d /live/image/boot/ | grep -v grub) ) +allowed: reply=( $(compgen -d /lib/live/mount/persistence/boot/ | grep -v grub) ) for i in `seq 0 $[${#reply[@]}-1]`; do file=${reply[$i]} - reply[$i]=${file/#\/live\/image\/boot\//} + reply[$i]=${file/#\/lib\/live\/mount\/persistence\/boot\//} done reply+=( "running" ) - if [[ -d /live/image/config ]];then + if [[ -d /lib/live/mount/persistence/config ]];then reply+=( "disk-install" ) fi echo "${reply[*]}" diff --git a/templates/clone/system/config/node.tag/node.def b/templates/clone/system/config/node.tag/node.def index 6e6e340..ec82322 100644 --- a/templates/clone/system/config/node.tag/node.def +++ b/templates/clone/system/config/node.tag/node.def @@ -1,8 +1,8 @@ help: Image to update -allowed: reply=( $(compgen -d /live/image/boot/ | grep -v grub) ) +allowed: reply=( $(compgen -d /lib/live/mount/persistence/boot/ | grep -v grub) ) for i in `seq 0 $[${#reply[@]}-1]`; do file=${reply[$i]} - reply[$i]=${file/#\/live\/image\/boot\//} + reply[$i]=${file/#\/lib\/live\/mount\/persistence\/boot\//} done echo "${reply[*]}" run: if [ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/admin" ]; |