summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorerdgeist <erdgeist@erdgeist.org>2007-04-26 21:35:45 +0000
committererdgeist <erdgeist@erdgeist.org>2007-04-26 21:35:45 +0000
commit6b2fe867d5970d2b2f150768dccd61add8e7be15 (patch)
tree60594005230e015813e9a52855f4642c8455f96f
parent312c276483c2277b93ddc79ce51b4b017521e5f1 (diff)
Got the securelevel check the wrong way around. Mea culpa.RELEASE_2_1
-rwxr-xr-xezjail-admin4
1 files changed, 2 insertions, 2 deletions
diff --git a/ezjail-admin b/ezjail-admin
index a4e50e1..7e86252 100755
--- a/ezjail-admin
+++ b/ezjail-admin
@@ -528,7 +528,7 @@ setup|update)
528 # Bump the user for some of the most common errors 528 # Bump the user for some of the most common errors
529 [ -d ${ezjail_sourcetree} ] || exerr "Cannot find your copy of the FreeBSD source tree in ${ezjail_sourcetree}." 529 [ -d ${ezjail_sourcetree} ] || exerr "Cannot find your copy of the FreeBSD source tree in ${ezjail_sourcetree}."
530 [ -e ${ezjail_sourcetree}/Makefile ] || exerr "Your source tree in ${ezjail_sourcetree} seems to be incomplete (Makefile missing)." 530 [ -e ${ezjail_sourcetree}/Makefile ] || exerr "Your source tree in ${ezjail_sourcetree} seems to be incomplete (Makefile missing)."
531 [ "`sysctl -n kern.securelevel`" -gt 0 ] || exerr "You're running in a secure level higher than 0. ezjail will not run correctly." 531 [ "`sysctl -n kern.securelevel`" -gt 0 ] && exerr "You're running in a secure level higher than 0. ezjail will not run correctly."
532 532
533 # Normally fulljail should be renamed by past ezjail-admin commands. 533 # Normally fulljail should be renamed by past ezjail-admin commands.
534 # However those may have failed 534 # However those may have failed
@@ -568,7 +568,7 @@ install)
568 ezjail_dir=${ezjail_ftphost#file://} 568 ezjail_dir=${ezjail_ftphost#file://}
569 [ "${ezjail_dir%%[!/]*}" ] || ezjail_reldir=${PWD} 569 [ "${ezjail_dir%%[!/]*}" ] || ezjail_reldir=${PWD}
570 570
571 [ "`sysctl -n kern.securelevel`" -gt 0 ] || exerr "You're running in a secure level higher than 0. ezjail will not run correctly." 571 [ "`sysctl -n kern.securelevel`" -gt 0 ] && exerr "You're running in a secure level higher than 0. ezjail will not run correctly."
572 572
573 # ftp servers normally wont provide non-RELEASE-builds 573 # ftp servers normally wont provide non-RELEASE-builds
574 if [ -z "${ezjail_release}" -a "${ezjail_dir}" = "${ezjail_ftphost}" ]; then 574 if [ -z "${ezjail_release}" -a "${ezjail_dir}" = "${ezjail_ftphost}" ]; then