Skip to content

Commit d4de599

Browse files
TriangularDevTriangularDev
committed
Resetti
1 parent e97aaa3 commit d4de599

File tree

5 files changed

+46
-53
lines changed

5 files changed

+46
-53
lines changed

‎Trixie/config/archives/00-no-sysvinit.pref‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎Trixie/config/binary‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ LB_ZSYNC="true"
4646
LB_BUILD_WITH_CHROOT="true"
4747

4848
# $LB_DEBIAN_INSTALLER: set debian-installer
49-
# (Default: false)
50-
LB_DEBIAN_INSTALLER="false"
49+
# (Default: live)
50+
LB_DEBIAN_INSTALLER="live"
5151

5252
# $LB_DEBIAN_INSTALLER_DISTRIBUTION: set debian-installer suite
5353
# (Default: empty)
@@ -78,16 +78,16 @@ LB_HDD_SIZE="10000"
7878
LB_ISO_APPLICATION="Debian Live"
7979

8080
# $LB_ISO_PREPARER: set iso preparer
81-
# (Default: live-build 3.0~a57-1; http://packages.qa.debian.org/live-build)
82-
LB_ISO_PREPARER="live-build 3.0~a57-1; http://packages.qa.debian.org/live-build"
81+
# (Default: live-build $VERSION; http://packages.qa.debian.org/live-build)
82+
LB_ISO_PREPARER="live-build $VERSION; http://packages.qa.debian.org/live-build"
8383

8484
# $LB_ISO_PUBLISHER: set iso publisher
8585
# (Default: Debian Live project; http://live.debian.net/; debian-live@lists.debian.org)
8686
LB_ISO_PUBLISHER="Debian Live project; http://live.debian.net/; debian-live@lists.debian.org"
8787

8888
# $LB_ISO_VOLUME: set iso volume (max 32 chars)
89-
# (Default: Debian trixie 20251013-16:34)
90-
LB_ISO_VOLUME="Debian trixie 20251013-16:34"
89+
# (Default: Debian trixie $(date +%Y%m%d-%H:%M))
90+
LB_ISO_VOLUME="Debian trixie $(date +%Y%m%d-%H:%M)"
9191

9292
# $LB_EXT_BLOCKSIZE: set EXT block size
9393
# (Default: unset)
@@ -110,8 +110,8 @@ LB_JFFS2_ERASEBLOCK=""
110110
LB_MEMTEST="memtest86+"
111111

112112
# $LB_WIN32_LOADER: set win32-loader
113-
# (Default: false)
114-
LB_WIN32_LOADER="false"
113+
# (Default: true)
114+
LB_WIN32_LOADER="true"
115115

116116
# $LB_NET_ROOT_FILESYSTEM: set netboot filesystem
117117
# (Default: nfs)

‎Trixie/config/bootstrap‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -33,84 +33,84 @@ LB_PARENT_DISTRIBUTION="trixie"
3333
LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="trixie"
3434

3535
# $LB_PARENT_MIRROR_BOOTSTRAP: set parent mirror to bootstrap from
36-
# (Default: http://deb.debian.org/debian/)
37-
LB_PARENT_MIRROR_BOOTSTRAP="http://deb.debian.org/debian/"
36+
# (Default: http://ftp.debian.org/debian/)
37+
LB_PARENT_MIRROR_BOOTSTRAP="http://ftp.debian.org/debian/"
3838

3939
# $LB_PARENT_MIRROR_CHROOT: set parent mirror to fetch packages from
40-
# (Default: http://deb.debian.org/debian/)
41-
LB_PARENT_MIRROR_CHROOT="http://deb.debian.org/debian/"
40+
# (Default: http://ftp.debian.org/debian/)
41+
LB_PARENT_MIRROR_CHROOT="http://ftp.debian.org/debian/"
4242

4343
# $LB_PARENT_MIRROR_CHROOT_SECURITY: set security parent mirror to fetch packages from
44-
# (Default: http://security.debian.org/debian-security/)
45-
LB_PARENT_MIRROR_CHROOT_SECURITY="http://security.debian.org/debian-security/"
44+
# (Default: http://security.debian.org/)
45+
LB_PARENT_MIRROR_CHROOT_SECURITY="http://security.debian.org/"
4646

