From 8cd1baf6f2fc99796856abe8028380b27b9e7f5b Mon Sep 17 00:00:00 2001 From: Samuel Vermeulen Date: Fri, 18 Nov 2022 15:34:27 +0100 Subject: [PATCH] bullseye --- auto/config | 2 +- config/binary | 153 ++++++++++++++--------------------------------- config/bootstrap | 79 ++++++++++++------------ config/build | 10 ---- config/chroot | 37 ++++++------ config/common | 124 +++++++++++++++++--------------------- config/source | 6 +- 7 files changed, 161 insertions(+), 250 deletions(-) delete mode 100644 config/build diff --git a/auto/config b/auto/config index 2537ede..fc0c3e0 100755 --- a/auto/config +++ b/auto/config @@ -20,5 +20,5 @@ lb config noauto \ --iso-application "SVPROGNU-11" \ --backports "false" \ --updates "true" \ - --security "false" \ + --security "true" \ "${@}" diff --git a/config/binary b/config/binary index 26fe376..e025229 100644 --- a/config/binary +++ b/config/binary @@ -1,170 +1,107 @@ # config/binary - options for live-build(7), binary stage -# $LB_BINARY_FILESYSTEM: set image filesystem -# (Default: fat32) +# Set image type +LB_IMAGE_TYPE="iso-hybrid" + +# Set image filesystem LB_BINARY_FILESYSTEM="fat32" -# $LB_APT_INDICES: set apt/aptitude generic indices -# (Default: true) +# Set apt/aptitude generic indices LB_APT_INDICES="true" -# $LB_BOOTAPPEND_LIVE: set boot parameters -# (Default: empty) +# Set boot parameters LB_BOOTAPPEND_LIVE="lang=fr_FR.UTF-8 locales=fr_FR.UTF-8 keyboard-layouts=fr splash timezone=Europe/Paris utc=yes keyboard-model=pc105 hostname=svprognu boot=live persistence components username=svpro_gnu" -# $LB_BOOTAPPEND_INSTALL: set boot parameters -# (Default: empty) +# Set boot parameters LB_BOOTAPPEND_INSTALL="locales=fr_FR.UTF-8" -# $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 boot parameters +LB_BOOTAPPEND_LIVE_FAILSAFE="boot=live components memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=788" -# $LB_BOOTLOADERS: set bootloaders -# (Default: syslinux,grub-efi) -LB_BOOTLOADERS="syslinux,grub-efi" +# Set BIOS bootloader +LB_BOOTLOADER_BIOS="syslinux" -# $LB_CHECKSUMS: set checksums -# (Default: md5) -LB_CHECKSUMS="md5" +# Set EFI bootloader +LB_BOOTLOADER_EFI="grub-efi" -# $LB_COMPRESSION: set compression -# (Default: none) +# Set checksums +LB_CHECKSUMS="sha256 md5" + +# Set compression LB_COMPRESSION="none" -# $LB_ZSYNC: set zsync -# (Default: true) +# Set zsync LB_ZSYNC="true" -# ${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. +# Control if we build binary images chrooted +# NEVER, *EVER*, *E*V*E*R* SET THIS OPTION to false. LB_BUILD_WITH_CHROOT="true" -# $LB_DEBIAN_INSTALLER: set debian-installer -# (Default: live) +# Set debian-installer LB_DEBIAN_INSTALLER="live" -# $LB_DEBIAN_INSTALLER_DISTRIBUTION: set debian-installer suite -# (Default: empty) +# Set debian-installer suite LB_DEBIAN_INSTALLER_DISTRIBUTION="bullseye" -# $LB_DEBIAN_INSTALLER_PRESEEDFILE: set debian-installer preseed filename/url -# (Default: ) +# Set debian-installer preseed filename/url LB_DEBIAN_INSTALLER_PRESEEDFILE="" -# $LB_DEBIAN_INSTALLER_GUI: toggle use of GUI debian-installer -# (Default: true) +# Toggle use of GUI debian-installer LB_DEBIAN_INSTALLER_GUI="true" -# $LB_GRUB_SPLASH: set custom grub splash -# (Default: empty) -LB_GRUB_SPLASH="" - -# $LB_HDD_LABEL: set hdd label -# (Default: DEBIAN_LIVE) +# Set hdd label LB_HDD_LABEL="DEBIAN_LIVE" -# $LB_HDD_SIZE: set hdd filesystem size -# (Default: auto) +# Set hdd filesystem size LB_HDD_SIZE="auto" -# $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: ) +# 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="" -# $LB_ISO_APPLICATION: set iso author -# (Default: SVPROGNU-11) +# Set iso author LB_ISO_APPLICATION="SVPROGNU-11" -# $LB_ISO_PREPARER: set iso preparer -# (Default: live-build 1:20190311; https://debian-live.alioth.debian.org/live-build) -LB_ISO_PREPARER="live-build 1:20190311; https://debian-live.alioth.debian.org/live-build" +# Set iso preparer +LB_ISO_PREPARER="live-build @LB_VERSION@; https://salsa.debian.org/live-team/live-build" -# $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 publisher +LB_ISO_PUBLISHER="Debian Live project; https://wiki.debian.org/DebianLive; debian-live@lists.debian.org" -# $LB_ISO_VOLUME: set iso volume (max 32 chars) -# (Default: SVPROGNU-11) +# Set iso volume (max 32 chars) LB_ISO_VOLUME="SVPROGNU-11" -# $LB_JFFS2_ERASEBLOCK: set jffs2 eraseblock size -# (Default: unset) +# Set jffs2 eraseblock size LB_JFFS2_ERASEBLOCK="" -# $LB_MEMTEST: set memtest -# (Default: none) +# Set memtest LB_MEMTEST="none" -# $LB_LOADLIN: set loadlin -# (Default: true) +# Set loadlin LB_LOADLIN="true" -# $LB_WIN32_LOADER: set win32-loader -# (Default: true) +# Set win32-loader LB_WIN32_LOADER="true" -# $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) +# Set net tarball LB_NET_TARBALL="true" -# $LB_ONIE: set onie -# (Default: false) +# Set onie LB_ONIE="false" -# $LB_ONIE_KERNEL_CMDLINE: set onie additional kernel cmdline options -# (Default: ) +# Set onie additional kernel cmdline options LB_ONIE_KERNEL_CMDLINE="" -# $LB_FIRMWARE_BINARY: include firmware packages in debian-installer -# (Default: true) +# Set inclusion of firmware packages in debian-installer LB_FIRMWARE_BINARY="true" -# $LB_FIRMWARE_CHROOT: include firmware packages in debian-installer -# (Default: true) +# Set inclusion of firmware packages in the live image LB_FIRMWARE_CHROOT="true" -# $LB_SWAP_FILE_PATH: set swap file path -# (Default: ) +# Set swap file path LB_SWAP_FILE_PATH="" -# $LB_SWAP_FILE_SIZE: set swap file size -# (Default: 512) +# Set swap file size LB_SWAP_FILE_SIZE="512" -# $LB_UEFI_SECURE_BOOT: enable/disable UEFI secure boot -# (Default: enable) +# Enable/disable UEFI secure boot support LB_UEFI_SECURE_BOOT="enable" diff --git a/config/bootstrap b/config/bootstrap index 948e367..9a76243 100644 --- a/config/bootstrap +++ b/config/bootstrap @@ -1,73 +1,76 @@ # config/bootstrap - options for live-build(7), bootstrap stage -# $LB_DISTRIBUTION: select distribution to use -# (Default: bullseye) +# Select architecture to use +LB_ARCHITECTURE="amd64" + +# Select distribution to use LB_DISTRIBUTION="bullseye" -# $LB_PARENT_DISTRIBUTION: select parent distribution to use -# (Default: bullseye) -LB_PARENT_DISTRIBUTION="bullseye" +# Select parent distribution to use +LB_PARENT_DISTRIBUTION="" -# $LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION: select parent distribution for debian-installer to use -# (Default: bullseye) +# 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" -# $LB_PARENT_MIRROR_BOOTSTRAP: set parent mirror to bootstrap from -# (Default: http://deb.debian.org/debian/) +# 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="http://deb.debian.org/debian/" -# $LB_PARENT_MIRROR_CHROOT: set parent mirror to fetch packages from -# (Default: http://deb.debian.org/debian/) +# Set parent mirror to fetch packages from LB_PARENT_MIRROR_CHROOT="http://deb.debian.org/debian/" -# $LB_PARENT_MIRROR_CHROOT_SECURITY: set security parent mirror to fetch packages from -# (Default: http://security.debian.org/) +# Set security parent mirror to fetch packages from LB_PARENT_MIRROR_CHROOT_SECURITY="http://security.debian.org/" -# $LB_PARENT_MIRROR_BINARY: set parent mirror which ends up in the image -# (Default: http://deb.debian.org/debian/) +# Set parent mirror which ends up in the image LB_PARENT_MIRROR_BINARY="http://deb.debian.org/debian/" -# $LB_PARENT_MIRROR_BINARY_SECURITY: set security parent mirror which ends up in the image -# (Default: http://security.debian.org/) +# Set security parent mirror which ends up in the image LB_PARENT_MIRROR_BINARY_SECURITY="http://security.debian.org/" -# $LB_PARENT_MIRROR_DEBIAN_INSTALLER: set debian-installer parent mirror -# (Default: http://deb.debian.org/debian/) +# Set debian-installer parent mirror LB_PARENT_MIRROR_DEBIAN_INSTALLER="http://deb.debian.org/debian/" -# $LB_MIRROR_BOOTSTRAP: set mirror to bootstrap from -# (Default: http://deb.debian.org/debian/) +# Set mirror to bootstrap from LB_MIRROR_BOOTSTRAP="http://deb.debian.org/debian/" -# $LB_MIRROR_CHROOT: set mirror to fetch packages from -# (Default: http://deb.debian.org/debian/) +# Set mirror to fetch packages from LB_MIRROR_CHROOT="http://deb.debian.org/debian/" -# $LB_MIRROR_CHROOT_SECURITY: set security mirror to fetch packages from -# (Default: http://security.debian.org/) +# Set security mirror to fetch packages from LB_MIRROR_CHROOT_SECURITY="http://security.debian.org/" -# $LB_MIRROR_BINARY: set mirror which ends up in the image -# (Default: http://deb.debian.org/debian/) +# Set mirror which ends up in the image LB_MIRROR_BINARY="http://deb.debian.org/debian/" -# $LB_MIRROR_BINARY_SECURITY: set security mirror which ends up in the image -# (Default: http://security.debian.org/) +# Set security mirror which ends up in the image LB_MIRROR_BINARY_SECURITY="http://security.debian.org/" -# $LB_MIRROR_DEBIAN_INSTALLER: set debian-installer mirror -# (Default: http://deb.debian.org/debian/) +# Set debian-installer mirror LB_MIRROR_DEBIAN_INSTALLER="http://deb.debian.org/debian/" -# $LB_BOOTSTRAP_QEMU_ARCHITECTURES: architectures to use foreign bootstrap -# (Default: ) -LB_BOOTSTRAP_QEMU_ARCHITECTURES="" +# Set architectures to use foreign bootstrap +LB_BOOTSTRAP_QEMU_ARCHITECTURE="" -# $LB_BOOTSTRAP_QEMU_EXCLUDE: packages to exclude during foreign bootstrap -# (Default: ) +# Set packages to exclude during foreign bootstrap LB_BOOTSTRAP_QEMU_EXCLUDE="" -# $LB_BOOTSTRAP_QEMU_STATIC: static qemu binary for foreign bootstrap -# (Default: ) +# Set static qemu binary for foreign bootstrap LB_BOOTSTRAP_QEMU_STATIC="" diff --git a/config/build b/config/build deleted file mode 100644 index db98262..0000000 --- a/config/build +++ /dev/null @@ -1,10 +0,0 @@ -[Image] -Architecture: amd64 -Archive-Areas: main contrib non-free -Distribution: bullseye -Mirror-Bootstrap: http://deb.debian.org/debian/ - -[FIXME] -Configuration-Version: 1:20190311 -Name: live-image -Type: iso-hybrid diff --git a/config/chroot b/config/chroot index 5a671d6..07a57ee 100644 --- a/config/chroot +++ b/config/chroot @@ -1,37 +1,34 @@ # config/chroot - options for live-build(7), chroot stage -# $LB_CHROOT_FILESYSTEM: set chroot filesystem -# (Default: squashfs) +# Set chroot filesystem LB_CHROOT_FILESYSTEM="squashfs" -# $LB_UNION_FILESYSTEM: set union filesystem -# (Default: overlay) +# 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="overlay" -# $LB_INTERACTIVE: set interactive build -# (Default: false) +# Set interactive build LB_INTERACTIVE="false" -# $LB_KEYRING_PACKAGES: set keyring packages -# (Default: empty) +# Set keyring packages LB_KEYRING_PACKAGES="debian-archive-keyring" -# $LB_LINUX_FLAVOURS: set kernel flavour to use -# (Default: autodetected) -LB_LINUX_FLAVOURS="amd64" +# Set kernel flavour to use (with arch) +LB_LINUX_FLAVOURS_WITH_ARCH="amd64" -# $LB_LINUX_PACKAGES: set kernel packages to use -# (Default: autodetected) +# Set kernel packages to use LB_LINUX_PACKAGES="linux-image linux-headers" -# $LB_SECURITY: enable security updates -# (Default: false) -LB_SECURITY="false" +# Enable security updates +LB_SECURITY="true" -# $LB_UPDATES: enable updates updates -# (Default: true) +# Enable updates updates LB_UPDATES="true" -# $LB_BACKPORTS: enable backports updates -# (Default: false) +# Enable backports updates LB_BACKPORTS="false" diff --git a/config/common b/config/common index 38a929f..51320a4 100644 --- a/config/common +++ b/config/common @@ -1,119 +1,105 @@ # config/common - common options for live-build(7) -# $LB_APT: set package manager -# (Default: apt) +# Version of live-build used to build config (config format version) +LB_CONFIGURATION_VERSION="20210407" + +# Set package manager LB_APT="apt" -# $LB_APT_FTP_PROXY: set apt/aptitude ftp proxy -# (Default: autodetected or empty) +# Set apt/aptitude/debootstrap ftp proxy LB_APT_FTP_PROXY="" -# $LB_APT_HTTP_PROXY: set apt/aptitude http proxy -# (Default: autodetected or empty) +# Set apt/aptitude/debootstrap http proxy LB_APT_HTTP_PROXY="" -# $LB_APT_PIPELINE: set apt/aptitude pipeline depth -# (Default: ) +# Set apt/aptitude pipeline depth LB_APT_PIPELINE="" -# $LB_APT_RECOMMENDS: set apt/aptitude recommends -# (Default: true) +# Set apt/aptitude recommends LB_APT_RECOMMENDS="true" -# $LB_APT_SECURE: set apt/aptitude security -# (Default: true) +# Set apt/aptitude security LB_APT_SECURE="true" -# $LB_APT_SOURCE_ARCHIVES: set apt/aptitude source entries in sources.list -# (Default: true) +# Set apt/aptitude source entries in sources.list LB_APT_SOURCE_ARCHIVES="true" -# $LB_CACHE: control cache -# (Default: true) +# Control cache LB_CACHE="true" -# $LB_CACHE_INDICES: control if downloaded package indices should be cached -# (Default: false) +# Control if downloaded package indices should be cached LB_CACHE_INDICES="false" -# $LB_CACHE_PACKAGES: control if downloaded packages files should be cached -# (Default: true) +# Control if downloaded packages files should be cached LB_CACHE_PACKAGES="true" -# $LB_CACHE_STAGES: control if completed stages should be cached -# (Default: bootstrap) +# Control if completed stages should be cached LB_CACHE_STAGES="bootstrap" -# $LB_DEBCONF_FRONTEND: set debconf(1) frontend to use -# (Default: noninteractive) +# Set debconf(1) frontend to use LB_DEBCONF_FRONTEND="noninteractive" -# $LB_DEBCONF_PRIORITY: set debconf(1) priority to use -# (Default: critical) +# Set debconf(1) priority to use LB_DEBCONF_PRIORITY="critical" -# $LB_INITRAMFS: set initramfs hook -# (Default: live-boot) +# Set initramfs hook LB_INITRAMFS="live-boot" -# $LB_INITRAMFS_COMPRESSION: set initramfs compression -# (Default: gzip) +# Set initramfs compression LB_INITRAMFS_COMPRESSION="gzip" -# $LB_INITSYSTEM: set init system -# (Default: systemd) +# Set init system LB_INITSYSTEM="systemd" -# $LB_FDISK: set fdisk program -# (Default: autodetected) -LB_FDISK="fdisk" - -# $LB_LOSETUP: set losetup program -# (Default: autodetected) -LB_LOSETUP="losetup" - -# $LB_MODE: set distribution mode -# (Default: debian) +# Set distribution mode LB_MODE="debian" -# $LB_SYSTEM: set system type -# (Default: live) +# Set system type LB_SYSTEM="live" -# $LB_TASKSEL: set tasksel program -# (Default: apt) -LB_TASKSEL="apt" +# Set base name of the image +LB_IMAGE_NAME="live-image" + +# Set options to use with apt +APT_OPTIONS="--yes -o Acquire::Retries=5" + +# Set options to use with aptitude +APTITUDE_OPTIONS="--assume-yes -o Acquire::Retries=5" + +# Set options to use with debootstrap +DEBOOTSTRAP_OPTIONS="" + +# Set script to use with debootstrap +DEBOOTSTRAP_SCRIPT="" + +# Set options to use with gzip +GZIP_OPTIONS="-6 --rsyncable" + +# Enable UTC timestamps +LB_UTC_TIME="false" # live-build options -# $_BREAKPOINTS: enable breakpoints -# (Default: false) +# Enable breakpoints +# If set here, overrides the command line option #_BREAKPOINTS="false" -# $_DEBUG: enable debug -# (Default: false) +# Enable debug +# If set here, overrides the command line option #_DEBUG="false" -# $_COLOR: enable color -# (Default: false) -#_COLOR="false" +# Enable color +# If set here, overrides the command line option +#_COLOR="auto" -# $_FORCE: enable force -# (Default: false) +# Enable force +# If set here, overrides the command line option #_FORCE="false" -# $_QUIET: enable quiet -# (Default: false) -_QUIET="false" +# Enable quiet +# If set here, overrides the command line option +#_QUIET="false" -# $_VERBOSE: enable verbose -# (Default: false) +# Enable verbose +# If set here, overrides the command line option #_VERBOSE="false" - -# Internal stuff (FIXME) -APT_OPTIONS="--yes" -APTITUDE_OPTIONS="--assume-yes" -DEBOOTSTRAP_OPTIONS="" -DEBOOTSTRAP_SCRIPT="" -GZIP_OPTIONS="-6 --rsyncable" -ISOHYBRID_OPTIONS="" diff --git a/config/source b/config/source index 93a022a..f8c29a1 100644 --- a/config/source +++ b/config/source @@ -1,9 +1,7 @@ # config/source - options for live-build(7), source stage -# $LB_SOURCE: set source option -# (Default: false) +# Set source option LB_SOURCE="false" -# $LB_SOURCE_IMAGES: set image type -# (Default: tar) +# Set image type LB_SOURCE_IMAGES="tar"