summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorerdgeist <erdgeist@erdgeist.org>2006-04-15 20:40:21 +0000
committererdgeist <erdgeist@erdgeist.org>2006-04-15 20:40:21 +0000
commitec8cc657b2285d8e9d61da485c47c16d80ae51dd (patch)
tree755885f226c31f0c957ac47a78f89cb7f2efc6ec
parent47efcef7897a84942f539d5a8ec9fb9195b26e3e (diff)
Some variable name problems have been solved
-rwxr-xr-xezjail-admin38
1 files changed, 19 insertions, 19 deletions
diff --git a/ezjail-admin b/ezjail-admin
index 9fc56f5..60cc29e 100755
--- a/ezjail-admin
+++ b/ezjail-admin
@@ -121,7 +121,7 @@ create)
121 121
122 # jail names may lead to identical configs, eg. foo.bar.com == foo-bar.com 122 # jail names may lead to identical configs, eg. foo.bar.com == foo-bar.com
123 # so check, whether we might be running into problems 123 # so check, whether we might be running into problems
124 [ -e ${ezjail_config} ] && exerr "Error: an ezjail config already exists at ${ezjail_jailconfig}. Please rename the ezjail." 124 [ -e ${ezjail_config} ] && exerr "Error: an ezjail config already exists at ${ezjail_config}. Please rename the ezjail."
125 125
126 # if jail root specified on command line is not absolute, make it absolute 126 # if jail root specified on command line is not absolute, make it absolute
127 # inside our jail directory 127 # inside our jail directory
@@ -155,7 +155,7 @@ create)
155 ezjail_image=${ezjail_image}.img 155 ezjail_image=${ezjail_image}.img
156 156
157 # If NOT exist, create image 157 # If NOT exist, create image
158 if [ "$ezjail_fillme" = "YES" ]; then 158 if [ "${ezjail_fillme}" = "YES" ]; then
159 [ -e "${ezjail_image}" ] && exerr "Error: a file exists at the location ${ezjail_image}, preventing our own image file to be created." 159 [ -e "${ezjail_image}" ] && exerr "Error: a file exists at the location ${ezjail_image}, preventing our own image file to be created."
160 [ "${ezjail_imagetype}" = "crypto" -a -e "${ezjail_lock}" ] && exerr "Error: a file exists at the location ${ezjail_lock}, preventing our own crypto image lock file to be created." 160 [ "${ezjail_imagetype}" = "crypto" -a -e "${ezjail_lock}" ] && exerr "Error: a file exists at the location ${ezjail_lock}, preventing our own crypto image lock file to be created."
161 161
@@ -204,25 +204,25 @@ create)
204 echo -n > /etc/fstab.${ezjail_safename} 204 echo -n > /etc/fstab.${ezjail_safename}
205 [ "${ezjail_imagetype}" ] && \ 205 [ "${ezjail_imagetype}" ] && \
206 echo ${ezjail_rootdir}.device ${ezjail_rootdir} ufs rw 0 0 >> /etc/fstab.${ezjail_safename} 206 echo ${ezjail_rootdir}.device ${ezjail_rootdir} ufs rw 0 0 >> /etc/fstab.${ezjail_safename}
207 echo ${ezjail_jailbase} ${ezjail_rootdir}/basejail nullfs ro 0 0 >> /etc/fstab.${ezjail_nname} 207 echo ${ezjail_jailbase} ${ezjail_rootdir}/basejail nullfs ro 0 0 >> /etc/fstab.${ezjail_safename}
208 208
209 # now, where everything seems to have gone right, create control file in 209 # now, where everything seems to have gone right, create control file in
210 # ezjails config dir 210 # ezjails config dir
211 mkdir -p ${ezjail_jailcfgs} 211 mkdir -p ${ezjail_jailcfgs}
212 echo "# To specify the start up order of your ezjails, use these lines to" > ${ezjail_jailconfig} 212 echo "# To specify the start up order of your ezjails, use these lines to" > ${ezjail_config}
213 echo "# create a Jail dependency tree. See rcorder(8) for more details." >> ${ezjail_jailconfig} 213 echo "# create a Jail dependency tree. See rcorder(8) for more details." >> ${ezjail_config}
214 echo -e "#\n# PROVIDE: \n# REQUIRE: \n# BEFORE: \n#\n" >> ${ezjail_jailconfig} 214 echo -e "#\n# PROVIDE: \n# REQUIRE: \n# BEFORE: \n#\n" >> ${ezjail_config}
215 echo export jail_${ezjail_safename}_hostname=\"${ezjail_hostname}\" >> ${ezjail_jailconfig} 215 echo export jail_${ezjail_safename}_hostname=\"${ezjail_hostname}\" >> ${ezjail_config}
216 echo export jail_${ezjail_safename}_ip=\"${ezjail_ip}\" >> ${ezjail_jailconfig} 216 echo export jail_${ezjail_safename}_ip=\"${ezjail_ip}\" >> ${ezjail_config}
217 echo export jail_${ezjail_safename}_rootdir=\"${ezjail_rootdir}\" >> ${ezjail_jailconfig} 217 echo export jail_${ezjail_safename}_rootdir=\"${ezjail_rootdir}\" >> ${ezjail_config}
218 echo export jail_${ezjail_safename}_exec=\"/bin/sh /etc/rc\" >> ${ezjail_jailconfig} 218 echo export jail_${ezjail_safename}_exec=\"/bin/sh /etc/rc\" >> ${ezjail_config}
219 echo export jail_${ezjail_safename}_mount_enable=\"${ezjail_mount_enable}\" >> ${ezjail_jailconfig} 219 echo export jail_${ezjail_safename}_mount_enable=\"${ezjail_mount_enable}\" >> ${ezjail_config}
220 echo export jail_${ezjail_safename}_devfs_enable=\"${ezjail_devfs_enable}\" >> ${ezjail_jailconfig} 220 echo export jail_${ezjail_safename}_devfs_enable=\"${ezjail_devfs_enable}\" >> ${ezjail_config}
221 echo export jail_${ezjail_safename}_devfs_ruleset=\"devfsrules_jail\" >> ${ezjail_jailconfig} 221 echo export jail_${ezjail_safename}_devfs_ruleset=\"devfsrules_jail\" >> ${ezjail_config}
222 echo export jail_${ezjail_safename}_procfs_enable=\"${ezjail_procfs_enable}\" >> ${ezjail_jailconfig} 222 echo export jail_${ezjail_safename}_procfs_enable=\"${ezjail_procfs_enable}\" >> ${ezjail_config}
223 echo export jail_${ezjail_safename}_fdescfs_enable=\"${ezjail_fdescfs_enable}\" >> ${ezjail_jailconfig} 223 echo export jail_${ezjail_safename}_fdescfs_enable=\"${ezjail_fdescfs_enable}\" >> ${ezjail_config}
224 echo export jail_${ezjail_safename}_image=\"${ezjail_image}\" >> ${ezjail_jailconfig} 224 echo export jail_${ezjail_safename}_image=\"${ezjail_image}\" >> ${ezjail_config}
225 echo export jail_${ezjail_safename}_imagetype=\"${ezjail_imagetype}\" >> ${ezjail_jailconfig} 225 echo export jail_${ezjail_safename}_imagetype=\"${ezjail_imagetype}\" >> ${ezjail_config}
226 226
227 # Final steps for flavour installation 227 # Final steps for flavour installation
228 if [ "${ezjail_fillme}" = "YES" -a "${ezjail_flavour}" ]; then 228 if [ "${ezjail_fillme}" = "YES" -a "${ezjail_flavour}" ]; then
@@ -289,7 +289,7 @@ delete)
289 289
290 # now we know everything we need to let the jail be gone remove entry 290 # now we know everything we need to let the jail be gone remove entry
291 # from ezjail resource structure, delete fstab.JAILNAME 291 # from ezjail resource structure, delete fstab.JAILNAME
292 rm -f ${ezjail_jailconfig} 292 rm -f ${ezjail_config}
293 rm -f /etc/fstab.${ezjail_safename} 293 rm -f /etc/fstab.${ezjail_safename}
294 294
295 # if there is a soft link pointing to the jail root, remove it 295 # if there is a soft link pointing to the jail root, remove it
@@ -437,7 +437,7 @@ config)
437 fetchjailinfo $1 437 fetchjailinfo $1
438 438
439 # check for existence of jail in our records 439 # check for existence of jail in our records
440 [ "${ezjail_jailconfig}" ] || exerr "Error: Nothing known about jail ${ezjail_name}." 440 [ "${ezjail_config}" ] || exerr "Error: Nothing known about jail ${ezjail_name}."
441 441
442 # Nothing to be configured? 442 # Nothing to be configured?
443 [ "${ezjail_setrunnable}" ] || echo "Warning: No config option specified." 443 [ "${ezjail_setrunnable}" ] || echo "Warning: No config option specified."