diff --git a/auto/config b/auto/config index 10ec80f..1efd2b9 100755 --- a/auto/config +++ b/auto/config @@ -3,6 +3,4 @@ lb config noauto \ --architectures amd64 \ --distribution buster \ - --backports true \ - --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/advanced.cfg b/config/bootloaders/isolinux/advanced.cfg deleted file mode 100644 index 373451a..0000000 --- a/config/bootloaders/isolinux/advanced.cfg +++ /dev/null @@ -1,7 +0,0 @@ -label hdt - menu label ^Hardware Detection Tool (HDT) - com32 hdt.c32 - -label memtest - menu label ^Memory Diagnostic Tool (memtest86+) - linux /live/memtest diff --git a/config/bootloaders/isolinux/hdt.c32 b/config/bootloaders/isolinux/hdt.c32 deleted file mode 120000 index f84c641..0000000 --- a/config/bootloaders/isolinux/hdt.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/hdt.c32 \ No newline at end of file diff --git a/config/bootloaders/isolinux/install.cfg b/config/bootloaders/isolinux/install.cfg deleted file mode 100644 index ba09752..0000000 --- a/config/bootloaders/isolinux/install.cfg +++ /dev/null @@ -1,11 +0,0 @@ -label install - menu label ^Install - linux /install/vmlinuz - initrd /install/initrd.gz - append vga=788 @APPEND_INSTALL@ --- quiet - -label installgui - menu label ^Graphical install - linux /install/gtk/vmlinuz - initrd /install/gtk/initrd.gz - append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet diff --git a/config/bootloaders/isolinux/isolinux.bin b/config/bootloaders/isolinux/isolinux.bin deleted file mode 120000 index 33a2ad6..0000000 --- a/config/bootloaders/isolinux/isolinux.bin +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/ISOLINUX/isolinux.bin \ No newline at end of file diff --git a/config/bootloaders/isolinux/isolinux.cfg b/config/bootloaders/isolinux/isolinux.cfg deleted file mode 100644 index 804f690..0000000 --- a/config/bootloaders/isolinux/isolinux.cfg +++ /dev/null @@ -1,4 +0,0 @@ -include menu.cfg -default vesamenu.c32 -prompt 0 -timeout 50 diff --git a/config/bootloaders/isolinux/ldlinux.c32 b/config/bootloaders/isolinux/ldlinux.c32 deleted file mode 120000 index df554c7..0000000 --- a/config/bootloaders/isolinux/ldlinux.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/ldlinux.c32 \ No newline at end of file diff --git a/config/bootloaders/isolinux/libcom32.c32 b/config/bootloaders/isolinux/libcom32.c32 deleted file mode 120000 index 44ab36b..0000000 --- a/config/bootloaders/isolinux/libcom32.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/libcom32.c32 \ No newline at end of file diff --git a/config/bootloaders/isolinux/libgpl.c32 b/config/bootloaders/isolinux/libgpl.c32 deleted file mode 120000 index 81c83fb..0000000 --- a/config/bootloaders/isolinux/libgpl.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/libgpl.c32 \ No newline at end of file diff --git a/config/bootloaders/isolinux/libmenu.c32 b/config/bootloaders/isolinux/libmenu.c32 deleted file mode 120000 index 2491ff9..0000000 --- a/config/bootloaders/isolinux/libmenu.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/libmenu.c32 \ No newline at end of file diff --git a/config/bootloaders/isolinux/libutil.c32 b/config/bootloaders/isolinux/libutil.c32 deleted file mode 120000 index 478194e..0000000 --- a/config/bootloaders/isolinux/libutil.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/libutil.c32 \ No newline at end of file diff --git a/config/bootloaders/isolinux/live.cfg.in b/config/bootloaders/isolinux/live.cfg.in deleted file mode 100644 index 97ceb92..0000000 --- a/config/bootloaders/isolinux/live.cfg.in +++ /dev/null @@ -1,12 +0,0 @@ -label live-@FLAVOUR@ - menu label ^Live (@FLAVOUR@) - menu default - linux @LINUX@ - initrd @INITRD@ - append @APPEND_LIVE@ - -label live-@FLAVOUR@-failsafe - menu label ^Live (@FLAVOUR@ failsafe) - linux @LINUX@ - initrd @INITRD@ - append @APPEND_LIVE_FAILSAFE@ diff --git a/config/bootloaders/isolinux/menu.cfg b/config/bootloaders/isolinux/menu.cfg deleted file mode 100644 index 338f2e5..0000000 --- a/config/bootloaders/isolinux/menu.cfg +++ /dev/null @@ -1,16 +0,0 @@ -menu hshift 0 -menu width 82 - -menu title Boot menu -include stdmenu.cfg -include live.cfg -menu begin advanced - menu title ^Advanced options - include stdmenu.cfg - label mainmenu - menu label ^Back.. - menu exit - include advanced.cfg -menu end - -menu clear diff --git a/config/bootloaders/isolinux/splash.svg b/config/bootloaders/isolinux/splash.svg deleted file mode 100644 index 8e8b4d7..0000000 --- a/config/bootloaders/isolinux/splash.svg +++ /dev/null @@ -1,388 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - @PROJECT@ @VERSION@ (@DISTRIBUTION@)@ARCHITECTURE@Build: @YEAR@-@MONTH@-@DAY@ @HOUR@:@MINUTE@:@SECOND@linux: @LINUX_VERSIONS@live-build: @LIVE_BUILD_VERSION@live-boot: @LIVE_BOOT_VERSION@live-config: @LIVE_CONFIG_VERSION@live-tools: @LIVE_TOOLS_VERSION@ - - - - - - - - - - - - - - - - diff --git a/config/bootloaders/isolinux/stdmenu.cfg b/config/bootloaders/isolinux/stdmenu.cfg deleted file mode 100644 index 671b16f..0000000 --- a/config/bootloaders/isolinux/stdmenu.cfg +++ /dev/null @@ -1,15 +0,0 @@ -menu background splash.png -menu color title * #FFFFFFFF * -menu color border * #00000000 #00000000 none -menu color sel * #ffffffff #76a1d0ff * -menu color hotsel 1;7;37;40 #ffffffff #76a1d0ff * -menu color tabmsg * #ffffffff #00000000 * -menu color help 37;40 #ffdddd00 #00000000 none -menu vshift 12 -menu rows 10 -menu helpmsgrow 15 -# The command line must be at least one line from the bottom. -menu cmdlinerow 16 -menu timeoutrow 16 -menu tabmsgrow 18 -menu tabmsg Press ENTER to boot or TAB to edit a menu entry diff --git a/config/bootloaders/isolinux/vesamenu.c32 b/config/bootloaders/isolinux/vesamenu.c32 deleted file mode 120000 index 84e2eff..0000000 --- a/config/bootloaders/isolinux/vesamenu.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/vesamenu.c32 \ No newline at end of file diff --git a/config/bootloaders/pxelinux/advanced.cfg b/config/bootloaders/pxelinux/advanced.cfg deleted file mode 100644 index 373451a..0000000 --- a/config/bootloaders/pxelinux/advanced.cfg +++ /dev/null @@ -1,7 +0,0 @@ -label hdt - menu label ^Hardware Detection Tool (HDT) - com32 hdt.c32 - -label memtest - menu label ^Memory Diagnostic Tool (memtest86+) - linux /live/memtest diff --git a/config/bootloaders/pxelinux/hdt.c32 b/config/bootloaders/pxelinux/hdt.c32 deleted file mode 120000 index f84c641..0000000 --- a/config/bootloaders/pxelinux/hdt.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/hdt.c32 \ No newline at end of file diff --git a/config/bootloaders/pxelinux/install.cfg b/config/bootloaders/pxelinux/install.cfg deleted file mode 100644 index ba09752..0000000 --- a/config/bootloaders/pxelinux/install.cfg +++ /dev/null @@ -1,11 +0,0 @@ -label install - menu label ^Install - linux /install/vmlinuz - initrd /install/initrd.gz - append vga=788 @APPEND_INSTALL@ --- quiet - -label installgui - menu label ^Graphical install - linux /install/gtk/vmlinuz - initrd /install/gtk/initrd.gz - append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet diff --git a/config/bootloaders/pxelinux/ldlinux.c32 b/config/bootloaders/pxelinux/ldlinux.c32 deleted file mode 120000 index df554c7..0000000 --- a/config/bootloaders/pxelinux/ldlinux.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/ldlinux.c32 \ No newline at end of file diff --git a/config/bootloaders/pxelinux/libcom32.c32 b/config/bootloaders/pxelinux/libcom32.c32 deleted file mode 120000 index 44ab36b..0000000 --- a/config/bootloaders/pxelinux/libcom32.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/libcom32.c32 \ No newline at end of file diff --git a/config/bootloaders/pxelinux/libgpl.c32 b/config/bootloaders/pxelinux/libgpl.c32 deleted file mode 120000 index 81c83fb..0000000 --- a/config/bootloaders/pxelinux/libgpl.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/libgpl.c32 \ No newline at end of file diff --git a/config/bootloaders/pxelinux/libmenu.c32 b/config/bootloaders/pxelinux/libmenu.c32 deleted file mode 120000 index 2491ff9..0000000 --- a/config/bootloaders/pxelinux/libmenu.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/libmenu.c32 \ No newline at end of file diff --git a/config/bootloaders/pxelinux/libutil.c32 b/config/bootloaders/pxelinux/libutil.c32 deleted file mode 120000 index 478194e..0000000 --- a/config/bootloaders/pxelinux/libutil.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/libutil.c32 \ No newline at end of file diff --git a/config/bootloaders/pxelinux/live.cfg.in b/config/bootloaders/pxelinux/live.cfg.in deleted file mode 100644 index 97ceb92..0000000 --- a/config/bootloaders/pxelinux/live.cfg.in +++ /dev/null @@ -1,12 +0,0 @@ -label live-@FLAVOUR@ - menu label ^Live (@FLAVOUR@) - menu default - linux @LINUX@ - initrd @INITRD@ - append @APPEND_LIVE@ - -label live-@FLAVOUR@-failsafe - menu label ^Live (@FLAVOUR@ failsafe) - linux @LINUX@ - initrd @INITRD@ - append @APPEND_LIVE_FAILSAFE@ diff --git a/config/bootloaders/pxelinux/menu.cfg b/config/bootloaders/pxelinux/menu.cfg deleted file mode 100644 index 9368260..0000000 --- a/config/bootloaders/pxelinux/menu.cfg +++ /dev/null @@ -1,17 +0,0 @@ -menu hshift 0 -menu width 82 - -menu title Boot menu -include stdmenu.cfg -include live.cfg -include install.cfg -menu begin advanced - menu title ^Advanced options - include stdmenu.cfg - label mainmenu - menu label ^Back.. - menu exit - include advanced.cfg -menu end - -menu clear diff --git a/config/bootloaders/pxelinux/pxelinux.0 b/config/bootloaders/pxelinux/pxelinux.0 deleted file mode 120000 index f723d02..0000000 --- a/config/bootloaders/pxelinux/pxelinux.0 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/PXELINUX/pxelinux.0 \ No newline at end of file diff --git a/config/bootloaders/pxelinux/pxelinux.cfg/default b/config/bootloaders/pxelinux/pxelinux.cfg/default deleted file mode 100644 index a3e3eab..0000000 --- a/config/bootloaders/pxelinux/pxelinux.cfg/default +++ /dev/null @@ -1,4 +0,0 @@ -include menu.cfg -default vesamenu.c32 -prompt 0 -timeout 0 diff --git a/config/bootloaders/pxelinux/splash.svg b/config/bootloaders/pxelinux/splash.svg deleted file mode 100644 index 8e8b4d7..0000000 --- a/config/bootloaders/pxelinux/splash.svg +++ /dev/null @@ -1,388 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - @PROJECT@ @VERSION@ (@DISTRIBUTION@)@ARCHITECTURE@Build: @YEAR@-@MONTH@-@DAY@ @HOUR@:@MINUTE@:@SECOND@linux: @LINUX_VERSIONS@live-build: @LIVE_BUILD_VERSION@live-boot: @LIVE_BOOT_VERSION@live-config: @LIVE_CONFIG_VERSION@live-tools: @LIVE_TOOLS_VERSION@ - - - - - - - - - - - - - - - - diff --git a/config/bootloaders/pxelinux/stdmenu.cfg b/config/bootloaders/pxelinux/stdmenu.cfg deleted file mode 100644 index 671b16f..0000000 --- a/config/bootloaders/pxelinux/stdmenu.cfg +++ /dev/null @@ -1,15 +0,0 @@ -menu background splash.png -menu color title * #FFFFFFFF * -menu color border * #00000000 #00000000 none -menu color sel * #ffffffff #76a1d0ff * -menu color hotsel 1;7;37;40 #ffffffff #76a1d0ff * -menu color tabmsg * #ffffffff #00000000 * -menu color help 37;40 #ffdddd00 #00000000 none -menu vshift 12 -menu rows 10 -menu helpmsgrow 15 -# The command line must be at least one line from the bottom. -menu cmdlinerow 16 -menu timeoutrow 16 -menu tabmsgrow 18 -menu tabmsg Press ENTER to boot or TAB to edit a menu entry diff --git a/config/bootloaders/pxelinux/vesamenu.c32 b/config/bootloaders/pxelinux/vesamenu.c32 deleted file mode 120000 index 84e2eff..0000000 --- a/config/bootloaders/pxelinux/vesamenu.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/vesamenu.c32 \ No newline at end of file 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