diff --git a/README.md b/README.md index 293695d..10e9989 100644 --- a/README.md +++ b/README.md @@ -52,12 +52,12 @@ Refer to [jail(8)](https://www.freebsd.org/cgi/man.cgi?query=jail&sektion=8) for Next add the following lines to your `/etc/rc.conf`: ``` -ifconfig_em0_alias0="inet 144.76.67.168/32" +ifconfig_em0_alias0="inet 172.16.1.1/32" jail_enable="YES" ``` You may need to replace the interface name `em0` with the one in use on your system. - +You might need to restart the interface to apply the alias: `/etc/rc.d/netif restart`. ### Create the jail ``` @@ -197,7 +197,7 @@ fcgiwrap is running as pid 37682. ### Login into the running jail for administration ``` -# jaildk jlogin myjail +# jaildk login myjail ``` You can use this to login into a database or execute commands inside the jail. diff --git a/jaildk b/jaildk old mode 100644 new mode 100755 index b4cf273..ac98e0e --- a/jaildk +++ b/jaildk @@ -751,6 +751,7 @@ jaildk_clone() { echo else . $j/etc/$src/jail.conf + jail=$new bold "To mount the build chroot of the new jail, execute:" echo "jaildk build $new start $base $newversion" fi @@ -763,6 +764,9 @@ Create a new jail from template." jaildk_create() { jail=$1 + # $jail gets overwritten in jaildk_clone or some subcall to .template :-( ... + newjail=$jail + src=.template if test -z "$jail"; then @@ -774,8 +778,13 @@ jaildk_create() { newversion=`date +%Y%m%d` mkdir -p $j/etc/$jail - + jaildk_clone -s $src -d $jail -o $srcversion -n $newversion + # some perl magic to extract the hostname (if any) from /etc/jail.conf - and write it into the jails rc.conf + jailhostname=$(cat /etc/jail.conf | tr -d '\t\r\n ' | perl -ne '$_ =~ /.*'"$newjail"'(\{(?:\{.*\}|[^{])*\})|\w+/; print $1;' | grep -oE 'hostname=[^;]+' | cut -d= -f2) + [ -n "$jailhostname" ] && sed -iE 's/^hostname.*$/hostname="'"$jailhostname"'"/' $j/etc/$newjail/local-etc-$newversion/rc.conf + + } remove() {