commit 298c2e4110b8cc2e121a308399ef6b4afe56f9ab parent 9ebda1c33261c94033e61c5e734b7b2639beaf6c Author: Jan Pobrislo <ccx@webprojekty.cz> Date: Thu, 19 Jun 2014 21:23:02 +0200 fix vdir symlink creation Diffstat:
| M | zsh-functions/confz_vserver_init | | | 6 | ++++-- |
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/zsh-functions/confz_vserver_init b/zsh-functions/confz_vserver_init @@ -44,8 +44,10 @@ confz_vserver_check() { fi done fi - if ! [[ -h ${vars[etcdir]}/vdir ]]; then + if ! [[ -e ${vars[etcdir]}/vdir ]]; then fails=( "${vars[etcdir]}/vdir missing" ) + elif ! [[ -h ${vars[etcdir]}/vdir ]]; then + die "${vars[etcdir]}/vdir is not symlink or missing" fi require mounted_volume :size :filesystem \ @@ -63,7 +65,7 @@ confz_vserver_do() { mkdir -p ${vars[etcdir]} || return $? if [[ -h ${vars[etcdir]}/vdir ]]; then rm ${vars[etcdir]}/vdir || return $? - ln -s $vars[vdir] ${vars[etcdir]}/vdir || return $? fi + ln -s $vars[vdir] ${vars[etcdir]}/vdir || return $? print -r - ${vars[context_id]} >${vars[etcdir]}/context }