diff options
author | erdgeist <erdgeist@erdgeist.org> | 2011-11-07 04:33:27 +0000 |
---|---|---|
committer | erdgeist <erdgeist@erdgeist.org> | 2011-11-07 04:33:27 +0000 |
commit | cedf263041c6807a4bb5b44a671110adfd07397e (patch) | |
tree | 5e71d64d22cd0621726a029dadaba3f785aa5647 | |
parent | e717ae669a01639e631935ca31da967840adb5a9 (diff) |
Reflect new style of setting up flavours in ezjail-admin
-rwxr-xr-x | ezjail-admin | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ezjail-admin b/ezjail-admin index 15571f7..1ad888a 100755 --- a/ezjail-admin +++ b/ezjail-admin | |||
@@ -668,18 +668,17 @@ create) | |||
668 | # if the packages are links and not files we have to copy them now | 668 | # if the packages are links and not files we have to copy them now |
669 | find "${ezjail_rootdir}/pkg/" -type l -exec cp -r -f {} {}.ezjail \; -exec mv {}.ezjail {} \; | 669 | find "${ezjail_rootdir}/pkg/" -type l -exec cp -r -f {} {}.ezjail \; -exec mv {}.ezjail {} \; |
670 | 670 | ||
671 | # If a config is found, make it auto run on jails startup | 671 | # If an old style flavour config is found, make it auto run on jails startup |
672 | if [ -f "${ezjail_rootdir}/ezjail.flavour" ]; then | 672 | if [ -f "${ezjail_rootdir}/ezjail.flavour" ]; then |
673 | chmod 0755 "${ezjail_rootdir}/ezjail.flavour" | 673 | chmod 0755 "${ezjail_rootdir}/ezjail.flavour" |
674 | mv "${ezjail_rootdir}/ezjail.flavour" "${ezjail_rootdir}/ezjail.flavour".`printf %04d $(( installed_flavours+=1 ))` | 674 | mv "${ezjail_rootdir}/ezjail.flavour" "${ezjail_rootdir}/ezjail.flavour".`printf %04d $(( installed_flavours+=1 ))` |
675 | echo "Note: Shell scripts for flavour ${ezjail_flavour} installed, flavourizing on jails first startup." | 675 | echo "Note: Shell scripts for flavour ${ezjail_flavour} installed, flavourizing on jails first startup." |
676 | fi | ||
677 | 676 | ||
678 | cat > "${ezjail_rootdir}/etc/rc.d/ezjail-config" <<"EOF" | 677 | cat > "${ezjail_rootdir}/etc/rc.d/ezjail-config" <<"EOF" |
679 | #!/bin/sh | 678 | #!/bin/sh |
680 | # | 679 | # |
681 | # BEFORE: DAEMON | 680 | # BEFORE: DAEMON |
682 | # PROVIDES: ezjail-config | 681 | # PROVIDE: ezjail-config |
683 | # | 682 | # |
684 | case "$1" in | 683 | case "$1" in |
685 | *start) | 684 | *start) |
@@ -693,7 +692,8 @@ case "$1" in | |||
693 | ;; | 692 | ;; |
694 | esac | 693 | esac |
695 | EOF | 694 | EOF |
696 | chmod 0755 "${ezjail_rootdir}/etc/rc.d/ezjail-config" | 695 | chmod 0755 "${ezjail_rootdir}/etc/rc.d/ezjail-config" |
696 | fi | ||
697 | done | 697 | done |
698 | fi | 698 | fi |
699 | 699 | ||