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/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/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.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 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