Fix building ISO

This commit is contained in:
Aleksey Samoilov 2023-04-03 02:03:54 +04:00
parent 92a6f6d0ec
commit 9b92670c8e
5 changed files with 10 additions and 11 deletions

View file

@ -33,7 +33,7 @@ dist="$(lsb_release -i -s)"
if [ "$dist" == "Debian" ]; then if [ "$dist" == "Debian" ]; then
apt-get install -y binutils patch zstd live-build apt-get install -y binutils patch zstd live-build
dpkg -i ./debs/ubuntu-keyring*.deb dpkg -i ./debs/debian-keyring*.deb
else else
apt-get install -y binutils patch zstd debootstrap apt-get install -y binutils patch zstd debootstrap
dpkg -i ./debs/*.deb dpkg -i ./debs/*.deb

View file

@ -7,21 +7,17 @@ set -e
lb config noauto \ lb config noauto \
--architectures "$ARCH" \ --architectures "$ARCH" \
--mode debian \ --mode debian \
--initramfs none \
--distribution "$BASECODENAME" \ --distribution "$BASECODENAME" \
--parent-distribution "$BASECODENAME" \ --parent-distribution "$BASECODENAME" \
--archive-areas "main contrib non-free non-free-firmware" \ --archive-areas "main contrib non-free non-free-firmware" \
--parent-archive-areas "main contrib non-free non-free-firmware" \ --parent-archive-areas "main contrib non-free non-free-firmware" \
--linux-packages linux-image \ --linux-packages linux-image \
--bootappend-live "boot=live quiet splash" \ --bootappend-live "boot=live components username=tileos quiet splash" \
--mirror-bootstrap "$MIRROR_URL" \ --mirror-bootstrap "$MIRROR_URL" \
--parent-mirror-bootstrap "$MIRROR_URL" \ --parent-mirror-bootstrap "$MIRROR_URL" \
--mirror-chroot-security "http://deb.debian.org/debian-security/" \ --mirror-chroot-security "http://deb.debian.org/debian-security/" \
--parent-mirror-chroot-security "http://deb.debian.org/debian-security/" \ --parent-mirror-chroot-security "http://deb.debian.org/debian-security/" \
--mirror-binary-security "http://deb.debian.org/debian-security/" \
--parent-mirror-binary-security "http://deb.debian.org/debian-security/" \
--apt-source-archives false \ --apt-source-archives false \
--mirror-binary "$MIRROR_URL" \
--parent-mirror-binary "$MIRROR_URL" \ --parent-mirror-binary "$MIRROR_URL" \
--keyring-packages debian-keyring \ --keyring-packages debian-keyring \
--apt-options "--yes --option Acquire::Retries=5 --option Acquire::http::Timeout=100" \ --apt-options "--yes --option Acquire::Retries=5 --option Acquire::http::Timeout=100" \
@ -31,12 +27,11 @@ lb config noauto \
--binary-images iso-hybrid \ --binary-images iso-hybrid \
--iso-application "$NAME" \ --iso-application "$NAME" \
--iso-volume "$NAME" \ --iso-volume "$NAME" \
--firmware-binary false \ --firmware-chroot true \
--firmware-chroot false \
--zsync false \ --zsync false \
--security true \ --security true \
--updates true \ --updates true \
--debootstrap-options="--extractor=ar --variant=minbase" \ --debootstrap-options="--extractor=ar" \
"${@}" "${@}"
# replace channel and suite # replace channel and suite
@ -45,6 +40,7 @@ sed -i "s/@DEBIAN_VERSION/$DEBIAN_VERSION/" config/archives/*.list*
# replace desktop # replace desktop
sed -i "s/@DESKTOP/$DESKTOP/" config/package-lists.calamares/*.chroot_install sed -i "s/@DESKTOP/$DESKTOP/" config/package-lists.calamares/*.chroot_install
sed -i "s/@DESKTOP/$DESKTOP/" config/package-lists.calamares/*.chroot_live
DATE=$(date +%Y%m%d) DATE=$(date +%Y%m%d)
sed -i "s/@CHANNEL/$CHANNEL/" config/includes.binary/.disk/info sed -i "s/@CHANNEL/$CHANNEL/" config/includes.binary/.disk/info

View file

@ -6,5 +6,5 @@ command = "cage -s -d -- regreet"
user = "_greetd" user = "_greetd"
[initial_session] [initial_session]
command = "start-sway" command = "sway"
user = "tileos" user = "tileos"

View file

@ -1 +1 @@
tileos-live tileos-@DESKTOP-live

View file

@ -2,6 +2,9 @@
ARCH="amd64" ARCH="amd64"
# base codename # base codename
BASECODENAME="bookworm"
# Debian version
DEBIAN_VERSION="Debian_Testing" DEBIAN_VERSION="Debian_Testing"
# base version # base version