4747
# $LB_PARENT_MIRROR_CHROOT_VOLATILE: set volatile parent mirror to fetch packages from
48-
# (Default: http://deb.debian.org/debian/)
49-
LB_PARENT_MIRROR_CHROOT_VOLATILE="http://deb.debian.org/debian/"
48+
# (Default: http://ftp.debian.org/debian/)
49+
LB_PARENT_MIRROR_CHROOT_VOLATILE="http://ftp.debian.org/debian/"
5050

5151
# $LB_PARENT_MIRROR_CHROOT_BACKPORTS: set backports parent mirror to fetch packages from
5252
# (Default: http://backports.debian.org/debian-backports/)
5353
LB_PARENT_MIRROR_CHROOT_BACKPORTS="http://backports.debian.org/debian-backports/"
5454

5555
# $LB_PARENT_MIRROR_BINARY: set parent mirror which ends up in the image
56-
# (Default: http://deb.debian.org/debian/)
57-
LB_PARENT_MIRROR_BINARY="http://deb.debian.org/debian/"
56+
# (Default: http://cdn.debian.net/debian/)
57+
LB_PARENT_MIRROR_BINARY="http://cdn.debian.net/debian/"
5858

5959
# $LB_PARENT_MIRROR_BINARY_SECURITY: set security parent mirror which ends up in the image
60-
# (Default: http://security.debian.org/debian-security/)
61-
LB_PARENT_MIRROR_BINARY_SECURITY="http://security.debian.org/debian-security/"
60+
# (Default: http://security.debian.org/)
61+
LB_PARENT_MIRROR_BINARY_SECURITY="http://security.debian.org/"
6262

6363
# $LB_PARENT_MIRROR_BINARY_VOLATILE: set volatile parent mirror which ends up in the image
64-
# (Default: http://deb.debian.org/debian/)
65-
LB_PARENT_MIRROR_BINARY_VOLATILE="http://deb.debian.org/debian/"
64+
# (Default: http://cdn.debian.net/debian/)
65+
LB_PARENT_MIRROR_BINARY_VOLATILE="http://cdn.debian.net/debian/"
6666

6767
# $LB_PARENT_MIRROR_BINARY_BACKPORTS: set backports parent mirror which ends up in the image
6868
# (Default: http://backports.debian.org/debian-backports/)
6969
LB_PARENT_MIRROR_BINARY_BACKPORTS="http://backports.debian.org/debian-backports/"
7070

7171
# $LB_PARENT_MIRROR_DEBIAN_INSTALLER: set debian-installer parent mirror
72-
# (Default: http://deb.debian.org/debian/)
73-
LB_PARENT_MIRROR_DEBIAN_INSTALLER="http://deb.debian.org/debian/"
72+
# (Default: http://ftp.debian.org/debian/)
73+
LB_PARENT_MIRROR_DEBIAN_INSTALLER="http://ftp.debian.org/debian/"
7474

7575
# $LB_MIRROR_BOOTSTRAP: set mirror to bootstrap from
76-
# (Default: http://deb.debian.org/debian/)
77-
LB_MIRROR_BOOTSTRAP="http://deb.debian.org/debian/"
76+
# (Default: http://ftp.debian.org/debian/)
77+
LB_MIRROR_BOOTSTRAP="http://ftp.debian.org/debian/"
7878

7979
# $LB_MIRROR_CHROOT: set mirror to fetch packages from
80-
# (Default: http://deb.debian.org/debian/)
81-
LB_MIRROR_CHROOT="http://deb.debian.org/debian/"
80+
# (Default: http://ftp.debian.org/debian/)
81+
LB_MIRROR_CHROOT="http://ftp.debian.org/debian/"
8282

8383
# $LB_MIRROR_CHROOT_SECURITY: set security mirror to fetch packages from
84-
# (Default: http://security.debian.org/debian-security/)
85-
LB_MIRROR_CHROOT_SECURITY="http://security.debian.org/debian-security/"
84+
# (Default: http://security.debian.org/)
85+
LB_MIRROR_CHROOT_SECURITY="http://security.debian.org/"
8686

8787
# $LB_MIRROR_CHROOT_VOLATILE: set volatile mirror to fetch packages from
88-
# (Default: http://deb.debian.org/debian/)
89-
LB_MIRROR_CHROOT_VOLATILE="http://deb.debian.org/debian/"
88+
# (Default: http://ftp.debian.org/debian/)
89+
LB_MIRROR_CHROOT_VOLATILE="http://ftp.debian.org/debian/"
9090

