Skip to content

Commit 34efe55

Browse files
committed
add popularity-contest
also: * fix dracut regression * upgrade golang to 1.24.1
1 parent 501de7e commit 34efe55

File tree

7 files changed

+23
-8
lines changed

7 files changed

+23
-8
lines changed

.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- name: Set up Go
1313
uses: actions/setup-go@v5
1414
with:
15-
go-version: '1.24'
15+
go-version: '1.24.1'
1616
cache-dependency-path: frontend-tui/go.sum
1717

1818
- name: Test

frontend-tui/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/r0b0/debian-installer/frontend-tui
22

3-
go 1.24.0
3+
go 1.24.1
44

55
require (
66
github.com/gdamore/tcell/v2 v2.8.1

frontend/src/App.vue

+7-3
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ export default {
3434
ENABLE_SWAP: undefined,
3535
SWAP_SIZE: undefined,
3636
NVIDIA_PACKAGE: " ", // will be changed in install()
37+
ENABLE_POPCON: undefined,
3738
}
3839
}
3940
},
@@ -277,10 +278,9 @@ export default {
277278

278279
<main>
279280
<form>
281+
<div class="red">{{error_message}}</div>
280282
<fieldset>
281283
<legend>Installation Target Device</legend>
282-
<div class="red">{{error_message}}</div>
283-
284284
<label for="DISK">Device for Installation</label>
285285
<select :disabled="block_devices.length==0 || running" id="DISK" v-model="installer.DISK">
286286
<option v-for="item in block_devices" :value="item.path" :disabled="!item.available">
@@ -337,6 +337,10 @@ export default {
337337

338338
<input type="checkbox" v-model="want_nvidia" id="WANT_NVIDIA" class="inline mt-3" :disabled="!has_nvidia || running">
339339
<label for="WANT_NVIDIA" class="inline mt-3">Install the proprietary NVIDIA Accelerated Linux Graphics Driver</label>
340+
341+
<br>
342+
<input type="checkbox" v-model="installer.ENABLE_POPCON" id="ENABLE_POPCON" class="inline mt-3" :disabled="running">
343+
<label for="ENABLE_POPCON" class="inline mt-3">Participate in the <a href="https://popcon.debian.org/" target="_blank">debian package usage survey</a></label>
340344
</fieldset>
341345

342346
<fieldset>
@@ -360,7 +364,7 @@ export default {
360364
</main>
361365

362366
<footer>
363-
<span>Opinionated Debian Installer TESTING version 20250216a</span>
367+
<span>Opinionated Debian Installer TESTING version 20250311a</span>
364368
<span>Installer &copy;2022-2025 <a href="https://github.com/r0b0/debian-installer">Robert T</a></span>
365369
<span>Banner &copy;2024 <a href="https://github.com/pccouper/trixie">Elise Couper</a></span>
366370
</footer>

installer-files/boot/efi/installer.ini

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ TIMEZONE=UTC
2626
ENABLE_SWAP=partition
2727
SWAP_SIZE=1
2828
NVIDIA_PACKAGE=
29+
ENABLE_POPCON=false
2930

3031
; automatically start the installation without user intervention
3132
;AUTO_INSTALL=true

installer-files/usr/lib/dracut/modules.d/90overlay-generic/module-setup.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
# Kernel command line parameters: rd.overlay.lower, rd.overlay.upper, rd.overlay.work
44

55
check() {
6-
[[ $hostonly ]] && return 1
7-
return 255
6+
return 0
87
}
98

109
depends() {

installer.sh

+11
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ HOSTNAME=debian13
1313
ENABLE_SWAP=partition
1414
SWAP_SIZE=2
1515
NVIDIA_PACKAGE=
16+
ENABLE_POPCON=false
1617
SSH_PUBLIC_KEY=
1718
AFTER_INSTALLED_CMD=
1819
fi
@@ -510,6 +511,16 @@ systemctl disable systemd-networkd-wait-online.service
510511
EOF
511512
chroot ${target}/ bash /tmp/run2.sh || exit 1
512513

514+
if [ "$ENABLE_POPCON" = true ] ; then
515+
notify enabling popularity-contest
516+
cat <<EOF > ${target}/tmp/run3.sh || exit 1
517+
#!/bin/bash
518+
echo "popularity-contest popularity-contest/participate boolean true" | debconf-set-selections
519+
apt-get install -y popularity-contest
520+
EOF
521+
chroot ${target}/ bash /tmp/run3.sh || exit 1
522+
fi
523+
513524
if [ ! -z "${SSH_PUBLIC_KEY}" ]; then
514525
notify adding ssh public key to user and root authorized_keys file
515526
mkdir -p ${target}/root/.ssh || exit 1

make_image_1.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ fi
220220

221221
notify downloading remaining .deb files for the installer
222222
chroot ${target}/ apt-get install -y --download-only locales tasksel openssh-server
223-
chroot ${target}/ apt-get install -t ${BACKPORTS_VERSION} -y --download-only systemd-boot dracut linux-image-amd64 linux-headers-amd64 nvidia-driver nvidia-driver-libs:i386
223+
chroot ${target}/ apt-get install -t ${BACKPORTS_VERSION} -y --download-only systemd-boot dracut linux-image-amd64 linux-headers-amd64 nvidia-driver nvidia-driver-libs:i386 popularity-contest
224224

225225
notify cleaning up
226226
chroot ${target}/ apt-get autoremove -y

0 commit comments

Comments
 (0)