From b9efb7c895c0d8d1ee6cbd1ad14e7597fa5957ae Mon Sep 17 00:00:00 2001 From: Felix Hanley Date: Wed, 5 Feb 2020 09:45:55 +1100 Subject: Move fstab into overlay and symlink --- jsh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/jsh b/jsh index 4350274..97ee3db 100755 --- a/jsh +++ b/jsh @@ -109,16 +109,17 @@ _jail_new_config() { [ -z "$name" ] && _err "Cannot create jail config: missing name" [ -z "$ip" ] && _err "Cannot set IP: missing IP address" if grep -qv -e "^$name" /etc/jail.conf; then echo "$name { \$ip = $ip; }" >>/etc/jail.conf; fi - _jail_update_fstab "$name" + _jail_create_fstab "$name" } -_jail_update_fstab() { +_jail_create_fstab() { local name="$1" [ -z "$name" ] && _err "Cannot create jail config: missing name" - cat << EOF >"$JROOT/$name/fstab" + cat << EOF >"$JROOT/$name/overlay/etc/fstab" $JROOT/$JTMPL $JROOT/$name/root nullfs ro 0 0 $JROOT/$name/overlay $JROOT/$name/root/s nullfs rw 0 0 EOF + cd $JROOT/$name && ln -s overlay/etc/fstab } _jail_start() { @@ -271,7 +272,7 @@ _main() { ;; upgrade) _jail_stop "$@" - _jail_update_fstab "$@" + #_jail_update_fstab "$@" _jail_start "$@" ;; *) -- cgit v1.2.3