From f1b8bebde1dc08b7bf9e8841a72c6614ff8a58db Mon Sep 17 00:00:00 2001 From: Rod Date: Wed, 1 Jul 2026 12:57:57 +1000 Subject: [PATCH 1/2] Update version to 2.99 in auto/config Add deb822 style sources to /apt/sources.list.d remove /etc/apt/sources.list which is set to CD only --- auto/config | 6 +++--- .../hooks/live/0650-remove-legacy-sources.hook.chroot | 10 ++++++++++ config/hooks/normal/5050-dracut.hook.chroot | 1 + .../etc/apt/sources.list.d/debian.sources | 11 +++++++++++ 4 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 config/hooks/live/0650-remove-legacy-sources.hook.chroot create mode 120000 config/hooks/normal/5050-dracut.hook.chroot create mode 100644 config/includes.chroot/etc/apt/sources.list.d/debian.sources diff --git a/auto/config b/auto/config index e8bdb1b..bfc5405 100755 --- a/auto/config +++ b/auto/config @@ -10,10 +10,10 @@ lb config noauto \ --binary-images iso-hybrid \ --debian-installer live \ --archive-areas "main contrib non-free non-free-firmware" \ - --iso-application "LinuxCNC-2.9.8" \ + --iso-application "LinuxCNC-2.9.9" \ --iso-preparer "emc-developers@lists.sourceforge.net" \ - --iso-volume "LinuxCNC_2.9.8" \ - --image-name "linuxcnc_2.9.8" \ + --iso-volume "LinuxCNC_2.9.9" \ + --image-name "linuxcnc_2.9.9" \ --iso-publisher "www.linuxcnc.org" \ --apt-recommends true \ --security true \ diff --git a/config/hooks/live/0650-remove-legacy-sources.hook.chroot b/config/hooks/live/0650-remove-legacy-sources.hook.chroot new file mode 100644 index 0000000..7a20a5f --- /dev/null +++ b/config/hooks/live/0650-remove-legacy-sources.hook.chroot @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +# Remove the legacy sources.list file to prevent conflicts with DEB822 +if [ -f /etc/apt/sources.list ]; then + echo "Purge legacy /etc/apt/sources.list..." + rm -f /etc/apt/sources.list + apt-get update +fi diff --git a/config/hooks/normal/5050-dracut.hook.chroot b/config/hooks/normal/5050-dracut.hook.chroot new file mode 120000 index 0000000..e1a120f --- /dev/null +++ b/config/hooks/normal/5050-dracut.hook.chroot @@ -0,0 +1 @@ +/usr/share/live/build/hooks/normal/5050-dracut.hook.chroot \ No newline at end of file diff --git a/config/includes.chroot/etc/apt/sources.list.d/debian.sources b/config/includes.chroot/etc/apt/sources.list.d/debian.sources new file mode 100644 index 0000000..74e2d29 --- /dev/null +++ b/config/includes.chroot/etc/apt/sources.list.d/debian.sources @@ -0,0 +1,11 @@ +Types: deb deb-src +URIs: http://deb.debian.org/debian +Suites: trixie trixie-updates +Components: main contrib non-free non-free-firmware non-free +Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg + +Types: deb deb-src +URIs: http://security.debian.org/debian-security +Suites: trixie-security +Components: main contrib non-free non-free-firmware non-free +Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg From 55dacd7e2e211cd9d22ca45993cc6c8b0311ebcc Mon Sep 17 00:00:00 2001 From: Rod Date: Thu, 2 Jul 2026 12:25:42 +1000 Subject: [PATCH 2/2] Changed preseed.cfg to ignore CDROM sources Removed earlier attempts to resolve this in live hook 0650 Deleted normal hook 510 which is no longer necessary now all sources are in the archive folder Generated sources.list comments out the CDROM line and adds comments so sources.list.d/debian.sources is the only sources file Users who do not have internet can edit their sources but security issues will need resolving --- .../hooks/live/0650-remove-legacy-sources.hook.chroot | 10 ---------- config/hooks/normal/510-linuxcnc.hook.chroot | 3 --- config/includes.installer/preseed.cfg | 11 ++++++++++- 3 files changed, 10 insertions(+), 14 deletions(-) delete mode 100644 config/hooks/live/0650-remove-legacy-sources.hook.chroot delete mode 100644 config/hooks/normal/510-linuxcnc.hook.chroot diff --git a/config/hooks/live/0650-remove-legacy-sources.hook.chroot b/config/hooks/live/0650-remove-legacy-sources.hook.chroot deleted file mode 100644 index 7a20a5f..0000000 --- a/config/hooks/live/0650-remove-legacy-sources.hook.chroot +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -set -e - -# Remove the legacy sources.list file to prevent conflicts with DEB822 -if [ -f /etc/apt/sources.list ]; then - echo "Purge legacy /etc/apt/sources.list..." - rm -f /etc/apt/sources.list - apt-get update -fi diff --git a/config/hooks/normal/510-linuxcnc.hook.chroot b/config/hooks/normal/510-linuxcnc.hook.chroot deleted file mode 100644 index 357e28e..0000000 --- a/config/hooks/normal/510-linuxcnc.hook.chroot +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -apt update diff --git a/config/includes.installer/preseed.cfg b/config/includes.installer/preseed.cfg index 0ac3ac7..d3ca223 100644 --- a/config/includes.installer/preseed.cfg +++ b/config/includes.installer/preseed.cfg @@ -1,9 +1,18 @@ d-i passwd/root-login boolean false d-i passwd/user-default-groups string audio cdrom video dialout uinput d-i apt-setup/use_mirror boolean true -d-i mirror/country string enter information manually + +# Mirror Settings (Corrected Types and Protocol added) +d-i apt-setup/use_mirror boolean true +d-i mirror/protocol select http +d-i mirror/country select enter information manually d-i mirror/http/hostname string deb.debian.org d-i mirror/http/directory string /debian + +# Explicitly stop the installer from writing CD/DVD repositories +d-i apt-setup/disable-cdrom-entries boolean true +d-i apt-setup/cdrom/set-first boolean false + # Setting below overwrite settings in config file d-i apt-setup/contrib boolean true d-i apt-setup/non-free boolean true