From 99cd490978f3bf5579db7db12e5ec2e6a9926bfc Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Sun, 6 Sep 2026 18:33:55 +0200
Subject: hooks: T9283: remove services that no longer exist from disable list

Disabling ipsec.service and strongswan-starter.service failed during
every ISO build:

  Failed to disable unit, unit ipsec.service does not exist.
  Failed to disable unit, unit strongswan-starter.service does not exist.

Since the strongSwan 6.0 update only strongswan.service unit is shipped.
---
 data/live-build-config/hooks/live/18-enable-disable_services.chroot | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'data')

diff --git a/data/live-build-config/hooks/live/18-enable-disable_services.chroot b/data/live-build-config/hooks/live/18-enable-disable_services.chroot
index 3ef8477d..80c37e64 100755
--- a/data/live-build-config/hooks/live/18-enable-disable_services.chroot
+++ b/data/live-build-config/hooks/live/18-enable-disable_services.chroot
@@ -47,9 +47,6 @@ systemctl disable keepalived.service
 systemctl disable ipvsadm.service
 systemctl disable telegraf.service
 systemctl disable ndppd.service
-systemctl disable ipsec.service
-systemctl disable strongswan.service
-systemctl disable strongswan-starter.service
 systemctl disable strongswan.service
 systemctl disable avahi-daemon.service
 systemctl disable atop-rotate.timer
-- 
cgit v1.2.3


From 27c96774929340d8bb060fa20c80a126e6b7da03 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Sun, 6 Sep 2026 18:34:42 +0200
Subject: hooks: T9283: remove obsolete SSH default file copy

/opt/vyatta/etc/default_ssh has not been shipped by any VyOS package
for years, so the copy failed on every ISO build:

  cp: cannot stat '/opt/vyatta/etc/default_ssh': No such file or directory

/etc/default/ssh is left at its Debian default, and ssh.service is
disabled in the image anyway - the SSH daemon is started from the CLI
configuration.
---
 data/live-build-config/hooks/live/08-sysconf.chroot | 1 -
 1 file changed, 1 deletion(-)

(limited to 'data')

diff --git a/data/live-build-config/hooks/live/08-sysconf.chroot b/data/live-build-config/hooks/live/08-sysconf.chroot
index aac17585..f05ea6dc 100755
--- a/data/live-build-config/hooks/live/08-sysconf.chroot
+++ b/data/live-build-config/hooks/live/08-sysconf.chroot
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-cp -f /opt/vyatta/etc/default_ssh /etc/default/ssh
 >/etc/pam_radius_auth.conf
 
 update_sysctl_conf ()
-- 
cgit v1.2.3


From b553de025eb543dfcb8dac0a7b938f6fe6b84e0f Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Sun, 6 Sep 2026 18:35:04 +0200
Subject: hooks: T9283: remove obsolete sysconf hook

Only two actions were left in this hook and neither is needed.

- /etc/pam_radius_auth.conf is created empty at image build time, but vyos-1x
  renders the file from its own Jinja2 template and the router init script
  removes it on every boot when restoring PAM to its virgin state.
- kernel.printk was patched into /etc/sysctl.conf. The setting now ships in
  vyos-1x as part of /etc/sysctl.d/30-vyos-router.conf, next to the other
  kernel defaults.
---
 .../live-build-config/hooks/live/08-sysconf.chroot | 31 ----------------------
 1 file changed, 31 deletions(-)
 delete mode 100755 data/live-build-config/hooks/live/08-sysconf.chroot

(limited to 'data')

diff --git a/data/live-build-config/hooks/live/08-sysconf.chroot b/data/live-build-config/hooks/live/08-sysconf.chroot
deleted file mode 100755
index f05ea6dc..00000000
--- a/data/live-build-config/hooks/live/08-sysconf.chroot
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
->/etc/pam_radius_auth.conf
-
-update_sysctl_conf ()
-{
-    var=$1
-    val=$2
-    comment=$3
-    sysctl_conf=/etc/sysctl.conf
-
-    if grep -q "^${var}[[:space:]]*=" $sysctl_conf ; then
-	sed -i "/^${var}[[:space:]]*=/ s,=.*,= ${val}," $sysctl_conf
-    elif grep -q "^#[[:space:]]*${var}[[:space:]]*=" $sysctl_conf ; then
-	sed -i "/^#[[:space:]]*${var}[[:space:]]*=/ { s,^#[[:space:]]*,, ; s,[[:space:]]*=.*, = ${val},} " $sysctl_conf
-    else
-	cat <<-EOF >> $sysctl_conf
-
-	# $comment
-	$var = $val
-	EOF
-    fi
-}
-
-update_sysctl_conf kernel.printk "4 4 1 7" \
-    "the following stops low-level messages on console"
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 4
-# End:
-- 
cgit v1.2.3