From 668c4dfc58490d61398ea3acdf1290f0579b8485 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Thu, 22 Sep 2005 11:45:47 +0000
Subject: First test in live system yielded several problems :)

---
 ezjail | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

(limited to 'ezjail')

diff --git a/ezjail b/ezjail
index e3f1443..b75b467 100755
--- a/ezjail
+++ b/ezjail
@@ -16,27 +16,38 @@ ezjail_prefix=EZJAIL_PREFIX
 . /etc/rc.subr
 
 name=ezjail
-ezjail_enable=${ezjail_enable:-"NO"}
 rcvar=`set_rcvar`
+load_rc_config $name
 
+ezjail_enable=${ezjail_enable:-"NO"}
+
+restart_cmd="do_restart"
 start_cmd="do_start"
 stop_cmd="do_stop"
 
 do_start()
 {
-  jail_enable=${ezjail_enable}
-  jail_list=`ls ${ezjail_prefix}/etc/ezjail/`
+  [ -n "$*" ] && jail_list=`echo $* | tr /~. ___`;
+  jail_list=${jail_list:-`ls ${ezjail_prefix}/etc/ezjail/`}
   for jail in $jail_list; do . ${ezjail_prefix}/etc/ezjail/${jail}; done
-  sh /etc/rc.d/jail start $*
+  sh /etc/rc.d/jail onestart $jail_list
+}
+
+do_restart()
+{
+  [ -n "$*" ] && jail_list=`echo $* | tr /~. ___`;
+  jail_list=${jail_list:-`ls ${ezjail_prefix}/etc/ezjail/`}
+  for jail in $jail_list; do . ${ezjail_prefix}/etc/ezjail/${jail}; done
+  sh /etc/rc.d/jail onestop $jail_list
+  sh /etc/rc.d/jail onestart $jail_list
 }
 
 do_stop()
 {
-  jail_enable=${ezjail_enable}
-  jail_list=`ls ${ezjail_prefix}/etc/ezjail/`
+  [ -n "$*" ] && jail_list=`echo $* | tr /~. ___`;
+  jail_list=${jail_list:-`ls ${ezjail_prefix}/etc/ezjail/`}
   for jail in $jail_list; do . ${ezjail_prefix}/etc/ezjail/${jail}; done
-  sh /etc/rc.d/jail stop $*
+  sh /etc/rc.d/jail onestop $jail_list
 }
 
-load_rc_config $name
 run_rc_command $*
-- 
cgit v1.2.3