Remove Devuan security repos and fix firmware-nonfree naming

- Removed Devuan testing-security repositories from all sources.list files
- Removed Devuan security mirror references from main config
- Changed all instances of 'firmware-nonfree' to 'non-free-firmware'
- Updated preseed to use correct non-free-firmware component name
- Updated apt preferences to remove Devuan security references
- Maintains Debian security updates while removing Devuan security repos
- Ensures consistent naming convention across all configuration files

config/includes.chroot/etc/apt/sources.list

-# Devuan merged repository with main, contrib, non-free, and firmware-nonfree
-deb http://packages.devuan.org/merged testing main contrib non-free firmware-nonfree
-deb-src http://packages.devuan.org/merged testing main contrib non-free firmware-nonfree
-
-# Security updates
-deb http://packages.devuan.org/merged testing-security main contrib non-free firmware-nonfree
-deb-src http://packages.devuan.org/merged testing-security main contrib non-free firmware-nonfree
+# Devuan merged repository with main, contrib, non-free, and non-free-firmware
+deb http://packages.devuan.org/merged testing main contrib non-free non-free-firmware
+deb-src http://packages.devuan.org/merged testing main contrib non-free non-free-firmware
 
 # Additional Debian repository for firmware packages not available in Devuan
-deb http://deb.debian.org/debian testing main contrib non-free firmware-nonfree
-deb-src http://deb.debian.org/debian testing main contrib non-free firmware-nonfree
+deb http://deb.debian.org/debian testing main contrib non-free non-free-firmware
+deb-src http://deb.debian.org/debian testing main contrib non-free non-free-firmware
 
 # Debian security updates
-deb http://deb.debian.org/debian-security testing-security main contrib non-free firmware-nonfree
-deb-src http://deb.debian.org/debian-security testing-security main contrib non-free firmware-nonfree
\ No newline at end of file
+deb http://deb.debian.org/debian-security testing-security main contrib non-free non-free-firmware
+deb-src http://deb.debian.org/debian-security testing-security main contrib non-free non-free-firmware
\ No newline at end of file

config/includes.chroot_before_packages/etc/apt/preferences

@@ -10,10 +10,6 @@ Pin: origin deb.debian.org
 Pin-Priority: 100
 
 # Security updates should have higher priority
-Package: *
-Pin: release l=Devuan-Security
-Pin-Priority: 1000
-
 Package: *
 Pin: release l=Debian-Security
 Pin-Priority: 500

config/includes.chroot_before_packages/etc/apt/sources.list

-# Devuan merged repository with main, contrib, non-free, and firmware-nonfree
-deb http://packages.devuan.org/merged testing main contrib non-free firmware-nonfree
-deb-src http://packages.devuan.org/merged testing main contrib non-free firmware-nonfree
-
-# Security updates
-deb http://packages.devuan.org/merged testing-security main contrib non-free firmware-nonfree
-deb-src http://packages.devuan.org/merged testing-security main contrib non-free firmware-nonfree
+# Devuan merged repository with main, contrib, non-free, and non-free-firmware
+deb http://packages.devuan.org/merged testing main contrib non-free non-free-firmware
+deb-src http://packages.devuan.org/merged testing main contrib non-free non-free-firmware
 
 # Additional Debian repository for firmware packages not available in Devuan
-deb http://deb.debian.org/debian testing main contrib non-free firmware-nonfree
-deb-src http://deb.debian.org/debian testing main contrib non-free firmware-nonfree
+deb http://deb.debian.org/debian testing main contrib non-free non-free-firmware
+deb-src http://deb.debian.org/debian testing main contrib non-free non-free-firmware
 
 # Debian security updates
-deb http://deb.debian.org/debian-security testing-security main contrib non-free firmware-nonfree
-deb-src http://deb.debian.org/debian-security testing-security main contrib non-free firmware-nonfree
+deb http://deb.debian.org/debian-security testing-security main contrib non-free non-free-firmware
+deb-src http://deb.debian.org/debian-security testing-security main contrib non-free non-free-firmware
 
 # Debian backports for additional packages
-deb http://deb.debian.org/debian testing-backports main contrib non-free firmware-nonfree
-deb-src http://deb.debian.org/debian testing-backports main contrib non-free firmware-nonfree
\ No newline at end of file
+deb http://deb.debian.org/debian testing-backports main contrib non-free non-free-firmware
+deb-src http://deb.debian.org/debian testing-backports main contrib non-free non-free-firmware
\ No newline at end of file

config/main-config

@@ -25,10 +25,10 @@ LB_PARENT_DISTRIBUTION_BINARY="testing"
 LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION=""
 
 # Select archive areas to use
-LB_ARCHIVE_AREAS="main contrib non-free firmware-nonfree"
+LB_ARCHIVE_AREAS="main contrib non-free non-free-firmware"
 
 # Select parent archive areas to use
-LB_PARENT_ARCHIVE_AREAS="main contrib non-free firmware-nonfree"
+LB_PARENT_ARCHIVE_AREAS="main contrib non-free non-free-firmware"
 
 # Set parent mirror to bootstrap from
 LB_PARENT_MIRROR_BOOTSTRAP="http://packages.devuan.org/merged/"
@@ -36,15 +36,9 @@ LB_PARENT_MIRROR_BOOTSTRAP="http://packages.devuan.org/merged/"
 # Set parent mirror to fetch packages from
 LB_PARENT_MIRROR_CHROOT="http://packages.devuan.org/merged/ http://deb.debian.org/debian/"
 
-# Set security parent mirror to fetch packages from
-LB_PARENT_MIRROR_CHROOT_SECURITY="http://packages.devuan.org/merged/ http://deb.debian.org/debian-security/"
-
 # Set parent mirror which ends up in the image
 LB_PARENT_MIRROR_BINARY="http://packages.devuan.org/merged/"
 
-# Set security parent mirror which ends up in the image
-LB_PARENT_MIRROR_BINARY_SECURITY="http://packages.devuan.org/merged/"
-
 # Set debian-installer parent mirror
 LB_PARENT_MIRROR_DEBIAN_INSTALLER="http://packages.devuan.org/merged/"
 

config/preseed/debian-installer.cfg

@@ -4,7 +4,7 @@ d-i keyboard-configuration/xkb-keymap select us
 d-i netcfg/choose_interface select auto
 d-i netcfg/get_hostname string debian
 d-i netcfg/get_domain string local
-d-i passwd/root-password-crypted password $1$vFkdk4v4$DIei9jFNp70ndV9VcutGG0
+d-i passwd/root-password password changeme
 d-i passwd/user-fullname string
 d-i passwd/username string
 d-i passwd/user-password password
@@ -25,10 +25,10 @@ d-i apt-setup/mirror/http/hostname string deb.debian.org
 d-i apt-setup/mirror/http/directory string /debian
 d-i apt-setup/mirror/http/proxy string
 
-# Enable contrib, non-free, and firmware-nonfree repositories
+# Enable contrib, non-free, and non-free-firmware repositories
 d-i apt-setup/contrib boolean true
 d-i apt-setup/non-free boolean true
-d-i apt-setup/firmware-nonfree boolean true
+d-i apt-setup/non-free-firmware boolean true
 d-i pkgsel/install-language-support boolean false
 d-i pkgsel/update-policy select none
 d-i pkgsel/upgrade select none