diff options
author | erdgeist <erdgeist@erdgeist.org> | 2006-03-12 23:27:45 +0000 |
---|---|---|
committer | erdgeist <erdgeist@erdgeist.org> | 2006-03-12 23:27:45 +0000 |
commit | 4ecd1ea3ce2a011647475f5508571e6204dd9373 (patch) | |
tree | 929fc9ac5576cca08222c6f27482791188fd8071 | |
parent | 5d92d199792b1e84826a63cb3ecc852abb9cee2c (diff) |
Trailing spaces
-rwxr-xr-x | ezjail-admin | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ezjail-admin b/ezjail-admin index 3ea5aa7..ea7e95c 100755 --- a/ezjail-admin +++ b/ezjail-admin | |||
@@ -56,7 +56,7 @@ create) | |||
56 | # we need at least a name and an ip for new jail | 56 | # we need at least a name and an ip for new jail |
57 | [ "${newjail_name}" -a "${newjail_ip}" -a $# = 2 ] || exerr "Usage: `basename -- $0` create [-f flavour] [-r jailroot] [-x] jailname jailip" | 57 | [ "${newjail_name}" -a "${newjail_ip}" -a $# = 2 ] || exerr "Usage: `basename -- $0` create [-f flavour] [-r jailroot] [-x] jailname jailip" |
58 | 58 | ||
59 | # check, whether ezjail-update has been called. existence of | 59 | # check, whether ezjail-update has been called. existence of |
60 | # ezjail_jailbase is our indicator | 60 | # ezjail_jailbase is our indicator |
61 | [ -d ${ezjail_jailbase} ] || exerr "Error: base jail does not exist. Please run 'ezjail-admin update' first." | 61 | [ -d ${ezjail_jailbase} ] || exerr "Error: base jail does not exist. Please run 'ezjail-admin update' first." |
62 | 62 | ||
@@ -85,11 +85,11 @@ create) | |||
85 | # inside our jail directory | 85 | # inside our jail directory |
86 | [ "${newjail_root%%[!/]*}" ] || newjail_root=${ezjail_jaildir}/${newjail_root} | 86 | [ "${newjail_root%%[!/]*}" ] || newjail_root=${ezjail_jaildir}/${newjail_root} |
87 | 87 | ||
88 | # if a directory at the specified jail root already exists, refuse to | 88 | # if a directory at the specified jail root already exists, refuse to |
89 | # install | 89 | # install |
90 | [ -e ${newjail_root} -a "${newjail_fill}" = "YES" ] && exerr "Error: the specified jail root ${newjail_root} alread exists." | 90 | [ -e ${newjail_root} -a "${newjail_fill}" = "YES" ] && exerr "Error: the specified jail root ${newjail_root} alread exists." |
91 | 91 | ||
92 | # if jail root specified on command line does not lie within our jail | 92 | # if jail root specified on command line does not lie within our jail |
93 | # directory, we need to create a softlink | 93 | # directory, we need to create a softlink |
94 | if [ "${newjail_root##${ezjail_jaildir}}" = "${newjail_root}" ]; then | 94 | if [ "${newjail_root##${ezjail_jaildir}}" = "${newjail_root}" ]; then |
95 | newjail_softlink=${ezjail_jaildir}/`basename -- ${newjail_root}` | 95 | newjail_softlink=${ezjail_jaildir}/`basename -- ${newjail_root}` |
@@ -117,7 +117,7 @@ create) | |||
117 | # will be obeyed | 117 | # will be obeyed |
118 | echo ${ezjail_jailbase} ${newjail_root}/basejail nullfs ro 0 0 > /etc/fstab.${newjail_nname} | 118 | echo ${ezjail_jailbase} ${newjail_root}/basejail nullfs ro 0 0 > /etc/fstab.${newjail_nname} |
119 | 119 | ||
120 | # now, where everything seems to have gone right, create control file in | 120 | # now, where everything seems to have gone right, create control file in |
121 | # ezjails config dir | 121 | # ezjails config dir |
122 | mkdir -p ${ezjail_jailcfgs} | 122 | mkdir -p ${ezjail_jailcfgs} |
123 | echo export jail_${newjail_nname}_hostname=\"${newjail_name}\" > ${ezjail_jailcfgs}/${newjail_nname} | 123 | echo export jail_${newjail_nname}_hostname=\"${newjail_name}\" > ${ezjail_jailcfgs}/${newjail_nname} |
@@ -194,7 +194,7 @@ delete) | |||
194 | # if jail is still running, refuse to go any further | 194 | # if jail is still running, refuse to go any further |
195 | [ -f /var/run/jail_${oldjail_nname}.id ] && exerr "Error: Jail appears to be still running, stop it first.\n(/var/run/jail_${oldjail_nname}.id exists)." | 195 | [ -f /var/run/jail_${oldjail_nname}.id ] && exerr "Error: Jail appears to be still running, stop it first.\n(/var/run/jail_${oldjail_nname}.id exists)." |
196 | 196 | ||
197 | # now we know everything we need to let the jail be gone remove entry | 197 | # now we know everything we need to let the jail be gone remove entry |
198 | # from ezjail resource structure, delete fstab.JAILNAME | 198 | # from ezjail resource structure, delete fstab.JAILNAME |
199 | rm -f ${ezjail_jailcfgs}/${oldjail_nname} | 199 | rm -f ${ezjail_jailcfgs}/${oldjail_nname} |
200 | rm -f /etc/fstab.${oldjail_nname} | 200 | rm -f /etc/fstab.${oldjail_nname} |
@@ -239,7 +239,7 @@ setup|update) | |||
239 | done | 239 | done |
240 | 240 | ||
241 | if [ "${updatejail_installaction}" = "none" ]; then | 241 | if [ "${updatejail_installaction}" = "none" ]; then |
242 | # check, whether ezjail-update has been called. existence of | 242 | # check, whether ezjail-update has been called. existence of |
243 | # ezjail_jailbase is our indicator | 243 | # ezjail_jailbase is our indicator |
244 | [ -d ${ezjail_jailbase} ] || exerr "Error: base jail does not exist. You cannot fill base jails ports tree before creating it. Please run 'ezjail-admin update' first." | 244 | [ -d ${ezjail_jailbase} ] || exerr "Error: base jail does not exist. You cannot fill base jails ports tree before creating it. Please run 'ezjail-admin update' first." |
245 | else | 245 | else |
@@ -295,7 +295,7 @@ setup|update) | |||
295 | 295 | ||
296 | # A ports collection inside jails is hardly useful w/o an appropriate | 296 | # A ports collection inside jails is hardly useful w/o an appropriate |
297 | # /etc/make.conf. If we find basejail/usr/ports/Makefile, assume that | 297 | # /etc/make.conf. If we find basejail/usr/ports/Makefile, assume that |
298 | # the admin wants a working make.conf in new jails also a softlink to | 298 | # the admin wants a working make.conf in new jails also a softlink to |
299 | # the ports in basejail is provided | 299 | # the ports in basejail is provided |
300 | if [ -f ${ezjail_jailbase}/usr/ports/Makefile ]; then | 300 | if [ -f ${ezjail_jailbase}/usr/ports/Makefile ]; then |
301 | # no /usr/ports? link to /basejail/usr/ports | 301 | # no /usr/ports? link to /basejail/usr/ports |