diff --git a/amd64/config/archives/cbpp.list.binary b/amd64/config/archives/cbpp.list.binary index 6ba18ec..27aa52e 100644 --- a/amd64/config/archives/cbpp.list.binary +++ b/amd64/config/archives/cbpp.list.binary @@ -1 +1 @@ -deb https://packages.crunchbangplusplus.org/bullseye bullseye main +deb https://packages.crunchbangplusplus.org/buster buster main diff --git a/amd64/config/archives/cbpp.list.chroot b/amd64/config/archives/cbpp.list.chroot index 6ba18ec..27aa52e 100644 --- a/amd64/config/archives/cbpp.list.chroot +++ b/amd64/config/archives/cbpp.list.chroot @@ -1 +1 @@ -deb https://packages.crunchbangplusplus.org/bullseye bullseye main +deb https://packages.crunchbangplusplus.org/buster buster main diff --git a/amd64/config/archives/cbpp10.key b/amd64/config/archives/cbpp10.key new file mode 100644 index 0000000..637b505 --- /dev/null +++ b/amd64/config/archives/cbpp10.key @@ -0,0 +1,41 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +=Lk3k +-----END PGP PUBLIC KEY BLOCK----- diff --git a/amd64/config/archives/cbpp11.key b/amd64/config/archives/cbpp11.key deleted file mode 100644 index b76611d..0000000 --- a/amd64/config/archives/cbpp11.key +++ /dev/null @@ -1,41 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -mQGNBGCCCnUBDAC+Qb9u3VIYYcyBjZ5yGxE/4Nnlx8EGyZMiKm4xfMePEuT7aylz -66ekBEwLX+sS08BswapYOQ7Npkq73ihyghK1CYzc8XpJ4fZQJgfrVoqFYMLLfJHn -KCMxsCziM3HGBV4uap1kc4ax7rQ6jZtR3E3tYIlAvoY97O2QMrCviGnUOpcWI5Fd -7jc6NTZizNCmUVdNqXLRR2Viin2w81YNaUT5XzLxAldGujNLV2qLONI95uETa1xL -8KgRGhFVqAEpq2oH6Pz082h2FMyW2gDljUAaMzH1C+KTQ242b8zl+GSodP5mRSSG -mdHZC8Ht4ouwii9FDiyNjqghX/cVITw1Y+pw+e/7vBzgo8NP3RSv3TEwekUJLWuR -/UB4bACbVIoeDs/L9hPUoAIBU3z6BUodhs91FwboJWzCSghZH3aVOKPfTzXzhfIZ -BVOfoPHfkgnDWWIfV7kITzPJM9ZqZ0QAkNhViuK+t+mBFVb4ekqeJyOEA1zi2hrz -3P6p+EMJVUkuVTkAEQEAAbQwQmVuIFlvdW5nIDxjb21wdXRlcm1vdXRoQGNydW5j -aGJhbmdwbHVzcGx1cy5vcmc+iQHUBBMBCgA+FiEEMkcQzAD8UridI+P66TqJtvMo -3HIFAmCCCnUCGwMFCQPCZwAFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AACgkQ6TqJ -tvMo3HK9Ogv+M3gNyTVR3POM/3OS+ZShV05BOLSrJdW3EHV8gPpL57KIgXOXSZR8 -IfABHihjlgfNgqxepnXM+3nPOtkQK+SvZIfpxpzdt7fXNMFu4/yTUoNbJnE724qY -mmrFe5bEzmZsRscne1JXYNyCRXTafrYzce+jLiBZtrSwtmX7KZAgdaKBiEaAWdnN -G2jqyaBbqfrPDYCCTsu3Nu/xfh0FugY5q6i6+8b+D9IAFu2jTVi91amKuKvupvCt -cIboz9BOmsvxoZHd5eGi24zIv0oH1MupnFWrLxY7nho3z+8ZKKnqCSIHV+IGXAqt -fem0pfOKzcslhdEudFSZ87hSWGWGSRiElHvLRfLptbM4cP0t9HCUJM9fTk3lkYJC -M7Xnj9oRjgAek8xmhj9jO2Fxip/hWUUPsZh2rBGOnhbmVQVm8Xt8OUAzVRukhJ+C -nhzg1aSRbXBOc2t+10DCTyx/CK0uoObDe6C0nBkXIzKW1GI+cEeS0nXyleOeVzOP -TCDVo/godLV1uQGNBGCCCnUBDACwxkbYjKaViV/cZTCoPKgNfqMSTyXzm6inxORK -q13GFmhAwYak/Z6d0Vg37QpFgTHS/nRunlFvuf3TTYpHYNyB5FJzqT6SkCll4A3L -YzvrQ8FcMn+0X76Oh1zmpbvweIlz03EoGNrqsesX378Gb+7v+ykTs4PFDIdubTkp -0LJBlm6v4zi3ScMz0CNs9oqKOXtGIbb9IVsoSASDcfvCrHuY4OHuJOm2pfza8ltg -GrrVbdIOBg2+k2nyX4TpdQz0bwHvSJ5GrDPHv0WsGu0GO047u5DI4XdEfBu64n4O -xoLVmEbWBIwqDw7lgh5uKqzufr1txue+eohRP9iVpLKy70oRUAT4iKBkiDQzrUlX -fp8rg5K4g8TZLWxMlMUXimDeiYjbtBIxuBos9cEbNU9vNsI0H9+41Clzq8VvcX+T -dmpLcpTWjE+QU/Rv+WE3/papmwkKcoT/iP0+t05YRnNWb3k78qL3CR9WnE2+D2oB -fHRYZg0ddg+QdTuyrEgyUbGpYzMAEQEAAYkBvAQYAQoAJhYhBDJHEMwA/FK4nSPj -+uk6ibbzKNxyBQJgggp1AhsMBQkDwmcAAAoJEOk6ibbzKNxy5NML/1hgaHuqff4z -c1N0QO/8msJMv8vd4JFg/x8sQPzjlcfDvFsVW3FY0yfyO9Xu4etWFFY2/GGSkj37 -zDTMnd8nbvFsxQ946/x5zYgCWXzC58UYYHsvbN87eMamw0JiBWShCYVDV3vcRB4Y -HBDMxZOF23x4cDmtw5/9sG2TT16sK044yZXvOGFiWKM5UV5o9O2601d4ZayN/Cb2 -XZ4Qj0mtsPD50GcXF3jFRgQ+fJNbVyxymV/MUb8KVfLNjlaVa06kdY8nwi+NSHMl -A1beSuyQV70FLKIsOU3z7Lz2LdkBYNbb2YCYJQR2gclDmkMrEeantnZ56zQwshFq -3d5R9HX/97Az/IVKDnXZr/iCQUPavKTluzUCSS2jvP+5iCqBTWVxBEpiZrKe9Vdc -GdiX1ZzICudmqA7e0pVKgA6RXHPrPMSg+g1lluuHVPS/X/QI4PrEJUuESktTyrXm -kwjyv3D9N6xkSPAf/aITsaFi+6HNoiWYYDdoMDaprLPYonpEYb0cNw== -=se6L ------END PGP PUBLIC KEY BLOCK----- diff --git a/amd64/config/binary b/amd64/config/binary index c68b975..34870bc 100644 --- a/amd64/config/binary +++ b/amd64/config/binary @@ -1,107 +1,170 @@ # config/binary - options for live-build(7), binary stage -# Set image type -LB_IMAGE_TYPE="iso-hybrid" - -# Set image filesystem +# $LB_BINARY_FILESYSTEM: set image filesystem +# (Default: fat32) LB_BINARY_FILESYSTEM="fat32" -# Set apt/aptitude generic indices +# $LB_APT_INDICES: set apt/aptitude generic indices +# (Default: true) LB_APT_INDICES="true" -# Set boot parameters +# $LB_BOOTAPPEND_LIVE: set boot parameters +# (Default: empty) LB_BOOTAPPEND_LIVE="boot=live components quiet splash username=live" -# Set boot parameters +# $LB_BOOTAPPEND_INSTALL: set boot parameters +# (Default: empty) LB_BOOTAPPEND_INSTALL="" -# Set boot parameters -LB_BOOTAPPEND_LIVE_FAILSAFE="boot=live components memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=788" - -# Set BIOS bootloader -LB_BOOTLOADER_BIOS="syslinux" +# $LB_BOOTAPPEND_LIVE_FAILSAFE: set boot parameters +# (Default: empty) +LB_BOOTAPPEND_LIVE_FAILSAFE="boot=live components memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal" -# Set EFI bootloader -LB_BOOTLOADER_EFI="grub-efi" +# $LB_BOOTLOADERS: set bootloaders +# (Default: syslinux,grub-efi) +LB_BOOTLOADERS="syslinux,grub-efi" -# Set checksums -LB_CHECKSUMS="sha256" +# $LB_CHECKSUMS: set checksums +# (Default: md5) +LB_CHECKSUMS="md5" -# Set compression +# $LB_COMPRESSION: set compression +# (Default: none) LB_COMPRESSION="none" -# Set zsync +# $LB_ZSYNC: set zsync +# (Default: true) LB_ZSYNC="true" -# Control if we build binary images chrooted -# NEVER, *EVER*, *E*V*E*R* SET THIS OPTION to false. +# ${LB_BUILD_WITH_CHROOT: control if we build binary images chrooted +# (Default: true) +# DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to false. LB_BUILD_WITH_CHROOT="true" -# Set debian-installer +# $LB_DEBIAN_INSTALLER: set debian-installer +# (Default: live) LB_DEBIAN_INSTALLER="live" -# Set debian-installer suite -LB_DEBIAN_INSTALLER_DISTRIBUTION="bullseye" +# $LB_DEBIAN_INSTALLER_DISTRIBUTION: set debian-installer suite +# (Default: empty) +LB_DEBIAN_INSTALLER_DISTRIBUTION="buster" -# Set debian-installer preseed filename/url +# $LB_DEBIAN_INSTALLER_PRESEEDFILE: set debian-installer preseed filename/url +# (Default: ) LB_DEBIAN_INSTALLER_PRESEEDFILE="" -# Toggle use of GUI debian-installer +# $LB_DEBIAN_INSTALLER_GUI: toggle use of GUI debian-installer +# (Default: true) LB_DEBIAN_INSTALLER_GUI="true" -# Set hdd label +# $LB_GRUB_SPLASH: set custom grub splash +# (Default: empty) +LB_GRUB_SPLASH="" + +# $LB_HDD_LABEL: set hdd label +# (Default: DEBIAN_LIVE) LB_HDD_LABEL="DEBIAN_LIVE" -# Set hdd filesystem size +# $LB_HDD_SIZE: set hdd filesystem size +# (Default: auto) LB_HDD_SIZE="auto" -# Set start of partition for the hdd target for BIOSes that expect a specific boot partition start (e.g. "63s"). If empty, use optimal layout. +# $LB_HDD_PARTITION_START: set start of partition for the hdd target for BIOSes that expect a specific boot partition start (e.g. "63s"). If empty, use optimal layout. +# (Default: ) LB_HDD_PARTITION_START="" -# Set iso author +# $LB_ISO_APPLICATION: set iso author +# (Default: Debian Live) LB_ISO_APPLICATION="Debian Live" -# Set iso preparer -LB_ISO_PREPARER="live-build @LB_VERSION@; https://salsa.debian.org/live-team/live-build" +# $LB_ISO_PREPARER: set iso preparer +# (Default: live-build $VERSION; https://debian-live.alioth.debian.org/live-build) +LB_ISO_PREPARER="live-build $VERSION; https://debian-live.alioth.debian.org/live-build" -# Set iso publisher -LB_ISO_PUBLISHER="Debian Live project; https://wiki.debian.org/DebianLive; debian-live@lists.debian.org" +# $LB_ISO_PUBLISHER: set iso publisher +# (Default: Live Systems project; https://debian-live.alioth.debian.org/; debian-live@lists.debian.org) +LB_ISO_PUBLISHER="Live Systems project; https://debian-live.alioth.debian.org/; debian-live@lists.debian.org" -# Set iso volume (max 32 chars) -LB_ISO_VOLUME="cbpp-11-$(date +%Y%m%d-%H:%M)" +# $LB_ISO_VOLUME: set iso volume (max 32 chars) +# (Default: Debian buster $(date +%Y%m%d-%H:%M)) +LB_ISO_VOLUME="cbpp-10-$(date +%Y%m%d-%H:%M)" -# Set jffs2 eraseblock size +# $LB_JFFS2_ERASEBLOCK: set jffs2 eraseblock size +# (Default: unset) LB_JFFS2_ERASEBLOCK="" -# Set memtest +# $LB_MEMTEST: set memtest +# (Default: none) LB_MEMTEST="none" -# Set loadlin +# $LB_LOADLIN: set loadlin +# (Default: false) LB_LOADLIN="false" -# Set win32-loader +# $LB_WIN32_LOADER: set win32-loader +# (Default: false) LB_WIN32_LOADER="false" -# Set net tarball +# $LB_NET_ROOT_FILESYSTEM: set netboot filesystem +# (Default: nfs) +LB_NET_ROOT_FILESYSTEM="nfs" + +# $LB_NET_ROOT_MOUNTOPTIONS: set nfsopts +# (Default: empty) +LB_NET_ROOT_MOUNTOPTIONS="" + +# $LB_NET_ROOT_PATH: set netboot server directory +# (Default: /srv/debian-live) +LB_NET_ROOT_PATH="/srv/debian-live" + +# $LB_NET_ROOT_SERVER: set netboot server address +# (Default: 192.168.1.1) +LB_NET_ROOT_SERVER="192.168.1.1" + +# $LB_NET_COW_FILESYSTEM: set net client cow filesystem +# (Default: nfs) +LB_NET_COW_FILESYSTEM="nfs" + +# $LB_NET_COW_MOUNTOPTIONS: set cow mount options +# (Default: empty) +LB_NET_COW_MOUNTOPTIONS="" + +# $LB_NET_COW_PATH: set cow directory +# (Default: ) +LB_NET_COW_PATH="" + +# $LB_NET_COW_SERVER: set cow server +# (Default: ) +LB_NET_COW_SERVER="" + +# $LB_NET_TARBALL: set net tarball +# (Default: true) LB_NET_TARBALL="true" -# Set onie +# $LB_ONIE: set onie +# (Default: false) LB_ONIE="false" -# Set onie additional kernel cmdline options +# $LB_ONIE_KERNEL_CMDLINE: set onie additional kernel cmdline options +# (Default: ) LB_ONIE_KERNEL_CMDLINE="" -# Set inclusion of firmware packages in debian-installer +# $LB_FIRMWARE_BINARY: include firmware packages in debian-installer +# (Default: true) LB_FIRMWARE_BINARY="true" -# Set inclusion of firmware packages in the live image +# $LB_FIRMWARE_CHROOT: include firmware packages in debian-installer +# (Default: true) LB_FIRMWARE_CHROOT="true" -# Set swap file path +# $LB_SWAP_FILE_PATH: set swap file path +# (Default: ) LB_SWAP_FILE_PATH="" -# Set swap file size +# $LB_SWAP_FILE_SIZE: set swap file size +# (Default: 512) LB_SWAP_FILE_SIZE="512" -# Enable/disable UEFI secure boot support +# $LB_UEFI_SECURE_BOOT: enable/disable UEFI secure boot +# (Default: auto) LB_UEFI_SECURE_BOOT="auto" diff --git a/amd64/config/bootloaders/extlinux/advanced.cfg b/amd64/config/bootloaders/extlinux/advanced.cfg deleted file mode 100644 index 373451a..0000000 --- a/amd64/config/bootloaders/extlinux/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/amd64/config/bootloaders/extlinux/extlinux.conf b/amd64/config/bootloaders/extlinux/extlinux.conf deleted file mode 100644 index a3e3eab..0000000 --- a/amd64/config/bootloaders/extlinux/extlinux.conf +++ /dev/null @@ -1,4 +0,0 @@ -include menu.cfg -default vesamenu.c32 -prompt 0 -timeout 0 diff --git a/amd64/config/bootloaders/extlinux/hdt.c32 b/amd64/config/bootloaders/extlinux/hdt.c32 deleted file mode 120000 index f84c641..0000000 --- a/amd64/config/bootloaders/extlinux/hdt.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/hdt.c32 \ No newline at end of file diff --git a/amd64/config/bootloaders/extlinux/install.cfg b/amd64/config/bootloaders/extlinux/install.cfg deleted file mode 100644 index ba09752..0000000 --- a/amd64/config/bootloaders/extlinux/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/amd64/config/bootloaders/extlinux/ldlinux.c32 b/amd64/config/bootloaders/extlinux/ldlinux.c32 deleted file mode 120000 index df554c7..0000000 --- a/amd64/config/bootloaders/extlinux/ldlinux.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/ldlinux.c32 \ No newline at end of file diff --git a/amd64/config/bootloaders/extlinux/libcom32.c32 b/amd64/config/bootloaders/extlinux/libcom32.c32 deleted file mode 120000 index 44ab36b..0000000 --- a/amd64/config/bootloaders/extlinux/libcom32.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/libcom32.c32 \ No newline at end of file diff --git a/amd64/config/bootloaders/extlinux/libgpl.c32 b/amd64/config/bootloaders/extlinux/libgpl.c32 deleted file mode 120000 index 81c83fb..0000000 --- a/amd64/config/bootloaders/extlinux/libgpl.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/libgpl.c32 \ No newline at end of file diff --git a/amd64/config/bootloaders/extlinux/libmenu.c32 b/amd64/config/bootloaders/extlinux/libmenu.c32 deleted file mode 120000 index 2491ff9..0000000 --- a/amd64/config/bootloaders/extlinux/libmenu.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/libmenu.c32 \ No newline at end of file diff --git a/amd64/config/bootloaders/extlinux/libutil.c32 b/amd64/config/bootloaders/extlinux/libutil.c32 deleted file mode 120000 index 478194e..0000000 --- a/amd64/config/bootloaders/extlinux/libutil.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/libutil.c32 \ No newline at end of file diff --git a/amd64/config/bootloaders/extlinux/live.cfg.in b/amd64/config/bootloaders/extlinux/live.cfg.in deleted file mode 100644 index 97ceb92..0000000 --- a/amd64/config/bootloaders/extlinux/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/amd64/config/bootloaders/extlinux/menu.cfg b/amd64/config/bootloaders/extlinux/menu.cfg deleted file mode 100644 index 9368260..0000000 --- a/amd64/config/bootloaders/extlinux/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/amd64/config/bootloaders/extlinux/splash.svg b/amd64/config/bootloaders/extlinux/splash.svg deleted file mode 100644 index e684e60..0000000 --- a/amd64/config/bootloaders/extlinux/splash.svg +++ /dev/null @@ -1,225 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - Crunchbang Plus Plus@PROJECT@ 11 (@DISTRIBUTION@) Version: 11-beta3 @ARCHITECTURE@Build: @YEAR@-@MONTH@-@DAY@ @HOUR@:@MINUTE@:@SECOND@Kernel: @LINUX_VERSIONS@  -   - - - diff --git a/amd64/config/bootloaders/extlinux/stdmenu.cfg b/amd64/config/bootloaders/extlinux/stdmenu.cfg deleted file mode 100644 index 671b16f..0000000 --- a/amd64/config/bootloaders/extlinux/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/amd64/config/bootloaders/extlinux/vesamenu.c32 b/amd64/config/bootloaders/extlinux/vesamenu.c32 deleted file mode 120000 index 84e2eff..0000000 --- a/amd64/config/bootloaders/extlinux/vesamenu.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/vesamenu.c32 \ No newline at end of file diff --git a/amd64/config/bootloaders/grub-legacy/menu.lst b/amd64/config/bootloaders/grub-legacy/menu.lst deleted file mode 100644 index 3b866e5..0000000 --- a/amd64/config/bootloaders/grub-legacy/menu.lst +++ /dev/null @@ -1,9 +0,0 @@ -default 0 -color cyan/blue white/blue -splashimage /boot/grub/splash.xpm.gz - -LINUX_LIVE - -LINUX_INSTALL - -MEMTEST diff --git a/amd64/config/bootloaders/grub-legacy/splash.xpm.gz b/amd64/config/bootloaders/grub-legacy/splash.xpm.gz deleted file mode 100644 index 6c1bf9a..0000000 Binary files a/amd64/config/bootloaders/grub-legacy/splash.xpm.gz and /dev/null differ diff --git a/amd64/config/bootloaders/grub-pc/dejavu-bold-14.pf2 b/amd64/config/bootloaders/grub-pc/dejavu-bold-14.pf2 deleted file mode 100644 index 9b093b2..0000000 Binary files a/amd64/config/bootloaders/grub-pc/dejavu-bold-14.pf2 and /dev/null differ diff --git a/amd64/config/bootloaders/grub-pc/dejavu-bold-16.pf2 b/amd64/config/bootloaders/grub-pc/dejavu-bold-16.pf2 deleted file mode 100644 index 11e7f7a..0000000 Binary files a/amd64/config/bootloaders/grub-pc/dejavu-bold-16.pf2 and /dev/null differ diff --git a/amd64/config/bootloaders/grub-pc/grub.cfg b/amd64/config/bootloaders/grub-pc/grub.cfg deleted file mode 100644 index a809375..0000000 --- a/amd64/config/bootloaders/grub-pc/grub.cfg +++ /dev/null @@ -1,58 +0,0 @@ -set default=0 - -loadfont $prefix/dejavu-bold-16.pf2 -loadfont $prefix/dejavu-bold-14.pf2 -loadfont $prefix/unicode.pf2 -set gfxmode=auto -insmod all_video -insmod gfxterm -insmod png - -set color_normal=light-gray/black -set color_highlight=white/black - -if [ -e /isolinux/splash.png ]; then - # binary_syslinux modifies the theme file to point to the correct - # background picture - set theme=/boot/grub/live-theme/theme.txt -elif [ -e /boot/grub/splash.png ]; then - set theme=/boot/grub/live-theme/theme.txt -else - set menu_color_normal=cyan/blue - set menu_color_highlight=white/blue -fi - -terminal_output gfxterm - -insmod play -play 960 440 1 0 4 440 1 - -# Live boot -LINUX_LIVE - -# You can add more entries like this -# menuentry "Alternate live boot" { -# linux KERNEL_LIVE APPEND_LIVE custom options here -# initrd INITRD_LIVE -# } -# menuentry "Alternate graphical installer" { -# linux KERNEL_GI APPEND_GI custom options here -# initrd INITRD_GI -# } -# menuentry "Alternate textual installer" { -# linux KERNEL_DI APPEND_DI custom options here -# initrd INITRD_DI -# } - -# Installer (if any) -LINUX_INSTALL - -submenu 'Advanced options...' { - -# More installer entries (if any) -LINUX_ADVANCED_INSTALL - -# Memtest (if any) -MEMTEST - -} diff --git a/amd64/config/bootloaders/grub-pc/live-theme/theme.txt b/amd64/config/bootloaders/grub-pc/live-theme/theme.txt deleted file mode 100644 index 033b279..0000000 --- a/amd64/config/bootloaders/grub-pc/live-theme/theme.txt +++ /dev/null @@ -1,52 +0,0 @@ -desktop-image: "../splash.png" -title-color: "#ffffff" -title-font: "DejaVu Sans Bold 16" -title-text: "Live Boot Menu with GRUB" -#title-text: "Crunchbang Plus Plus -- @PROJECT@ 11 (@DISTRIBUTION@) @ARCHITECTURE@" -message-font: "Unifont Regular 16" -terminal-font: "Unifont Regular 16" - -#help bar at the bottom -+ label { - top = 100%-50 - left = 0 - width = 100% - height = 20 - text = "@KEYMAP_SHORT@" - align = "center" - color = "#ffffff" - font = "DejaVu Sans Bold 14" -} - -#boot menu -+ boot_menu { - left = 10% - width = 80% - top = 52% - height = 48%-80 - item_color = "#a8a8a8" - item_font = "DejaVu Sans Bold 14" - selected_item_color= "#ffffff" - selected_item_font = "DejaVu Sans Bold 14" - item_height = 16 - item_padding = 0 - item_spacing = 4 - icon_width = 0 - icon_heigh = 0 - item_icon_space = 0 -} - -#progress bar -+ progress_bar { - id = "__timeout__" - left = 15% - top = 100%-80 - height = 16 - width = 70% - font = "DejaVu Sans Regular 14" - text_color = "#000000" - fg_color = "#ffffff" - bg_color = "#a8a8a8" - border_color = "#ffffff" - text = "@TIMEOUT_NOTIFICATION_LONG@" -} diff --git a/amd64/config/bootloaders/grub-pc/splash.png b/amd64/config/bootloaders/grub-pc/splash.png deleted file mode 100644 index fdb7699..0000000 Binary files a/amd64/config/bootloaders/grub-pc/splash.png and /dev/null differ diff --git a/amd64/config/bootloaders/grub-pc/splash.svg b/amd64/config/bootloaders/grub-pc/splash.svg deleted file mode 100644 index e684e60..0000000 --- a/amd64/config/bootloaders/grub-pc/splash.svg +++ /dev/null @@ -1,225 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - Crunchbang Plus Plus@PROJECT@ 11 (@DISTRIBUTION@) Version: 11-beta3 @ARCHITECTURE@Build: @YEAR@-@MONTH@-@DAY@ @HOUR@:@MINUTE@:@SECOND@Kernel: @LINUX_VERSIONS@  -   - - - diff --git a/amd64/config/bootloaders/isolinux/splash.svg b/amd64/config/bootloaders/isolinux/splash.svg index e684e60..3d2a1a9 100644 --- a/amd64/config/bootloaders/isolinux/splash.svg +++ b/amd64/config/bootloaders/isolinux/splash.svg @@ -14,7 +14,7 @@ height="480" id="svg3320" version="1.1" - inkscape:version="0.92.4 (5da689c313, 2019-01-14)" + inkscape:version="0.48.5 r10040" sodipodi:docname="splash.svg"> @@ -81,17 +81,17 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="2.8284271" - inkscape:cx="320" - inkscape:cy="409.70563" + inkscape:zoom="1.4142136" + inkscape:cx="171.19441" + inkscape:cy="232.36355" inkscape:document-units="px" - inkscape:current-layer="layer1" + inkscape:current-layer="layer2" showgrid="false" - inkscape:window-width="1702" - inkscape:window-height="1145" - inkscape:window-x="1296" - inkscape:window-y="389" - inkscape:window-maximized="0" /> + inkscape:window-width="1920" + inkscape:window-height="1032" + inkscape:window-x="1080" + inkscape:window-y="449" + inkscape:window-maximized="1" /> @@ -105,121 +105,138 @@ + id="layer1" + transform="translate(0,-572.3622)"> + x="0" + y="572.36218" /> + + inkscape:label="cb" + style="display:none"> + #! ++ + + x="12.585796" + y="16.292892" /> + + id="layer2" + inkscape:label="lb-text"> Crunchbang Plus Plus@PROJECT@ 11 (@DISTRIBUTION@) Crunchbang Plus PlusVersion: 11-beta3 @ARCHITECTURE@@PROJECT@ @VERSION@ (@DISTRIBUTION@)Build: @YEAR@-@MONTH@-@DAY@ @HOUR@:@MINUTE@:@SECOND@Kernel: @LINUX_VERSIONS@Version: 1.1 @ARCHITECTURE@   - Build Date: @YEAR@-@MONTH@-@DAY@  - + style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans Bold" + id="tspan3066">Kernel: @LINUX_VERSIONS@ diff --git a/amd64/config/bootloaders/pxelinux/advanced.cfg b/amd64/config/bootloaders/pxelinux/advanced.cfg deleted file mode 100644 index 373451a..0000000 --- a/amd64/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/amd64/config/bootloaders/pxelinux/hdt.c32 b/amd64/config/bootloaders/pxelinux/hdt.c32 deleted file mode 120000 index f84c641..0000000 --- a/amd64/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/amd64/config/bootloaders/pxelinux/install.cfg b/amd64/config/bootloaders/pxelinux/install.cfg deleted file mode 100644 index ba09752..0000000 --- a/amd64/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/amd64/config/bootloaders/pxelinux/ldlinux.c32 b/amd64/config/bootloaders/pxelinux/ldlinux.c32 deleted file mode 120000 index df554c7..0000000 --- a/amd64/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/amd64/config/bootloaders/pxelinux/libcom32.c32 b/amd64/config/bootloaders/pxelinux/libcom32.c32 deleted file mode 120000 index 44ab36b..0000000 --- a/amd64/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/amd64/config/bootloaders/pxelinux/libgpl.c32 b/amd64/config/bootloaders/pxelinux/libgpl.c32 deleted file mode 120000 index 81c83fb..0000000 --- a/amd64/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/amd64/config/bootloaders/pxelinux/libmenu.c32 b/amd64/config/bootloaders/pxelinux/libmenu.c32 deleted file mode 120000 index 2491ff9..0000000 --- a/amd64/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/amd64/config/bootloaders/pxelinux/libutil.c32 b/amd64/config/bootloaders/pxelinux/libutil.c32 deleted file mode 120000 index 478194e..0000000 --- a/amd64/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/amd64/config/bootloaders/pxelinux/live.cfg.in b/amd64/config/bootloaders/pxelinux/live.cfg.in deleted file mode 100644 index 97ceb92..0000000 --- a/amd64/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/amd64/config/bootloaders/pxelinux/menu.cfg b/amd64/config/bootloaders/pxelinux/menu.cfg deleted file mode 100644 index 9368260..0000000 --- a/amd64/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/amd64/config/bootloaders/pxelinux/pxelinux.0 b/amd64/config/bootloaders/pxelinux/pxelinux.0 deleted file mode 120000 index f723d02..0000000 --- a/amd64/config/bootloaders/pxelinux/pxelinux.0 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/PXELINUX/pxelinux.0 \ No newline at end of file diff --git a/amd64/config/bootloaders/pxelinux/pxelinux.cfg/default b/amd64/config/bootloaders/pxelinux/pxelinux.cfg/default deleted file mode 100644 index a3e3eab..0000000 --- a/amd64/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/amd64/config/bootloaders/pxelinux/splash.svg b/amd64/config/bootloaders/pxelinux/splash.svg deleted file mode 100644 index e684e60..0000000 --- a/amd64/config/bootloaders/pxelinux/splash.svg +++ /dev/null @@ -1,225 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - Crunchbang Plus Plus@PROJECT@ 11 (@DISTRIBUTION@) Version: 11-beta3 @ARCHITECTURE@Build: @YEAR@-@MONTH@-@DAY@ @HOUR@:@MINUTE@:@SECOND@Kernel: @LINUX_VERSIONS@  -   - - - diff --git a/amd64/config/bootloaders/pxelinux/stdmenu.cfg b/amd64/config/bootloaders/pxelinux/stdmenu.cfg deleted file mode 100644 index 671b16f..0000000 --- a/amd64/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/amd64/config/bootloaders/pxelinux/vesamenu.c32 b/amd64/config/bootloaders/pxelinux/vesamenu.c32 deleted file mode 120000 index 84e2eff..0000000 --- a/amd64/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/amd64/config/bootloaders/syslinux/advanced.cfg b/amd64/config/bootloaders/syslinux/advanced.cfg deleted file mode 100644 index 373451a..0000000 --- a/amd64/config/bootloaders/syslinux/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/amd64/config/bootloaders/syslinux/hdt.c32 b/amd64/config/bootloaders/syslinux/hdt.c32 deleted file mode 120000 index f84c641..0000000 --- a/amd64/config/bootloaders/syslinux/hdt.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/hdt.c32 \ No newline at end of file diff --git a/amd64/config/bootloaders/syslinux/install.cfg b/amd64/config/bootloaders/syslinux/install.cfg deleted file mode 100644 index ba09752..0000000 --- a/amd64/config/bootloaders/syslinux/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/amd64/config/bootloaders/syslinux/ldlinux.c32 b/amd64/config/bootloaders/syslinux/ldlinux.c32 deleted file mode 120000 index df554c7..0000000 --- a/amd64/config/bootloaders/syslinux/ldlinux.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/ldlinux.c32 \ No newline at end of file diff --git a/amd64/config/bootloaders/syslinux/libcom32.c32 b/amd64/config/bootloaders/syslinux/libcom32.c32 deleted file mode 120000 index 44ab36b..0000000 --- a/amd64/config/bootloaders/syslinux/libcom32.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/libcom32.c32 \ No newline at end of file diff --git a/amd64/config/bootloaders/syslinux/libgpl.c32 b/amd64/config/bootloaders/syslinux/libgpl.c32 deleted file mode 120000 index 81c83fb..0000000 --- a/amd64/config/bootloaders/syslinux/libgpl.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/libgpl.c32 \ No newline at end of file diff --git a/amd64/config/bootloaders/syslinux/libmenu.c32 b/amd64/config/bootloaders/syslinux/libmenu.c32 deleted file mode 120000 index 2491ff9..0000000 --- a/amd64/config/bootloaders/syslinux/libmenu.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/libmenu.c32 \ No newline at end of file diff --git a/amd64/config/bootloaders/syslinux/libutil.c32 b/amd64/config/bootloaders/syslinux/libutil.c32 deleted file mode 120000 index 478194e..0000000 --- a/amd64/config/bootloaders/syslinux/libutil.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/libutil.c32 \ No newline at end of file diff --git a/amd64/config/bootloaders/syslinux/live.cfg.in b/amd64/config/bootloaders/syslinux/live.cfg.in deleted file mode 100644 index 97ceb92..0000000 --- a/amd64/config/bootloaders/syslinux/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/amd64/config/bootloaders/syslinux/menu.cfg b/amd64/config/bootloaders/syslinux/menu.cfg deleted file mode 100644 index 9368260..0000000 --- a/amd64/config/bootloaders/syslinux/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/amd64/config/bootloaders/syslinux/splash.svg b/amd64/config/bootloaders/syslinux/splash.svg deleted file mode 100644 index e684e60..0000000 --- a/amd64/config/bootloaders/syslinux/splash.svg +++ /dev/null @@ -1,225 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - Crunchbang Plus Plus@PROJECT@ 11 (@DISTRIBUTION@) Version: 11-beta3 @ARCHITECTURE@Build: @YEAR@-@MONTH@-@DAY@ @HOUR@:@MINUTE@:@SECOND@Kernel: @LINUX_VERSIONS@  -   - - - diff --git a/amd64/config/bootloaders/syslinux/stdmenu.cfg b/amd64/config/bootloaders/syslinux/stdmenu.cfg deleted file mode 100644 index 671b16f..0000000 --- a/amd64/config/bootloaders/syslinux/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/amd64/config/bootloaders/syslinux/syslinux.cfg b/amd64/config/bootloaders/syslinux/syslinux.cfg deleted file mode 100644 index a3e3eab..0000000 --- a/amd64/config/bootloaders/syslinux/syslinux.cfg +++ /dev/null @@ -1,4 +0,0 @@ -include menu.cfg -default vesamenu.c32 -prompt 0 -timeout 0 diff --git a/amd64/config/bootloaders/syslinux/vesamenu.c32 b/amd64/config/bootloaders/syslinux/vesamenu.c32 deleted file mode 120000 index 84e2eff..0000000 --- a/amd64/config/bootloaders/syslinux/vesamenu.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/vesamenu.c32 \ No newline at end of file diff --git a/amd64/config/bootstrap b/amd64/config/bootstrap index 9a76243..544ed12 100644 --- a/amd64/config/bootstrap +++ b/amd64/config/bootstrap @@ -1,76 +1,73 @@ # config/bootstrap - options for live-build(7), bootstrap stage -# Select architecture to use -LB_ARCHITECTURE="amd64" +# $LB_DISTRIBUTION: select distribution to use +# (Default: buster) +LB_DISTRIBUTION="buster" -# Select distribution to use -LB_DISTRIBUTION="bullseye" +# $LB_PARENT_DISTRIBUTION: select parent distribution to use +# (Default: buster) +LB_PARENT_DISTRIBUTION="buster" -# Select parent distribution to use -LB_PARENT_DISTRIBUTION="" +# $LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION: select parent distribution for debian-installer to use +# (Default: buster) +LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="buster" -# Select distribution to use in the chroot -LB_DISTRIBUTION_CHROOT="bullseye" - -# Select parent distribution to use in the chroot -LB_PARENT_DISTRIBUTION_CHROOT="bullseye" - -# Select distribution to use in the final image -LB_DISTRIBUTION_BINARY="bullseye" - -# Select parent distribution to use in the final image -LB_PARENT_DISTRIBUTION_BINARY="bullseye" - -# Select parent distribution for debian-installer to use -LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="bullseye" - -# Select archive areas to use -LB_ARCHIVE_AREAS="main contrib non-free" - -# Select parent archive areas to use -LB_PARENT_ARCHIVE_AREAS="main contrib non-free" - -# Set parent mirror to bootstrap from +# $LB_PARENT_MIRROR_BOOTSTRAP: set parent mirror to bootstrap from +# (Default: http://deb.debian.org/debian/) LB_PARENT_MIRROR_BOOTSTRAP="http://deb.debian.org/debian/" -# Set parent mirror to fetch packages from +# $LB_PARENT_MIRROR_CHROOT: set parent mirror to fetch packages from +# (Default: http://deb.debian.org/debian/) LB_PARENT_MIRROR_CHROOT="http://deb.debian.org/debian/" -# Set security parent mirror to fetch packages from +# $LB_PARENT_MIRROR_CHROOT_SECURITY: set security parent mirror to fetch packages from +# (Default: http://security.debian.org/) LB_PARENT_MIRROR_CHROOT_SECURITY="http://security.debian.org/" -# Set parent mirror which ends up in the image +# $LB_PARENT_MIRROR_BINARY: set parent mirror which ends up in the image +# (Default: http://deb.debian.org/debian/) LB_PARENT_MIRROR_BINARY="http://deb.debian.org/debian/" -# Set security parent mirror which ends up in the image +# $LB_PARENT_MIRROR_BINARY_SECURITY: set security parent mirror which ends up in the image +# (Default: http://security.debian.org/) LB_PARENT_MIRROR_BINARY_SECURITY="http://security.debian.org/" -# Set debian-installer parent mirror +# $LB_PARENT_MIRROR_DEBIAN_INSTALLER: set debian-installer parent mirror +# (Default: http://deb.debian.org/debian/) LB_PARENT_MIRROR_DEBIAN_INSTALLER="http://deb.debian.org/debian/" -# Set mirror to bootstrap from +# $LB_MIRROR_BOOTSTRAP: set mirror to bootstrap from +# (Default: http://deb.debian.org/debian/) LB_MIRROR_BOOTSTRAP="http://deb.debian.org/debian/" -# Set mirror to fetch packages from +# $LB_MIRROR_CHROOT: set mirror to fetch packages from +# (Default: http://deb.debian.org/debian/) LB_MIRROR_CHROOT="http://deb.debian.org/debian/" -# Set security mirror to fetch packages from +# $LB_MIRROR_CHROOT_SECURITY: set security mirror to fetch packages from +# (Default: http://security.debian.org/) LB_MIRROR_CHROOT_SECURITY="http://security.debian.org/" -# Set mirror which ends up in the image +# $LB_MIRROR_BINARY: set mirror which ends up in the image +# (Default: http://deb.debian.org/debian/) LB_MIRROR_BINARY="http://deb.debian.org/debian/" -# Set security mirror which ends up in the image +# $LB_MIRROR_BINARY_SECURITY: set security mirror which ends up in the image +# (Default: http://security.debian.org/) LB_MIRROR_BINARY_SECURITY="http://security.debian.org/" -# Set debian-installer mirror +# $LB_MIRROR_DEBIAN_INSTALLER: set debian-installer mirror +# (Default: http://deb.debian.org/debian/) LB_MIRROR_DEBIAN_INSTALLER="http://deb.debian.org/debian/" -# Set architectures to use foreign bootstrap -LB_BOOTSTRAP_QEMU_ARCHITECTURE="" +# $LB_BOOTSTRAP_QEMU_ARCHITECTURES: architectures to use foreign bootstrap +# (Default: ) +LB_BOOTSTRAP_QEMU_ARCHITECTURES="" -# Set packages to exclude during foreign bootstrap +# $LB_BOOTSTRAP_QEMU_EXCLUDE: packages to exclude during foreign bootstrap +# (Default: ) LB_BOOTSTRAP_QEMU_EXCLUDE="" -# Set static qemu binary for foreign bootstrap +# $LB_BOOTSTRAP_QEMU_STATIC: static qemu binary for foreign bootstrap +# (Default: ) LB_BOOTSTRAP_QEMU_STATIC="" diff --git a/amd64/config/build b/amd64/config/build index db98262..7bbf6d7 100644 --- a/amd64/config/build +++ b/amd64/config/build @@ -1,7 +1,7 @@ [Image] Architecture: amd64 Archive-Areas: main contrib non-free -Distribution: bullseye +Distribution: buster Mirror-Bootstrap: http://deb.debian.org/debian/ [FIXME] diff --git a/amd64/config/chroot b/amd64/config/chroot index dafa75d..4bb1e96 100644 --- a/amd64/config/chroot +++ b/amd64/config/chroot @@ -1,34 +1,37 @@ # config/chroot - options for live-build(7), chroot stage -# Set chroot filesystem +# $LB_CHROOT_FILESYSTEM: set chroot filesystem +# (Default: squashfs) LB_CHROOT_FILESYSTEM="squashfs" -# Set chroot squashfs compression level -LB_CHROOT_SQUASHFS_COMPRESSION_LEVEL="" - -# Set chroot squashfs compression type -LB_CHROOT_SQUASHFS_COMPRESSION_TYPE="" - -# Set union filesystem +# $LB_UNION_FILESYSTEM: set union filesystem +# (Default: overlay) LB_UNION_FILESYSTEM="overlay" -# Set interactive build +# $LB_INTERACTIVE: set interactive build +# (Default: false) LB_INTERACTIVE="false" -# Set keyring packages +# $LB_KEYRING_PACKAGES: set keyring packages +# (Default: empty) LB_KEYRING_PACKAGES="debian-archive-keyring" -# Set kernel flavour to use (with arch) -LB_LINUX_FLAVOURS_WITH_ARCH="amd64" +# $LB_LINUX_FLAVOURS: set kernel flavour to use +# (Default: autodetected) +LB_LINUX_FLAVOURS="amd64" -# Set kernel packages to use +# $LB_LINUX_PACKAGES: set kernel packages to use +# (Default: autodetected) LB_LINUX_PACKAGES="linux-image" -# Enable security updates +# $LB_SECURITY: enable security updates +# (Default: true) LB_SECURITY="true" -# Enable updates updates +# $LB_UPDATES: enable updates updates +# (Default: true) LB_UPDATES="true" -# Enable backports updates +# $LB_BACKPORTS: enable backports updates +# (Default: false) LB_BACKPORTS="false" diff --git a/amd64/config/common b/amd64/config/common index d1f4071..12fef12 100644 --- a/amd64/config/common +++ b/amd64/config/common @@ -1,105 +1,119 @@ # config/common - common options for live-build(7) -# Version of live-build used to build config (config format version) -LB_CONFIGURATION_VERSION="20210216" - -# Set package manager +# $LB_APT: set package manager +# (Default: apt) LB_APT="apt" -# Set apt/aptitude ftp proxy +# $LB_APT_FTP_PROXY: set apt/aptitude ftp proxy +# (Default: autodetected or empty) LB_APT_FTP_PROXY="" -# Set apt/aptitude http proxy +# $LB_APT_HTTP_PROXY: set apt/aptitude http proxy +# (Default: autodetected or empty) LB_APT_HTTP_PROXY="" -# Set apt/aptitude pipeline depth +# $LB_APT_PIPELINE: set apt/aptitude pipeline depth +# (Default: ) LB_APT_PIPELINE="" -# Set apt/aptitude recommends +# $LB_APT_RECOMMENDS: set apt/aptitude recommends +# (Default: true) LB_APT_RECOMMENDS="true" -# Set apt/aptitude security +# $LB_APT_SECURE: set apt/aptitude security +# (Default: true) LB_APT_SECURE="true" -# Set apt/aptitude source entries in sources.list +# $LB_APT_SOURCE_ARCHIVES: set apt/aptitude source entries in sources.list +# (Default: true) LB_APT_SOURCE_ARCHIVES="true" -# Control cache +# $LB_CACHE: control cache +# (Default: true) LB_CACHE="true" -# Control if downloaded package indices should be cached +# $LB_CACHE_INDICES: control if downloaded package indices should be cached +# (Default: false) LB_CACHE_INDICES="false" -# Control if downloaded packages files should be cached +# $LB_CACHE_PACKAGES: control if downloaded packages files should be cached +# (Default: true) LB_CACHE_PACKAGES="true" -# Control if completed stages should be cached +# $LB_CACHE_STAGES: control if completed stages should be cached +# (Default: bootstrap) LB_CACHE_STAGES="bootstrap" -# Set debconf(1) frontend to use +# $LB_DEBCONF_FRONTEND: set debconf(1) frontend to use +# (Default: noninteractive) LB_DEBCONF_FRONTEND="noninteractive" -# Set debconf(1) priority to use +# $LB_DEBCONF_PRIORITY: set debconf(1) priority to use +# (Default: critical) LB_DEBCONF_PRIORITY="critical" -# Set initramfs hook +# $LB_INITRAMFS: set initramfs hook +# (Default: live-boot) LB_INITRAMFS="live-boot" -# Set initramfs compression +# $LB_INITRAMFS_COMPRESSION: set initramfs compression +# (Default: gzip) LB_INITRAMFS_COMPRESSION="gzip" -# Set init system +# $LB_INITSYSTEM: set init system +# (Default: systemd) LB_INITSYSTEM="systemd" -# Set distribution mode -LB_MODE="debian" - -# Set system type -LB_SYSTEM="live" - -# Set base name of the image -LB_IMAGE_NAME="live-image" - -# Set options to use with apt -APT_OPTIONS="--yes -o Acquire::Retries=5" +# $LB_FDISK: set fdisk program +# (Default: autodetected) +LB_FDISK="fdisk" -# Set options to use with aptitude -APTITUDE_OPTIONS="--assume-yes -o Acquire::Retries=5" - -# Set options to use with debootstrap -DEBOOTSTRAP_OPTIONS="--include=apt-transport-https,ca-certificates" +# $LB_LOSETUP: set losetup program +# (Default: autodetected) +LB_LOSETUP="losetup" -# Set script to use with debootstrap -DEBOOTSTRAP_SCRIPT="" +# $LB_MODE: set distribution mode +# (Default: debian) +LB_MODE="debian" -# Set options to use with gzip -GZIP_OPTIONS="-6 --rsyncable" +# $LB_SYSTEM: set system type +# (Default: live) +LB_SYSTEM="live" -# Enable UTC timestamps -LB_UTC_TIME="false" +# $LB_TASKSEL: set tasksel program +# (Default: apt) +LB_TASKSEL="apt" # live-build options -# Enable breakpoints -# If set here, overrides the command line option +# $_BREAKPOINTS: enable breakpoints +# (Default: false) #_BREAKPOINTS="false" -# Enable debug -# If set here, overrides the command line option +# $_DEBUG: enable debug +# (Default: false) #_DEBUG="false" -# Enable color -# If set here, overrides the command line option -#_COLOR="auto" +# $_COLOR: enable color +# (Default: false) +#_COLOR="false" -# Enable force -# If set here, overrides the command line option +# $_FORCE: enable force +# (Default: false) #_FORCE="false" -# Enable quiet -# If set here, overrides the command line option -#_QUIET="false" +# $_QUIET: enable quiet +# (Default: false) +_QUIET="false" -# Enable verbose -# If set here, overrides the command line option +# $_VERBOSE: enable verbose +# (Default: false) #_VERBOSE="false" + +# Internal stuff (FIXME) +APT_OPTIONS="--yes" +APTITUDE_OPTIONS="--assume-yes" +DEBOOTSTRAP_OPTIONS="--include=apt-transport-https,ca-certificates" +DEBOOTSTRAP_SCRIPT="" +GZIP_OPTIONS="-6 --rsyncable" +ISOHYBRID_OPTIONS="" diff --git a/amd64/config/hooks/live/0600-rm-evince.hook.chroot b/amd64/config/hooks/live/0600-rm-evince.hook.chroot deleted file mode 100755 index bccb74c..0000000 --- a/amd64/config/hooks/live/0600-rm-evince.hook.chroot +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -set -e - -# No way to ignore the recommends on a recommend :( - -apt-get purge -y evince diff --git a/amd64/config/hooks/normal/0500-reproducible-glibc.hook.chroot b/amd64/config/hooks/normal/0500-reproducible-glibc.hook.chroot deleted file mode 120000 index 9d4f095..0000000 --- a/amd64/config/hooks/normal/0500-reproducible-glibc.hook.chroot +++ /dev/null @@ -1 +0,0 @@ -/usr/share/live/build/hooks/normal/0500-reproducible-glibc.hook.chroot \ No newline at end of file diff --git a/amd64/config/hooks/normal/0600-rm-evince.hook.chroot b/amd64/config/hooks/normal/0600-rm-evince.hook.chroot deleted file mode 100755 index bccb74c..0000000 --- a/amd64/config/hooks/normal/0600-rm-evince.hook.chroot +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -set -e - -# No way to ignore the recommends on a recommend :( - -apt-get purge -y evince diff --git a/amd64/config/includes/etc/lightdm/lightdm-gtk-greeter.conf b/amd64/config/includes.binary/etc/lightdm/lightdm-gtk-greeter.conf similarity index 100% rename from amd64/config/includes/etc/lightdm/lightdm-gtk-greeter.conf rename to amd64/config/includes.binary/etc/lightdm/lightdm-gtk-greeter.conf diff --git a/i386/config/includes/etc/lightdm/lightdm-gtk-greeter.conf b/amd64/config/includes.chroot/etc/lightdm/lightdm-gtk-greeter.conf similarity index 100% rename from i386/config/includes/etc/lightdm/lightdm-gtk-greeter.conf rename to amd64/config/includes.chroot/etc/lightdm/lightdm-gtk-greeter.conf diff --git a/amd64/config/package-lists/live.list.chroot b/amd64/config/package-lists/live.list.chroot index d5b62d6..5da90ab 100644 --- a/amd64/config/package-lists/live.list.chroot +++ b/amd64/config/package-lists/live.list.chroot @@ -4,6 +4,3 @@ live-config-systemd sudo apt-transport-https -psmisc -xfce4-settings -cryptsetup diff --git a/amd64/config/source b/amd64/config/source index f8c29a1..93a022a 100644 --- a/amd64/config/source +++ b/amd64/config/source @@ -1,7 +1,9 @@ # config/source - options for live-build(7), source stage -# Set source option +# $LB_SOURCE: set source option +# (Default: false) LB_SOURCE="false" -# Set image type +# $LB_SOURCE_IMAGES: set image type +# (Default: tar) LB_SOURCE_IMAGES="tar" diff --git a/i386/config/archives/cbpp.list.binary b/i386/config/archives/cbpp.list.binary index 6ba18ec..27aa52e 100644 --- a/i386/config/archives/cbpp.list.binary +++ b/i386/config/archives/cbpp.list.binary @@ -1 +1 @@ -deb https://packages.crunchbangplusplus.org/bullseye bullseye main +deb https://packages.crunchbangplusplus.org/buster buster main diff --git a/i386/config/archives/cbpp.list.chroot b/i386/config/archives/cbpp.list.chroot index 6ba18ec..27aa52e 100644 --- a/i386/config/archives/cbpp.list.chroot +++ b/i386/config/archives/cbpp.list.chroot @@ -1 +1 @@ -deb https://packages.crunchbangplusplus.org/bullseye bullseye main +deb https://packages.crunchbangplusplus.org/buster buster main diff --git a/i386/config/archives/cbpp10.key b/i386/config/archives/cbpp10.key new file mode 100644 index 0000000..637b505 --- /dev/null +++ b/i386/config/archives/cbpp10.key @@ -0,0 +1,41 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +=Lk3k +-----END PGP PUBLIC KEY BLOCK----- diff --git a/i386/config/archives/cbpp11.key b/i386/config/archives/cbpp11.key deleted file mode 100644 index b76611d..0000000 --- a/i386/config/archives/cbpp11.key +++ /dev/null @@ -1,41 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -mQGNBGCCCnUBDAC+Qb9u3VIYYcyBjZ5yGxE/4Nnlx8EGyZMiKm4xfMePEuT7aylz -66ekBEwLX+sS08BswapYOQ7Npkq73ihyghK1CYzc8XpJ4fZQJgfrVoqFYMLLfJHn -KCMxsCziM3HGBV4uap1kc4ax7rQ6jZtR3E3tYIlAvoY97O2QMrCviGnUOpcWI5Fd -7jc6NTZizNCmUVdNqXLRR2Viin2w81YNaUT5XzLxAldGujNLV2qLONI95uETa1xL -8KgRGhFVqAEpq2oH6Pz082h2FMyW2gDljUAaMzH1C+KTQ242b8zl+GSodP5mRSSG -mdHZC8Ht4ouwii9FDiyNjqghX/cVITw1Y+pw+e/7vBzgo8NP3RSv3TEwekUJLWuR -/UB4bACbVIoeDs/L9hPUoAIBU3z6BUodhs91FwboJWzCSghZH3aVOKPfTzXzhfIZ -BVOfoPHfkgnDWWIfV7kITzPJM9ZqZ0QAkNhViuK+t+mBFVb4ekqeJyOEA1zi2hrz -3P6p+EMJVUkuVTkAEQEAAbQwQmVuIFlvdW5nIDxjb21wdXRlcm1vdXRoQGNydW5j -aGJhbmdwbHVzcGx1cy5vcmc+iQHUBBMBCgA+FiEEMkcQzAD8UridI+P66TqJtvMo -3HIFAmCCCnUCGwMFCQPCZwAFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AACgkQ6TqJ -tvMo3HK9Ogv+M3gNyTVR3POM/3OS+ZShV05BOLSrJdW3EHV8gPpL57KIgXOXSZR8 -IfABHihjlgfNgqxepnXM+3nPOtkQK+SvZIfpxpzdt7fXNMFu4/yTUoNbJnE724qY -mmrFe5bEzmZsRscne1JXYNyCRXTafrYzce+jLiBZtrSwtmX7KZAgdaKBiEaAWdnN -G2jqyaBbqfrPDYCCTsu3Nu/xfh0FugY5q6i6+8b+D9IAFu2jTVi91amKuKvupvCt -cIboz9BOmsvxoZHd5eGi24zIv0oH1MupnFWrLxY7nho3z+8ZKKnqCSIHV+IGXAqt -fem0pfOKzcslhdEudFSZ87hSWGWGSRiElHvLRfLptbM4cP0t9HCUJM9fTk3lkYJC -M7Xnj9oRjgAek8xmhj9jO2Fxip/hWUUPsZh2rBGOnhbmVQVm8Xt8OUAzVRukhJ+C -nhzg1aSRbXBOc2t+10DCTyx/CK0uoObDe6C0nBkXIzKW1GI+cEeS0nXyleOeVzOP -TCDVo/godLV1uQGNBGCCCnUBDACwxkbYjKaViV/cZTCoPKgNfqMSTyXzm6inxORK -q13GFmhAwYak/Z6d0Vg37QpFgTHS/nRunlFvuf3TTYpHYNyB5FJzqT6SkCll4A3L -YzvrQ8FcMn+0X76Oh1zmpbvweIlz03EoGNrqsesX378Gb+7v+ykTs4PFDIdubTkp -0LJBlm6v4zi3ScMz0CNs9oqKOXtGIbb9IVsoSASDcfvCrHuY4OHuJOm2pfza8ltg -GrrVbdIOBg2+k2nyX4TpdQz0bwHvSJ5GrDPHv0WsGu0GO047u5DI4XdEfBu64n4O -xoLVmEbWBIwqDw7lgh5uKqzufr1txue+eohRP9iVpLKy70oRUAT4iKBkiDQzrUlX -fp8rg5K4g8TZLWxMlMUXimDeiYjbtBIxuBos9cEbNU9vNsI0H9+41Clzq8VvcX+T -dmpLcpTWjE+QU/Rv+WE3/papmwkKcoT/iP0+t05YRnNWb3k78qL3CR9WnE2+D2oB -fHRYZg0ddg+QdTuyrEgyUbGpYzMAEQEAAYkBvAQYAQoAJhYhBDJHEMwA/FK4nSPj -+uk6ibbzKNxyBQJgggp1AhsMBQkDwmcAAAoJEOk6ibbzKNxy5NML/1hgaHuqff4z -c1N0QO/8msJMv8vd4JFg/x8sQPzjlcfDvFsVW3FY0yfyO9Xu4etWFFY2/GGSkj37 -zDTMnd8nbvFsxQ946/x5zYgCWXzC58UYYHsvbN87eMamw0JiBWShCYVDV3vcRB4Y -HBDMxZOF23x4cDmtw5/9sG2TT16sK044yZXvOGFiWKM5UV5o9O2601d4ZayN/Cb2 -XZ4Qj0mtsPD50GcXF3jFRgQ+fJNbVyxymV/MUb8KVfLNjlaVa06kdY8nwi+NSHMl -A1beSuyQV70FLKIsOU3z7Lz2LdkBYNbb2YCYJQR2gclDmkMrEeantnZ56zQwshFq -3d5R9HX/97Az/IVKDnXZr/iCQUPavKTluzUCSS2jvP+5iCqBTWVxBEpiZrKe9Vdc -GdiX1ZzICudmqA7e0pVKgA6RXHPrPMSg+g1lluuHVPS/X/QI4PrEJUuESktTyrXm -kwjyv3D9N6xkSPAf/aITsaFi+6HNoiWYYDdoMDaprLPYonpEYb0cNw== -=se6L ------END PGP PUBLIC KEY BLOCK----- diff --git a/i386/config/binary b/i386/config/binary index c68b975..34870bc 100644 --- a/i386/config/binary +++ b/i386/config/binary @@ -1,107 +1,170 @@ # config/binary - options for live-build(7), binary stage -# Set image type -LB_IMAGE_TYPE="iso-hybrid" - -# Set image filesystem +# $LB_BINARY_FILESYSTEM: set image filesystem +# (Default: fat32) LB_BINARY_FILESYSTEM="fat32" -# Set apt/aptitude generic indices +# $LB_APT_INDICES: set apt/aptitude generic indices +# (Default: true) LB_APT_INDICES="true" -# Set boot parameters +# $LB_BOOTAPPEND_LIVE: set boot parameters +# (Default: empty) LB_BOOTAPPEND_LIVE="boot=live components quiet splash username=live" -# Set boot parameters +# $LB_BOOTAPPEND_INSTALL: set boot parameters +# (Default: empty) LB_BOOTAPPEND_INSTALL="" -# Set boot parameters -LB_BOOTAPPEND_LIVE_FAILSAFE="boot=live components memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=788" - -# Set BIOS bootloader -LB_BOOTLOADER_BIOS="syslinux" +# $LB_BOOTAPPEND_LIVE_FAILSAFE: set boot parameters +# (Default: empty) +LB_BOOTAPPEND_LIVE_FAILSAFE="boot=live components memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal" -# Set EFI bootloader -LB_BOOTLOADER_EFI="grub-efi" +# $LB_BOOTLOADERS: set bootloaders +# (Default: syslinux,grub-efi) +LB_BOOTLOADERS="syslinux,grub-efi" -# Set checksums -LB_CHECKSUMS="sha256" +# $LB_CHECKSUMS: set checksums +# (Default: md5) +LB_CHECKSUMS="md5" -# Set compression +# $LB_COMPRESSION: set compression +# (Default: none) LB_COMPRESSION="none" -# Set zsync +# $LB_ZSYNC: set zsync +# (Default: true) LB_ZSYNC="true" -# Control if we build binary images chrooted -# NEVER, *EVER*, *E*V*E*R* SET THIS OPTION to false. +# ${LB_BUILD_WITH_CHROOT: control if we build binary images chrooted +# (Default: true) +# DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to false. LB_BUILD_WITH_CHROOT="true" -# Set debian-installer +# $LB_DEBIAN_INSTALLER: set debian-installer +# (Default: live) LB_DEBIAN_INSTALLER="live" -# Set debian-installer suite -LB_DEBIAN_INSTALLER_DISTRIBUTION="bullseye" +# $LB_DEBIAN_INSTALLER_DISTRIBUTION: set debian-installer suite +# (Default: empty) +LB_DEBIAN_INSTALLER_DISTRIBUTION="buster" -# Set debian-installer preseed filename/url +# $LB_DEBIAN_INSTALLER_PRESEEDFILE: set debian-installer preseed filename/url +# (Default: ) LB_DEBIAN_INSTALLER_PRESEEDFILE="" -# Toggle use of GUI debian-installer +# $LB_DEBIAN_INSTALLER_GUI: toggle use of GUI debian-installer +# (Default: true) LB_DEBIAN_INSTALLER_GUI="true" -# Set hdd label +# $LB_GRUB_SPLASH: set custom grub splash +# (Default: empty) +LB_GRUB_SPLASH="" + +# $LB_HDD_LABEL: set hdd label +# (Default: DEBIAN_LIVE) LB_HDD_LABEL="DEBIAN_LIVE" -# Set hdd filesystem size +# $LB_HDD_SIZE: set hdd filesystem size +# (Default: auto) LB_HDD_SIZE="auto" -# Set start of partition for the hdd target for BIOSes that expect a specific boot partition start (e.g. "63s"). If empty, use optimal layout. +# $LB_HDD_PARTITION_START: set start of partition for the hdd target for BIOSes that expect a specific boot partition start (e.g. "63s"). If empty, use optimal layout. +# (Default: ) LB_HDD_PARTITION_START="" -# Set iso author +# $LB_ISO_APPLICATION: set iso author +# (Default: Debian Live) LB_ISO_APPLICATION="Debian Live" -# Set iso preparer -LB_ISO_PREPARER="live-build @LB_VERSION@; https://salsa.debian.org/live-team/live-build" +# $LB_ISO_PREPARER: set iso preparer +# (Default: live-build $VERSION; https://debian-live.alioth.debian.org/live-build) +LB_ISO_PREPARER="live-build $VERSION; https://debian-live.alioth.debian.org/live-build" -# Set iso publisher -LB_ISO_PUBLISHER="Debian Live project; https://wiki.debian.org/DebianLive; debian-live@lists.debian.org" +# $LB_ISO_PUBLISHER: set iso publisher +# (Default: Live Systems project; https://debian-live.alioth.debian.org/; debian-live@lists.debian.org) +LB_ISO_PUBLISHER="Live Systems project; https://debian-live.alioth.debian.org/; debian-live@lists.debian.org" -# Set iso volume (max 32 chars) -LB_ISO_VOLUME="cbpp-11-$(date +%Y%m%d-%H:%M)" +# $LB_ISO_VOLUME: set iso volume (max 32 chars) +# (Default: Debian buster $(date +%Y%m%d-%H:%M)) +LB_ISO_VOLUME="cbpp-10-$(date +%Y%m%d-%H:%M)" -# Set jffs2 eraseblock size +# $LB_JFFS2_ERASEBLOCK: set jffs2 eraseblock size +# (Default: unset) LB_JFFS2_ERASEBLOCK="" -# Set memtest +# $LB_MEMTEST: set memtest +# (Default: none) LB_MEMTEST="none" -# Set loadlin +# $LB_LOADLIN: set loadlin +# (Default: false) LB_LOADLIN="false" -# Set win32-loader +# $LB_WIN32_LOADER: set win32-loader +# (Default: false) LB_WIN32_LOADER="false" -# Set net tarball +# $LB_NET_ROOT_FILESYSTEM: set netboot filesystem +# (Default: nfs) +LB_NET_ROOT_FILESYSTEM="nfs" + +# $LB_NET_ROOT_MOUNTOPTIONS: set nfsopts +# (Default: empty) +LB_NET_ROOT_MOUNTOPTIONS="" + +# $LB_NET_ROOT_PATH: set netboot server directory +# (Default: /srv/debian-live) +LB_NET_ROOT_PATH="/srv/debian-live" + +# $LB_NET_ROOT_SERVER: set netboot server address +# (Default: 192.168.1.1) +LB_NET_ROOT_SERVER="192.168.1.1" + +# $LB_NET_COW_FILESYSTEM: set net client cow filesystem +# (Default: nfs) +LB_NET_COW_FILESYSTEM="nfs" + +# $LB_NET_COW_MOUNTOPTIONS: set cow mount options +# (Default: empty) +LB_NET_COW_MOUNTOPTIONS="" + +# $LB_NET_COW_PATH: set cow directory +# (Default: ) +LB_NET_COW_PATH="" + +# $LB_NET_COW_SERVER: set cow server +# (Default: ) +LB_NET_COW_SERVER="" + +# $LB_NET_TARBALL: set net tarball +# (Default: true) LB_NET_TARBALL="true" -# Set onie +# $LB_ONIE: set onie +# (Default: false) LB_ONIE="false" -# Set onie additional kernel cmdline options +# $LB_ONIE_KERNEL_CMDLINE: set onie additional kernel cmdline options +# (Default: ) LB_ONIE_KERNEL_CMDLINE="" -# Set inclusion of firmware packages in debian-installer +# $LB_FIRMWARE_BINARY: include firmware packages in debian-installer +# (Default: true) LB_FIRMWARE_BINARY="true" -# Set inclusion of firmware packages in the live image +# $LB_FIRMWARE_CHROOT: include firmware packages in debian-installer +# (Default: true) LB_FIRMWARE_CHROOT="true" -# Set swap file path +# $LB_SWAP_FILE_PATH: set swap file path +# (Default: ) LB_SWAP_FILE_PATH="" -# Set swap file size +# $LB_SWAP_FILE_SIZE: set swap file size +# (Default: 512) LB_SWAP_FILE_SIZE="512" -# Enable/disable UEFI secure boot support +# $LB_UEFI_SECURE_BOOT: enable/disable UEFI secure boot +# (Default: auto) LB_UEFI_SECURE_BOOT="auto" diff --git a/i386/config/bootloaders/extlinux/advanced.cfg b/i386/config/bootloaders/extlinux/advanced.cfg deleted file mode 100644 index 373451a..0000000 --- a/i386/config/bootloaders/extlinux/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/i386/config/bootloaders/extlinux/extlinux.conf b/i386/config/bootloaders/extlinux/extlinux.conf deleted file mode 100644 index a3e3eab..0000000 --- a/i386/config/bootloaders/extlinux/extlinux.conf +++ /dev/null @@ -1,4 +0,0 @@ -include menu.cfg -default vesamenu.c32 -prompt 0 -timeout 0 diff --git a/i386/config/bootloaders/extlinux/hdt.c32 b/i386/config/bootloaders/extlinux/hdt.c32 deleted file mode 120000 index f84c641..0000000 --- a/i386/config/bootloaders/extlinux/hdt.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/hdt.c32 \ No newline at end of file diff --git a/i386/config/bootloaders/extlinux/install.cfg b/i386/config/bootloaders/extlinux/install.cfg deleted file mode 100644 index ba09752..0000000 --- a/i386/config/bootloaders/extlinux/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/i386/config/bootloaders/extlinux/ldlinux.c32 b/i386/config/bootloaders/extlinux/ldlinux.c32 deleted file mode 120000 index df554c7..0000000 --- a/i386/config/bootloaders/extlinux/ldlinux.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/ldlinux.c32 \ No newline at end of file diff --git a/i386/config/bootloaders/extlinux/libcom32.c32 b/i386/config/bootloaders/extlinux/libcom32.c32 deleted file mode 120000 index 44ab36b..0000000 --- a/i386/config/bootloaders/extlinux/libcom32.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/libcom32.c32 \ No newline at end of file diff --git a/i386/config/bootloaders/extlinux/libgpl.c32 b/i386/config/bootloaders/extlinux/libgpl.c32 deleted file mode 120000 index 81c83fb..0000000 --- a/i386/config/bootloaders/extlinux/libgpl.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/libgpl.c32 \ No newline at end of file diff --git a/i386/config/bootloaders/extlinux/libmenu.c32 b/i386/config/bootloaders/extlinux/libmenu.c32 deleted file mode 120000 index 2491ff9..0000000 --- a/i386/config/bootloaders/extlinux/libmenu.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/libmenu.c32 \ No newline at end of file diff --git a/i386/config/bootloaders/extlinux/libutil.c32 b/i386/config/bootloaders/extlinux/libutil.c32 deleted file mode 120000 index 478194e..0000000 --- a/i386/config/bootloaders/extlinux/libutil.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/libutil.c32 \ No newline at end of file diff --git a/i386/config/bootloaders/extlinux/live.cfg.in b/i386/config/bootloaders/extlinux/live.cfg.in deleted file mode 100644 index 97ceb92..0000000 --- a/i386/config/bootloaders/extlinux/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/i386/config/bootloaders/extlinux/menu.cfg b/i386/config/bootloaders/extlinux/menu.cfg deleted file mode 100644 index 9368260..0000000 --- a/i386/config/bootloaders/extlinux/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/i386/config/bootloaders/extlinux/splash.svg b/i386/config/bootloaders/extlinux/splash.svg deleted file mode 100644 index e684e60..0000000 --- a/i386/config/bootloaders/extlinux/splash.svg +++ /dev/null @@ -1,225 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - Crunchbang Plus Plus@PROJECT@ 11 (@DISTRIBUTION@) Version: 11-beta3 @ARCHITECTURE@Build: @YEAR@-@MONTH@-@DAY@ @HOUR@:@MINUTE@:@SECOND@Kernel: @LINUX_VERSIONS@  -   - - - diff --git a/i386/config/bootloaders/extlinux/stdmenu.cfg b/i386/config/bootloaders/extlinux/stdmenu.cfg deleted file mode 100644 index 671b16f..0000000 --- a/i386/config/bootloaders/extlinux/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/i386/config/bootloaders/extlinux/vesamenu.c32 b/i386/config/bootloaders/extlinux/vesamenu.c32 deleted file mode 120000 index 84e2eff..0000000 --- a/i386/config/bootloaders/extlinux/vesamenu.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/vesamenu.c32 \ No newline at end of file diff --git a/i386/config/bootloaders/grub-legacy/menu.lst b/i386/config/bootloaders/grub-legacy/menu.lst deleted file mode 100644 index 3b866e5..0000000 --- a/i386/config/bootloaders/grub-legacy/menu.lst +++ /dev/null @@ -1,9 +0,0 @@ -default 0 -color cyan/blue white/blue -splashimage /boot/grub/splash.xpm.gz - -LINUX_LIVE - -LINUX_INSTALL - -MEMTEST diff --git a/i386/config/bootloaders/grub-legacy/splash.xpm.gz b/i386/config/bootloaders/grub-legacy/splash.xpm.gz deleted file mode 100644 index 6c1bf9a..0000000 Binary files a/i386/config/bootloaders/grub-legacy/splash.xpm.gz and /dev/null differ diff --git a/i386/config/bootloaders/grub-pc/dejavu-bold-14.pf2 b/i386/config/bootloaders/grub-pc/dejavu-bold-14.pf2 deleted file mode 100644 index 9b093b2..0000000 Binary files a/i386/config/bootloaders/grub-pc/dejavu-bold-14.pf2 and /dev/null differ diff --git a/i386/config/bootloaders/grub-pc/dejavu-bold-16.pf2 b/i386/config/bootloaders/grub-pc/dejavu-bold-16.pf2 deleted file mode 100644 index 11e7f7a..0000000 Binary files a/i386/config/bootloaders/grub-pc/dejavu-bold-16.pf2 and /dev/null differ diff --git a/i386/config/bootloaders/grub-pc/grub.cfg b/i386/config/bootloaders/grub-pc/grub.cfg deleted file mode 100644 index a809375..0000000 --- a/i386/config/bootloaders/grub-pc/grub.cfg +++ /dev/null @@ -1,58 +0,0 @@ -set default=0 - -loadfont $prefix/dejavu-bold-16.pf2 -loadfont $prefix/dejavu-bold-14.pf2 -loadfont $prefix/unicode.pf2 -set gfxmode=auto -insmod all_video -insmod gfxterm -insmod png - -set color_normal=light-gray/black -set color_highlight=white/black - -if [ -e /isolinux/splash.png ]; then - # binary_syslinux modifies the theme file to point to the correct - # background picture - set theme=/boot/grub/live-theme/theme.txt -elif [ -e /boot/grub/splash.png ]; then - set theme=/boot/grub/live-theme/theme.txt -else - set menu_color_normal=cyan/blue - set menu_color_highlight=white/blue -fi - -terminal_output gfxterm - -insmod play -play 960 440 1 0 4 440 1 - -# Live boot -LINUX_LIVE - -# You can add more entries like this -# menuentry "Alternate live boot" { -# linux KERNEL_LIVE APPEND_LIVE custom options here -# initrd INITRD_LIVE -# } -# menuentry "Alternate graphical installer" { -# linux KERNEL_GI APPEND_GI custom options here -# initrd INITRD_GI -# } -# menuentry "Alternate textual installer" { -# linux KERNEL_DI APPEND_DI custom options here -# initrd INITRD_DI -# } - -# Installer (if any) -LINUX_INSTALL - -submenu 'Advanced options...' { - -# More installer entries (if any) -LINUX_ADVANCED_INSTALL - -# Memtest (if any) -MEMTEST - -} diff --git a/i386/config/bootloaders/grub-pc/live-theme/theme.txt b/i386/config/bootloaders/grub-pc/live-theme/theme.txt deleted file mode 100644 index 033b279..0000000 --- a/i386/config/bootloaders/grub-pc/live-theme/theme.txt +++ /dev/null @@ -1,52 +0,0 @@ -desktop-image: "../splash.png" -title-color: "#ffffff" -title-font: "DejaVu Sans Bold 16" -title-text: "Live Boot Menu with GRUB" -#title-text: "Crunchbang Plus Plus -- @PROJECT@ 11 (@DISTRIBUTION@) @ARCHITECTURE@" -message-font: "Unifont Regular 16" -terminal-font: "Unifont Regular 16" - -#help bar at the bottom -+ label { - top = 100%-50 - left = 0 - width = 100% - height = 20 - text = "@KEYMAP_SHORT@" - align = "center" - color = "#ffffff" - font = "DejaVu Sans Bold 14" -} - -#boot menu -+ boot_menu { - left = 10% - width = 80% - top = 52% - height = 48%-80 - item_color = "#a8a8a8" - item_font = "DejaVu Sans Bold 14" - selected_item_color= "#ffffff" - selected_item_font = "DejaVu Sans Bold 14" - item_height = 16 - item_padding = 0 - item_spacing = 4 - icon_width = 0 - icon_heigh = 0 - item_icon_space = 0 -} - -#progress bar -+ progress_bar { - id = "__timeout__" - left = 15% - top = 100%-80 - height = 16 - width = 70% - font = "DejaVu Sans Regular 14" - text_color = "#000000" - fg_color = "#ffffff" - bg_color = "#a8a8a8" - border_color = "#ffffff" - text = "@TIMEOUT_NOTIFICATION_LONG@" -} diff --git a/i386/config/bootloaders/grub-pc/splash.png b/i386/config/bootloaders/grub-pc/splash.png deleted file mode 100644 index fdb7699..0000000 Binary files a/i386/config/bootloaders/grub-pc/splash.png and /dev/null differ diff --git a/i386/config/bootloaders/grub-pc/splash.svg b/i386/config/bootloaders/grub-pc/splash.svg deleted file mode 100644 index e684e60..0000000 --- a/i386/config/bootloaders/grub-pc/splash.svg +++ /dev/null @@ -1,225 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - Crunchbang Plus Plus@PROJECT@ 11 (@DISTRIBUTION@) Version: 11-beta3 @ARCHITECTURE@Build: @YEAR@-@MONTH@-@DAY@ @HOUR@:@MINUTE@:@SECOND@Kernel: @LINUX_VERSIONS@  -   - - - diff --git a/i386/config/bootloaders/isolinux/splash.svg b/i386/config/bootloaders/isolinux/splash.svg index e684e60..3d2a1a9 100644 --- a/i386/config/bootloaders/isolinux/splash.svg +++ b/i386/config/bootloaders/isolinux/splash.svg @@ -14,7 +14,7 @@ height="480" id="svg3320" version="1.1" - inkscape:version="0.92.4 (5da689c313, 2019-01-14)" + inkscape:version="0.48.5 r10040" sodipodi:docname="splash.svg"> @@ -81,17 +81,17 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="2.8284271" - inkscape:cx="320" - inkscape:cy="409.70563" + inkscape:zoom="1.4142136" + inkscape:cx="171.19441" + inkscape:cy="232.36355" inkscape:document-units="px" - inkscape:current-layer="layer1" + inkscape:current-layer="layer2" showgrid="false" - inkscape:window-width="1702" - inkscape:window-height="1145" - inkscape:window-x="1296" - inkscape:window-y="389" - inkscape:window-maximized="0" /> + inkscape:window-width="1920" + inkscape:window-height="1032" + inkscape:window-x="1080" + inkscape:window-y="449" + inkscape:window-maximized="1" /> @@ -105,121 +105,138 @@ + id="layer1" + transform="translate(0,-572.3622)"> + x="0" + y="572.36218" /> + + inkscape:label="cb" + style="display:none"> + #! ++ + + x="12.585796" + y="16.292892" /> + + id="layer2" + inkscape:label="lb-text"> Crunchbang Plus Plus@PROJECT@ 11 (@DISTRIBUTION@) Crunchbang Plus PlusVersion: 11-beta3 @ARCHITECTURE@@PROJECT@ @VERSION@ (@DISTRIBUTION@)Build: @YEAR@-@MONTH@-@DAY@ @HOUR@:@MINUTE@:@SECOND@Kernel: @LINUX_VERSIONS@Version: 1.1 @ARCHITECTURE@   - Build Date: @YEAR@-@MONTH@-@DAY@  - + style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans Bold" + id="tspan3066">Kernel: @LINUX_VERSIONS@ diff --git a/i386/config/bootloaders/pxelinux/advanced.cfg b/i386/config/bootloaders/pxelinux/advanced.cfg deleted file mode 100644 index 373451a..0000000 --- a/i386/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/i386/config/bootloaders/pxelinux/hdt.c32 b/i386/config/bootloaders/pxelinux/hdt.c32 deleted file mode 120000 index f84c641..0000000 --- a/i386/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/i386/config/bootloaders/pxelinux/install.cfg b/i386/config/bootloaders/pxelinux/install.cfg deleted file mode 100644 index ba09752..0000000 --- a/i386/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/i386/config/bootloaders/pxelinux/ldlinux.c32 b/i386/config/bootloaders/pxelinux/ldlinux.c32 deleted file mode 120000 index df554c7..0000000 --- a/i386/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/i386/config/bootloaders/pxelinux/libcom32.c32 b/i386/config/bootloaders/pxelinux/libcom32.c32 deleted file mode 120000 index 44ab36b..0000000 --- a/i386/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/i386/config/bootloaders/pxelinux/libgpl.c32 b/i386/config/bootloaders/pxelinux/libgpl.c32 deleted file mode 120000 index 81c83fb..0000000 --- a/i386/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/i386/config/bootloaders/pxelinux/libmenu.c32 b/i386/config/bootloaders/pxelinux/libmenu.c32 deleted file mode 120000 index 2491ff9..0000000 --- a/i386/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/i386/config/bootloaders/pxelinux/libutil.c32 b/i386/config/bootloaders/pxelinux/libutil.c32 deleted file mode 120000 index 478194e..0000000 --- a/i386/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/i386/config/bootloaders/pxelinux/live.cfg.in b/i386/config/bootloaders/pxelinux/live.cfg.in deleted file mode 100644 index 97ceb92..0000000 --- a/i386/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/i386/config/bootloaders/pxelinux/menu.cfg b/i386/config/bootloaders/pxelinux/menu.cfg deleted file mode 100644 index 9368260..0000000 --- a/i386/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/i386/config/bootloaders/pxelinux/pxelinux.0 b/i386/config/bootloaders/pxelinux/pxelinux.0 deleted file mode 120000 index f723d02..0000000 --- a/i386/config/bootloaders/pxelinux/pxelinux.0 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/PXELINUX/pxelinux.0 \ No newline at end of file diff --git a/i386/config/bootloaders/pxelinux/pxelinux.cfg/default b/i386/config/bootloaders/pxelinux/pxelinux.cfg/default deleted file mode 100644 index a3e3eab..0000000 --- a/i386/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/i386/config/bootloaders/pxelinux/splash.svg b/i386/config/bootloaders/pxelinux/splash.svg deleted file mode 100644 index e684e60..0000000 --- a/i386/config/bootloaders/pxelinux/splash.svg +++ /dev/null @@ -1,225 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - Crunchbang Plus Plus@PROJECT@ 11 (@DISTRIBUTION@) Version: 11-beta3 @ARCHITECTURE@Build: @YEAR@-@MONTH@-@DAY@ @HOUR@:@MINUTE@:@SECOND@Kernel: @LINUX_VERSIONS@  -   - - - diff --git a/i386/config/bootloaders/pxelinux/stdmenu.cfg b/i386/config/bootloaders/pxelinux/stdmenu.cfg deleted file mode 100644 index 671b16f..0000000 --- a/i386/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/i386/config/bootloaders/pxelinux/vesamenu.c32 b/i386/config/bootloaders/pxelinux/vesamenu.c32 deleted file mode 120000 index 84e2eff..0000000 --- a/i386/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/i386/config/bootloaders/syslinux/advanced.cfg b/i386/config/bootloaders/syslinux/advanced.cfg deleted file mode 100644 index 373451a..0000000 --- a/i386/config/bootloaders/syslinux/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/i386/config/bootloaders/syslinux/hdt.c32 b/i386/config/bootloaders/syslinux/hdt.c32 deleted file mode 120000 index f84c641..0000000 --- a/i386/config/bootloaders/syslinux/hdt.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/hdt.c32 \ No newline at end of file diff --git a/i386/config/bootloaders/syslinux/install.cfg b/i386/config/bootloaders/syslinux/install.cfg deleted file mode 100644 index ba09752..0000000 --- a/i386/config/bootloaders/syslinux/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/i386/config/bootloaders/syslinux/ldlinux.c32 b/i386/config/bootloaders/syslinux/ldlinux.c32 deleted file mode 120000 index df554c7..0000000 --- a/i386/config/bootloaders/syslinux/ldlinux.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/ldlinux.c32 \ No newline at end of file diff --git a/i386/config/bootloaders/syslinux/libcom32.c32 b/i386/config/bootloaders/syslinux/libcom32.c32 deleted file mode 120000 index 44ab36b..0000000 --- a/i386/config/bootloaders/syslinux/libcom32.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/libcom32.c32 \ No newline at end of file diff --git a/i386/config/bootloaders/syslinux/libgpl.c32 b/i386/config/bootloaders/syslinux/libgpl.c32 deleted file mode 120000 index 81c83fb..0000000 --- a/i386/config/bootloaders/syslinux/libgpl.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/libgpl.c32 \ No newline at end of file diff --git a/i386/config/bootloaders/syslinux/libmenu.c32 b/i386/config/bootloaders/syslinux/libmenu.c32 deleted file mode 120000 index 2491ff9..0000000 --- a/i386/config/bootloaders/syslinux/libmenu.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/libmenu.c32 \ No newline at end of file diff --git a/i386/config/bootloaders/syslinux/libutil.c32 b/i386/config/bootloaders/syslinux/libutil.c32 deleted file mode 120000 index 478194e..0000000 --- a/i386/config/bootloaders/syslinux/libutil.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/libutil.c32 \ No newline at end of file diff --git a/i386/config/bootloaders/syslinux/live.cfg.in b/i386/config/bootloaders/syslinux/live.cfg.in deleted file mode 100644 index 97ceb92..0000000 --- a/i386/config/bootloaders/syslinux/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/i386/config/bootloaders/syslinux/menu.cfg b/i386/config/bootloaders/syslinux/menu.cfg deleted file mode 100644 index 9368260..0000000 --- a/i386/config/bootloaders/syslinux/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/i386/config/bootloaders/syslinux/splash.svg b/i386/config/bootloaders/syslinux/splash.svg deleted file mode 100644 index e684e60..0000000 --- a/i386/config/bootloaders/syslinux/splash.svg +++ /dev/null @@ -1,225 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - Crunchbang Plus Plus@PROJECT@ 11 (@DISTRIBUTION@) Version: 11-beta3 @ARCHITECTURE@Build: @YEAR@-@MONTH@-@DAY@ @HOUR@:@MINUTE@:@SECOND@Kernel: @LINUX_VERSIONS@  -   - - - diff --git a/i386/config/bootloaders/syslinux/stdmenu.cfg b/i386/config/bootloaders/syslinux/stdmenu.cfg deleted file mode 100644 index 671b16f..0000000 --- a/i386/config/bootloaders/syslinux/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/i386/config/bootloaders/syslinux/syslinux.cfg b/i386/config/bootloaders/syslinux/syslinux.cfg deleted file mode 100644 index a3e3eab..0000000 --- a/i386/config/bootloaders/syslinux/syslinux.cfg +++ /dev/null @@ -1,4 +0,0 @@ -include menu.cfg -default vesamenu.c32 -prompt 0 -timeout 0 diff --git a/i386/config/bootloaders/syslinux/vesamenu.c32 b/i386/config/bootloaders/syslinux/vesamenu.c32 deleted file mode 120000 index 84e2eff..0000000 --- a/i386/config/bootloaders/syslinux/vesamenu.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/vesamenu.c32 \ No newline at end of file diff --git a/i386/config/bootstrap b/i386/config/bootstrap index f7c3999..544ed12 100644 --- a/i386/config/bootstrap +++ b/i386/config/bootstrap @@ -1,76 +1,73 @@ # config/bootstrap - options for live-build(7), bootstrap stage -# Select architecture to use -LB_ARCHITECTURE="i386" +# $LB_DISTRIBUTION: select distribution to use +# (Default: buster) +LB_DISTRIBUTION="buster" -# Select distribution to use -LB_DISTRIBUTION="bullseye" +# $LB_PARENT_DISTRIBUTION: select parent distribution to use +# (Default: buster) +LB_PARENT_DISTRIBUTION="buster" -# Select parent distribution to use -LB_PARENT_DISTRIBUTION="" +# $LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION: select parent distribution for debian-installer to use +# (Default: buster) +LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="buster" -# Select distribution to use in the chroot -LB_DISTRIBUTION_CHROOT="bullseye" - -# Select parent distribution to use in the chroot -LB_PARENT_DISTRIBUTION_CHROOT="bullseye" - -# Select distribution to use in the final image -LB_DISTRIBUTION_BINARY="bullseye" - -# Select parent distribution to use in the final image -LB_PARENT_DISTRIBUTION_BINARY="bullseye" - -# Select parent distribution for debian-installer to use -LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="bullseye" - -# Select archive areas to use -LB_ARCHIVE_AREAS="main contrib non-free" - -# Select parent archive areas to use -LB_PARENT_ARCHIVE_AREAS="main contrib non-free" - -# Set parent mirror to bootstrap from +# $LB_PARENT_MIRROR_BOOTSTRAP: set parent mirror to bootstrap from +# (Default: http://deb.debian.org/debian/) LB_PARENT_MIRROR_BOOTSTRAP="http://deb.debian.org/debian/" -# Set parent mirror to fetch packages from +# $LB_PARENT_MIRROR_CHROOT: set parent mirror to fetch packages from +# (Default: http://deb.debian.org/debian/) LB_PARENT_MIRROR_CHROOT="http://deb.debian.org/debian/" -# Set security parent mirror to fetch packages from +# $LB_PARENT_MIRROR_CHROOT_SECURITY: set security parent mirror to fetch packages from +# (Default: http://security.debian.org/) LB_PARENT_MIRROR_CHROOT_SECURITY="http://security.debian.org/" -# Set parent mirror which ends up in the image +# $LB_PARENT_MIRROR_BINARY: set parent mirror which ends up in the image +# (Default: http://deb.debian.org/debian/) LB_PARENT_MIRROR_BINARY="http://deb.debian.org/debian/" -# Set security parent mirror which ends up in the image +# $LB_PARENT_MIRROR_BINARY_SECURITY: set security parent mirror which ends up in the image +# (Default: http://security.debian.org/) LB_PARENT_MIRROR_BINARY_SECURITY="http://security.debian.org/" -# Set debian-installer parent mirror +# $LB_PARENT_MIRROR_DEBIAN_INSTALLER: set debian-installer parent mirror +# (Default: http://deb.debian.org/debian/) LB_PARENT_MIRROR_DEBIAN_INSTALLER="http://deb.debian.org/debian/" -# Set mirror to bootstrap from +# $LB_MIRROR_BOOTSTRAP: set mirror to bootstrap from +# (Default: http://deb.debian.org/debian/) LB_MIRROR_BOOTSTRAP="http://deb.debian.org/debian/" -# Set mirror to fetch packages from +# $LB_MIRROR_CHROOT: set mirror to fetch packages from +# (Default: http://deb.debian.org/debian/) LB_MIRROR_CHROOT="http://deb.debian.org/debian/" -# Set security mirror to fetch packages from +# $LB_MIRROR_CHROOT_SECURITY: set security mirror to fetch packages from +# (Default: http://security.debian.org/) LB_MIRROR_CHROOT_SECURITY="http://security.debian.org/" -# Set mirror which ends up in the image +# $LB_MIRROR_BINARY: set mirror which ends up in the image +# (Default: http://deb.debian.org/debian/) LB_MIRROR_BINARY="http://deb.debian.org/debian/" -# Set security mirror which ends up in the image +# $LB_MIRROR_BINARY_SECURITY: set security mirror which ends up in the image +# (Default: http://security.debian.org/) LB_MIRROR_BINARY_SECURITY="http://security.debian.org/" -# Set debian-installer mirror +# $LB_MIRROR_DEBIAN_INSTALLER: set debian-installer mirror +# (Default: http://deb.debian.org/debian/) LB_MIRROR_DEBIAN_INSTALLER="http://deb.debian.org/debian/" -# Set architectures to use foreign bootstrap -LB_BOOTSTRAP_QEMU_ARCHITECTURE="" +# $LB_BOOTSTRAP_QEMU_ARCHITECTURES: architectures to use foreign bootstrap +# (Default: ) +LB_BOOTSTRAP_QEMU_ARCHITECTURES="" -# Set packages to exclude during foreign bootstrap +# $LB_BOOTSTRAP_QEMU_EXCLUDE: packages to exclude during foreign bootstrap +# (Default: ) LB_BOOTSTRAP_QEMU_EXCLUDE="" -# Set static qemu binary for foreign bootstrap +# $LB_BOOTSTRAP_QEMU_STATIC: static qemu binary for foreign bootstrap +# (Default: ) LB_BOOTSTRAP_QEMU_STATIC="" diff --git a/i386/config/build b/i386/config/build index 72ecb99..87fd33c 100644 --- a/i386/config/build +++ b/i386/config/build @@ -1,7 +1,7 @@ [Image] Architecture: i386 Archive-Areas: main contrib non-free -Distribution: bullseye +Distribution: buster Mirror-Bootstrap: http://deb.debian.org/debian/ [FIXME] diff --git a/i386/config/chroot b/i386/config/chroot index d83caa8..99ec61b 100644 --- a/i386/config/chroot +++ b/i386/config/chroot @@ -1,34 +1,37 @@ # config/chroot - options for live-build(7), chroot stage -# Set chroot filesystem +# $LB_CHROOT_FILESYSTEM: set chroot filesystem +# (Default: squashfs) LB_CHROOT_FILESYSTEM="squashfs" -# Set chroot squashfs compression level -LB_CHROOT_SQUASHFS_COMPRESSION_LEVEL="" - -# Set chroot squashfs compression type -LB_CHROOT_SQUASHFS_COMPRESSION_TYPE="" - -# Set union filesystem +# $LB_UNION_FILESYSTEM: set union filesystem +# (Default: overlay) LB_UNION_FILESYSTEM="overlay" -# Set interactive build +# $LB_INTERACTIVE: set interactive build +# (Default: false) LB_INTERACTIVE="false" -# Set keyring packages +# $LB_KEYRING_PACKAGES: set keyring packages +# (Default: empty) LB_KEYRING_PACKAGES="debian-archive-keyring" -# Set kernel flavour to use (with arch) -LB_LINUX_FLAVOURS_WITH_ARCH="686" +# $LB_LINUX_FLAVOURS: set kernel flavour to use +# (Default: autodetected) +LB_LINUX_FLAVOURS="686" -# Set kernel packages to use +# $LB_LINUX_PACKAGES: set kernel packages to use +# (Default: autodetected) LB_LINUX_PACKAGES="linux-image" -# Enable security updates +# $LB_SECURITY: enable security updates +# (Default: true) LB_SECURITY="true" -# Enable updates updates +# $LB_UPDATES: enable updates updates +# (Default: true) LB_UPDATES="true" -# Enable backports updates +# $LB_BACKPORTS: enable backports updates +# (Default: false) LB_BACKPORTS="false" diff --git a/i386/config/common b/i386/config/common index d1f4071..12fef12 100644 --- a/i386/config/common +++ b/i386/config/common @@ -1,105 +1,119 @@ # config/common - common options for live-build(7) -# Version of live-build used to build config (config format version) -LB_CONFIGURATION_VERSION="20210216" - -# Set package manager +# $LB_APT: set package manager +# (Default: apt) LB_APT="apt" -# Set apt/aptitude ftp proxy +# $LB_APT_FTP_PROXY: set apt/aptitude ftp proxy +# (Default: autodetected or empty) LB_APT_FTP_PROXY="" -# Set apt/aptitude http proxy +# $LB_APT_HTTP_PROXY: set apt/aptitude http proxy +# (Default: autodetected or empty) LB_APT_HTTP_PROXY="" -# Set apt/aptitude pipeline depth +# $LB_APT_PIPELINE: set apt/aptitude pipeline depth +# (Default: ) LB_APT_PIPELINE="" -# Set apt/aptitude recommends +# $LB_APT_RECOMMENDS: set apt/aptitude recommends +# (Default: true) LB_APT_RECOMMENDS="true" -# Set apt/aptitude security +# $LB_APT_SECURE: set apt/aptitude security +# (Default: true) LB_APT_SECURE="true" -# Set apt/aptitude source entries in sources.list +# $LB_APT_SOURCE_ARCHIVES: set apt/aptitude source entries in sources.list +# (Default: true) LB_APT_SOURCE_ARCHIVES="true" -# Control cache +# $LB_CACHE: control cache +# (Default: true) LB_CACHE="true" -# Control if downloaded package indices should be cached +# $LB_CACHE_INDICES: control if downloaded package indices should be cached +# (Default: false) LB_CACHE_INDICES="false" -# Control if downloaded packages files should be cached +# $LB_CACHE_PACKAGES: control if downloaded packages files should be cached +# (Default: true) LB_CACHE_PACKAGES="true" -# Control if completed stages should be cached +# $LB_CACHE_STAGES: control if completed stages should be cached +# (Default: bootstrap) LB_CACHE_STAGES="bootstrap" -# Set debconf(1) frontend to use +# $LB_DEBCONF_FRONTEND: set debconf(1) frontend to use +# (Default: noninteractive) LB_DEBCONF_FRONTEND="noninteractive" -# Set debconf(1) priority to use +# $LB_DEBCONF_PRIORITY: set debconf(1) priority to use +# (Default: critical) LB_DEBCONF_PRIORITY="critical" -# Set initramfs hook +# $LB_INITRAMFS: set initramfs hook +# (Default: live-boot) LB_INITRAMFS="live-boot" -# Set initramfs compression +# $LB_INITRAMFS_COMPRESSION: set initramfs compression +# (Default: gzip) LB_INITRAMFS_COMPRESSION="gzip" -# Set init system +# $LB_INITSYSTEM: set init system +# (Default: systemd) LB_INITSYSTEM="systemd" -# Set distribution mode -LB_MODE="debian" - -# Set system type -LB_SYSTEM="live" - -# Set base name of the image -LB_IMAGE_NAME="live-image" - -# Set options to use with apt -APT_OPTIONS="--yes -o Acquire::Retries=5" +# $LB_FDISK: set fdisk program +# (Default: autodetected) +LB_FDISK="fdisk" -# Set options to use with aptitude -APTITUDE_OPTIONS="--assume-yes -o Acquire::Retries=5" - -# Set options to use with debootstrap -DEBOOTSTRAP_OPTIONS="--include=apt-transport-https,ca-certificates" +# $LB_LOSETUP: set losetup program +# (Default: autodetected) +LB_LOSETUP="losetup" -# Set script to use with debootstrap -DEBOOTSTRAP_SCRIPT="" +# $LB_MODE: set distribution mode +# (Default: debian) +LB_MODE="debian" -# Set options to use with gzip -GZIP_OPTIONS="-6 --rsyncable" +# $LB_SYSTEM: set system type +# (Default: live) +LB_SYSTEM="live" -# Enable UTC timestamps -LB_UTC_TIME="false" +# $LB_TASKSEL: set tasksel program +# (Default: apt) +LB_TASKSEL="apt" # live-build options -# Enable breakpoints -# If set here, overrides the command line option +# $_BREAKPOINTS: enable breakpoints +# (Default: false) #_BREAKPOINTS="false" -# Enable debug -# If set here, overrides the command line option +# $_DEBUG: enable debug +# (Default: false) #_DEBUG="false" -# Enable color -# If set here, overrides the command line option -#_COLOR="auto" +# $_COLOR: enable color +# (Default: false) +#_COLOR="false" -# Enable force -# If set here, overrides the command line option +# $_FORCE: enable force +# (Default: false) #_FORCE="false" -# Enable quiet -# If set here, overrides the command line option -#_QUIET="false" +# $_QUIET: enable quiet +# (Default: false) +_QUIET="false" -# Enable verbose -# If set here, overrides the command line option +# $_VERBOSE: enable verbose +# (Default: false) #_VERBOSE="false" + +# Internal stuff (FIXME) +APT_OPTIONS="--yes" +APTITUDE_OPTIONS="--assume-yes" +DEBOOTSTRAP_OPTIONS="--include=apt-transport-https,ca-certificates" +DEBOOTSTRAP_SCRIPT="" +GZIP_OPTIONS="-6 --rsyncable" +ISOHYBRID_OPTIONS="" diff --git a/i386/config/hooks/live/0600-rm-evince.hook.chroot b/i386/config/hooks/live/0600-rm-evince.hook.chroot deleted file mode 100755 index bccb74c..0000000 --- a/i386/config/hooks/live/0600-rm-evince.hook.chroot +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -set -e - -# No way to ignore the recommends on a recommend :( - -apt-get purge -y evince diff --git a/i386/config/hooks/normal/0500-reproducible-glibc.hook.chroot b/i386/config/hooks/normal/0500-reproducible-glibc.hook.chroot deleted file mode 120000 index 9d4f095..0000000 --- a/i386/config/hooks/normal/0500-reproducible-glibc.hook.chroot +++ /dev/null @@ -1 +0,0 @@ -/usr/share/live/build/hooks/normal/0500-reproducible-glibc.hook.chroot \ No newline at end of file diff --git a/i386/config/hooks/normal/0600-rm-evince.hook.chroot b/i386/config/hooks/normal/0600-rm-evince.hook.chroot deleted file mode 100755 index bccb74c..0000000 --- a/i386/config/hooks/normal/0600-rm-evince.hook.chroot +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -set -e - -# No way to ignore the recommends on a recommend :( - -apt-get purge -y evince diff --git a/i386/config/includes.binary/etc/lightdm/lightdm-gtk-greeter.conf b/i386/config/includes.binary/etc/lightdm/lightdm-gtk-greeter.conf new file mode 100644 index 0000000..e264b34 --- /dev/null +++ b/i386/config/includes.binary/etc/lightdm/lightdm-gtk-greeter.conf @@ -0,0 +1,32 @@ +# +# background = Background file to use, either an image path or a color (e.g. #772953) +# theme-name = GTK+ theme to use +# icon-theme-name = Icon theme to use +# font-name = Font to use +# xft-antialias = Whether to antialias Xft fonts (true or false) +# xft-dpi = Resolution for Xft in dots per inch (e.g. 96) +# xft-hintstyle = What degree of hinting to use (none, slight, medium, or hintfull) +# xft-rgba = Type of subpixel antialiasing (none, rgb, bgr, vrgb or vbgr) +# show-indicators = semi-colon ";" separated list of allowed indicator modules. Built-in indicators include "~a11y", "~language", "~session", "~power". Unity indicators can be represented by short name (e.g. "sound", "power"), service file name, or absolute path +# show-clock (true or false) +# clock-format = strftime-format string, e.g. %H:%M +# keyboard = command to launch on-screen keyboard +# position = main window position: x y +# default-user-image = Image used as default user icon, path or #icon-name +# screensaver-timeout = Timeout (in seconds) until the screen blanks when the greeter is called as lockscreen +# +[greeter] +background=#2E3436 +theme-name=CBPP-Dark +icon-theme-name=CBPP-Dark +font-name=Liberation Mono +xft-antialias=true +xft-dpi=75 +xft-hintstyle=hintfull +xft-rgba=rgb +show-indicators=~language;~session;~power +#show-clock= +#clock-format= +#keyboard= +position=20% 40% +#screensaver-timeout= diff --git a/i386/config/includes.chroot/etc/lightdm/lightdm-gtk-greeter.conf b/i386/config/includes.chroot/etc/lightdm/lightdm-gtk-greeter.conf new file mode 100644 index 0000000..e264b34 --- /dev/null +++ b/i386/config/includes.chroot/etc/lightdm/lightdm-gtk-greeter.conf @@ -0,0 +1,32 @@ +# +# background = Background file to use, either an image path or a color (e.g. #772953) +# theme-name = GTK+ theme to use +# icon-theme-name = Icon theme to use +# font-name = Font to use +# xft-antialias = Whether to antialias Xft fonts (true or false) +# xft-dpi = Resolution for Xft in dots per inch (e.g. 96) +# xft-hintstyle = What degree of hinting to use (none, slight, medium, or hintfull) +# xft-rgba = Type of subpixel antialiasing (none, rgb, bgr, vrgb or vbgr) +# show-indicators = semi-colon ";" separated list of allowed indicator modules. Built-in indicators include "~a11y", "~language", "~session", "~power". Unity indicators can be represented by short name (e.g. "sound", "power"), service file name, or absolute path +# show-clock (true or false) +# clock-format = strftime-format string, e.g. %H:%M +# keyboard = command to launch on-screen keyboard +# position = main window position: x y +# default-user-image = Image used as default user icon, path or #icon-name +# screensaver-timeout = Timeout (in seconds) until the screen blanks when the greeter is called as lockscreen +# +[greeter] +background=#2E3436 +theme-name=CBPP-Dark +icon-theme-name=CBPP-Dark +font-name=Liberation Mono +xft-antialias=true +xft-dpi=75 +xft-hintstyle=hintfull +xft-rgba=rgb +show-indicators=~language;~session;~power +#show-clock= +#clock-format= +#keyboard= +position=20% 40% +#screensaver-timeout= diff --git a/i386/config/package-lists/live.list.chroot b/i386/config/package-lists/live.list.chroot index d5b62d6..5da90ab 100644 --- a/i386/config/package-lists/live.list.chroot +++ b/i386/config/package-lists/live.list.chroot @@ -4,6 +4,3 @@ live-config-systemd sudo apt-transport-https -psmisc -xfce4-settings -cryptsetup diff --git a/i386/config/source b/i386/config/source index f8c29a1..93a022a 100644 --- a/i386/config/source +++ b/i386/config/source @@ -1,7 +1,9 @@ # config/source - options for live-build(7), source stage -# Set source option +# $LB_SOURCE: set source option +# (Default: false) LB_SOURCE="false" -# Set image type +# $LB_SOURCE_IMAGES: set image type +# (Default: tar) LB_SOURCE_IMAGES="tar"