scip/jaildk
1
0
Fork 0
mirror of https://codeberg.org/scip/jaildk.git synced 2025-12-18 13:11:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added support to automagically set the hostname in the jails rc.conf based on the hostname in /etc/jail.conf

Browse Source
This commit is contained in:
Culsu
2020-11-29 22:18:34 +01:00
parent 6d75ff25bf
commit 61ae2100c3
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
jaildk
View File

@@ -751,6 +751,7 @@ jaildk_clone() {
echo echo
else else
. $j/etc/$src/jail.conf . $j/etc/$src/jail.conf
jail=$new
bold "To mount the build chroot of the new jail, execute:" bold "To mount the build chroot of the new jail, execute:"
echo "jaildk build $new start $base $newversion" echo "jaildk build $new start $base $newversion"
fi fi
@@ -763,6 +764,9 @@ Create a new jail from template."
jaildk_create() { jaildk_create() {
jail=$1 jail=$1
# $jail gets overwritten in jaildk_clone or some subcall to .template :-( ...
newjail=$jail
src=.template src=.template
if test -z "$jail"; then if test -z "$jail"; then
@@ -776,6 +780,11 @@ jaildk_create() {
mkdir -p $j/etc/$jail mkdir -p $j/etc/$jail
jaildk_clone -s $src -d $jail -o $srcversion -n $newversion 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)
sed -iE 's/^hostname.*$/hostname="'"$jailhostname"'"/' $j/etc/$newjail/local-etc-$newversion/rc.conf
} }
remove() { remove() {