Merge branch 'test' into develop
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
|
||||
# Select architecture to use
|
||||
LB_ARCHITECTURE="amd64"
|
||||
<<<<<<< HEAD
|
||||
|
||||
# Select distribution to use
|
||||
LB_DISTRIBUTION="buster"
|
||||
@@ -24,6 +25,30 @@ 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"
|
||||
|
||||
# Select parent distribution to use
|
||||
LB_PARENT_DISTRIBUTION=""
|
||||
|
||||
# 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"
|
||||
|
||||
>>>>>>> test
|
||||
# Select archive areas to use
|
||||
LB_ARCHIVE_AREAS="main contrib non-free"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user