From c0800f4ef4821b878109ad90c40b6a285808b28f Mon Sep 17 00:00:00 2001 From: Matt Simerson Date: Sun, 24 Mar 2024 22:49:10 -0700 Subject: [PATCH] create mountpoints for linux fstab entries --- include/linux.sh | 4 ++-- provision/centos.sh | 4 ++++ provision/ubuntu.sh | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/include/linux.sh b/include/linux.sh index 2cf66d72..a6747fb0 100755 --- a/include/linux.sh +++ b/include/linux.sh @@ -51,7 +51,7 @@ install_linux() { # tested with values of $1: # Ubuntu: bionic (18), focal (20) and jammy (22) - # Debian: bullseye (11) + # Debian: bullseye (11), bookwork (12) # CentOS: centos (7) configure_linuxulator @@ -61,7 +61,7 @@ install_linux() tell_status "installing $1" stage_pkg_install linux_base-c7 || exit 1 ;; - bionic|bullseye|focal|jammy) + bionic|bookworm|bullseye|focal|jammy) tell_status "installing (debian|ubuntu) $1" stage_pkg_install debootstrap || exit 1 stage_exec debootstrap $1 /compat/linux diff --git a/provision/centos.sh b/provision/centos.sh index b4bd5836..6a65953a 100755 --- a/provision/centos.sh +++ b/provision/centos.sh @@ -33,6 +33,10 @@ install_centos() base_snapshot_exists || exit 1 create_staged_fs centos +for _fs in dev proc sys tmp home; do + mkdir -p "$ZFS_JAIL_MNT/stage/compat/linux/$_fs" +done +chmod 777 "$ZFS_JAIL_MNT/stage/compat/linux/tmp" start_staged_jail centos install_centos promote_staged_jail centos diff --git a/provision/ubuntu.sh b/provision/ubuntu.sh index d2b45a7a..b72607a8 100755 --- a/provision/ubuntu.sh +++ b/provision/ubuntu.sh @@ -33,6 +33,10 @@ install_ubuntu() base_snapshot_exists || exit 1 create_staged_fs ubuntu +for _fs in dev proc sys tmp home; do + mkdir -p "$ZFS_JAIL_MNT/stage/compat/linux/$_fs" +done +chmod 777 "$ZFS_JAIL_MNT/stage/compat/linux/tmp" start_staged_jail ubuntu install_ubuntu promote_staged_jail ubuntu