9191
# $LB_MIRROR_CHROOT_BACKPORTS: set backports mirror to fetch packages from
9292
# (Default: http://backports.debian.org/debian-backports/)
9393
LB_MIRROR_CHROOT_BACKPORTS="http://backports.debian.org/debian-backports/"
9494

9595
# $LB_MIRROR_BINARY: set mirror which ends up in the image
96-
# (Default: http://deb.debian.org/debian/)
97-
LB_MIRROR_BINARY="http://deb.debian.org/debian/"
96+
# (Default: http://cdn.debian.net/debian/)
97+
LB_MIRROR_BINARY="http://cdn.debian.net/debian/"
9898

9999
# $LB_MIRROR_BINARY_SECURITY: set security mirror which ends up in the image
100-
# (Default: http://security.debian.org/debian-security/)
101-
LB_MIRROR_BINARY_SECURITY="http://security.debian.org/debian-security/"
100+
# (Default: http://security.debian.org/)
101+
LB_MIRROR_BINARY_SECURITY="http://security.debian.org/"
102102

103103
# $LB_MIRROR_BINARY_VOLATILE: set volatile mirror which ends up in the image
104-
# (Default: http://deb.debian.org/debian/)
105-
LB_MIRROR_BINARY_VOLATILE="http://deb.debian.org/debian/"
104+
# (Default: http://cdn.debian.net/debian/)
105+
LB_MIRROR_BINARY_VOLATILE="http://cdn.debian.net/debian/"
106106

107107
# $LB_MIRROR_BINARY_BACKPORTS: set backports mirror which ends up in the image
108108
# (Default: http://backports.debian.org/debian-backports/)
109109
LB_MIRROR_BINARY_BACKPORTS="http://backports.debian.org/debian-backports/"
110110

111111
# $LB_MIRROR_DEBIAN_INSTALLER: set debian-installer mirror
112-
# (Default: http://deb.debian.org/debian/)
113-
LB_MIRROR_DEBIAN_INSTALLER="http://deb.debian.org/debian/"
112+
# (Default: http://ftp.debian.org/debian/)
113+
LB_MIRROR_DEBIAN_INSTALLER="http://ftp.debian.org/debian/"
114114

115115
# $LB_ARCHIVES: enable available third-party archives
116116
# (Default: empty)

‎Trixie/config/common‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ LB_DEBCONF_NOWARNINGS="yes"
6464
LB_DEBCONF_PRIORITY="critical"
6565

6666
# $LB_INITRAMFS: set initramfs hook
67-
# (Default: live-boot-systemd)
68-
LB_INITRAMFS="live-boot-systemd"
67+
# (Default: auto)
68+
LB_INITRAMFS="auto"
6969

7070
# $LB_INITRAMFS_COMPRESSION: set initramfs compression
7171
# (Default: )
@@ -88,8 +88,8 @@ LB_LOSETUP="losetup"
8888
LB_MODE="debian"
8989

9090
# $LB_SYSTEM: set system type
91-
# (Default: systemd)
92-
LB_SYSTEM="systemd"
91+
# (Default: live)
92+
LB_SYSTEM="live"
9393

9494
# $LB_ROOT_COMMAND: use sudo or equivalent
9595
# (Default: empty)
@@ -136,6 +136,6 @@ _QUIET="false"
136136
# Internal stuff (FIXME)
137137
APT_OPTIONS="--yes"
138138
APTITUDE_OPTIONS="--assume-yes"
139-
GZIP_OPTIONS="-6 --rsyncable"
139+
GZIP_OPTIONS="-6 --rsyncable"
140140
ISOHYBRID_OPTIONS=""
141141
GENISOIMAGE_OPTIONS_EXTRA=""

‎builder/Dockerfile‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,8 @@ RUN apt update && apt install -y \
1919
WORKDIR /TriOs
2020

2121
# Default command: configure and build TriOS ISO, then copy to output
22-
CMD lb config --system live && \
23-
lb config --initsystem systemd && \
24-
lb config --bootappend-live "boot=live components union=overlay nopersistence" && \
22+
CMD lb config --bootappend-live "boot=live components union=overlay nopersistence" && \
2523
lb config --architecture amd64 && \
26-
lb config --debian-installer live && \
27-
lb config --initramfs live-boot && \
2824
lb build --verbose --debug && \
2925
mkdir -p /TriOs_Output && \
3026
cp -r ./live-image* /TriOs_Output/ && \

0 commit comments

Comments
 (0)