From 0e5516ff54ea0a707cf9393c2bcb55ae785a8ca2 Mon Sep 17 00:00:00 2001 From: lagertonne Date: Sun, 7 Mar 2021 21:07:15 +0100 Subject: [PATCH 1/4] Add script to build live-cd locally --- build-live-cd.sh | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100755 build-live-cd.sh diff --git a/build-live-cd.sh b/build-live-cd.sh new file mode 100755 index 0000000..71aacf2 --- /dev/null +++ b/build-live-cd.sh @@ -0,0 +1,30 @@ +BASEDIR=/var/lib/machines +ID=$(uuidgen | tr -d -) +NAME=debian-live-cd-$ID +DIR=$BASEDIR/$NAME + +echo "Generating container under $DIR" +zfs snapshot ztstor/ROOT/archie/var/lib/machines/buster-template@${ID} +zfs clone \ + -o mountpoint=$DIR \ + ztstor/ROOT/archie/var/lib/machines/buster-template@${ID} \ + ztstor/ROOT/archie/var/lib/machines/$NAME + +mkdir $DIR/var/live-build/ +rsync -av . $DIR/var/live-build/ + +# Execute stuff inside container +systemd-nspawn -q --pipe -D $DIR /bin/bash << EOF +apt update +apt install -y live-build binutils +cd /var/live-build/ +lb clean --purge +lb config +lb build +EOF + +echo "" +echo "---" +echo "Image lying under /var/lib/machines/$NAME" +#echo "Removing container..." +#zfs destroy ztstor/ROOT/archie/var/lib/machines/$NAME From 009bde06d57d075a98f43897ca1dad9e74261165 Mon Sep 17 00:00:00 2001 From: lagertonne Date: Sun, 7 Mar 2021 21:32:10 +0100 Subject: [PATCH 2/4] Add timeout for bootmenu to autostart if no input is given --- config/bootloaders/isolinux/isolinux.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/bootloaders/isolinux/isolinux.cfg b/config/bootloaders/isolinux/isolinux.cfg index a3e3eab..804f690 100644 --- a/config/bootloaders/isolinux/isolinux.cfg +++ b/config/bootloaders/isolinux/isolinux.cfg @@ -1,4 +1,4 @@ include menu.cfg default vesamenu.c32 prompt 0 -timeout 0 +timeout 50 From 49eac7883d225121ba0170753732f5172b8582ea Mon Sep 17 00:00:00 2001 From: lagertonne Date: Sun, 7 Mar 2021 22:02:40 +0100 Subject: [PATCH 3/4] Enable backports --- auto/config | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/auto/config b/auto/config index dd707e9..10ec80f 100755 --- a/auto/config +++ b/auto/config @@ -3,5 +3,6 @@ lb config noauto \ --architectures amd64 \ --distribution buster \ - --bootappend-live "boot=live components initrd=/live/initrd.img" + --backports true \ + --bootappend-live "boot=live components initrd=/live/initrd.img" \ "${@}" From 8a5c799936cf63b50ddfd6e9f5de707301053ac0 Mon Sep 17 00:00:00 2001 From: lagertonne Date: Sun, 7 Mar 2021 23:24:20 +0100 Subject: [PATCH 4/4] Add ZFS --- config/package-lists/zfs.list.chroot | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 config/package-lists/zfs.list.chroot diff --git a/config/package-lists/zfs.list.chroot b/config/package-lists/zfs.list.chroot new file mode 100644 index 0000000..9452000 --- /dev/null +++ b/config/package-lists/zfs.list.chroot @@ -0,0 +1,3 @@ +linux-headers-amd64 +zfs-dkms/buster-backports +zfsutils-linux/buster-backports