This commit is contained in:
Samuel Vermeulen 2022-11-22 00:56:35 +01:00
parent ef24b302cd
commit 41c633b751
2 changed files with 0 additions and 37 deletions

View File

@ -41,11 +41,7 @@ LB_BUILD_WITH_CHROOT="true"
LB_DEBIAN_INSTALLER="live"
# Set debian-installer suite
<<<<<<< HEAD
LB_DEBIAN_INSTALLER_DISTRIBUTION="buster"
=======
LB_DEBIAN_INSTALLER_DISTRIBUTION="bullseye"
>>>>>>> test
# Set debian-installer preseed filename/url
LB_DEBIAN_INSTALLER_PRESEEDFILE=""
@ -63,11 +59,7 @@ LB_HDD_SIZE="auto"
LB_HDD_PARTITION_START=""
# Set iso author
<<<<<<< HEAD
LB_ISO_APPLICATION="SVPRO_GNU"
=======
LB_ISO_APPLICATION="SVPROGNU-11"
>>>>>>> test
# Set iso preparer
LB_ISO_PREPARER="live-build @LB_VERSION@; https://salsa.debian.org/live-team/live-build"
@ -76,11 +68,7 @@ LB_ISO_PREPARER="live-build @LB_VERSION@; https://salsa.debian.org/live-team/liv
LB_ISO_PUBLISHER="Debian Live project; https://wiki.debian.org/DebianLive; debian-live@lists.debian.org"
# Set iso volume (max 32 chars)
<<<<<<< HEAD
LB_ISO_VOLUME="SVPRO_GNU"
=======
LB_ISO_VOLUME="SVPROGNU-11"
>>>>>>> test
# Set jffs2 eraseblock size
LB_JFFS2_ERASEBLOCK=""

View File

@ -2,30 +2,6 @@
# Select architecture to use
LB_ARCHITECTURE="amd64"
<<<<<<< HEAD
# Select distribution to use
LB_DISTRIBUTION="buster"
# Select parent distribution to use
LB_PARENT_DISTRIBUTION=""
# Select distribution to use in the chroot
LB_DISTRIBUTION_CHROOT="buster"
# Select parent distribution to use in the chroot
LB_PARENT_DISTRIBUTION_CHROOT="buster"
# Select distribution to use in the final image
LB_DISTRIBUTION_BINARY="buster"
# Select parent distribution to use in the final image
LB_PARENT_DISTRIBUTION_BINARY="buster"
# Select parent distribution for debian-installer to use
LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="buster"
=======
# Select distribution to use
LB_DISTRIBUTION="bullseye"
@ -48,7 +24,6 @@ LB_PARENT_DISTRIBUTION_BINARY="bullseye"
# Select parent distribution for debian-installer to use
LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="bullseye"
>>>>>>> test
# Select archive areas to use
LB_ARCHIVE_AREAS="main contrib non-free"