diff --git a/auto/config b/auto/config index 10ec80f..dd707e9 100755 --- a/auto/config +++ b/auto/config @@ -3,6 +3,5 @@ lb config noauto \ --architectures amd64 \ --distribution buster \ - --backports true \ - --bootappend-live "boot=live components initrd=/live/initrd.img" \ + --bootappend-live "boot=live components initrd=/live/initrd.img" "${@}" diff --git a/build-live-cd.sh b/build-live-cd.sh deleted file mode 100755 index 71aacf2..0000000 --- a/build-live-cd.sh +++ /dev/null @@ -1,30 +0,0 @@ -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 diff --git a/config/bootloaders/isolinux/isolinux.cfg b/config/bootloaders/isolinux/isolinux.cfg index 804f690..a3e3eab 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 50 +timeout 0 diff --git a/config/package-lists/zfs.list.chroot b/config/package-lists/zfs.list.chroot deleted file mode 100644 index 9452000..0000000 --- a/config/package-lists/zfs.list.chroot +++ /dev/null @@ -1,3 +0,0 @@ -linux-headers-amd64 -zfs-dkms/buster-backports -zfsutils-linux/buster-backports