From 1850f165abda3f3d0498220e56ca594dc8ecca9c Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Tue, 28 May 2019 22:51:06 +0200 Subject: T1414: disable failing 10-unmountfs.chroot and needs verification --- data/live-build-config/hooks/live/10-unmountfs.chroot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/live-build-config/hooks') diff --git a/data/live-build-config/hooks/live/10-unmountfs.chroot b/data/live-build-config/hooks/live/10-unmountfs.chroot index 7992a4d2..05bcc12c 100755 --- a/data/live-build-config/hooks/live/10-unmountfs.chroot +++ b/data/live-build-config/hooks/live/10-unmountfs.chroot @@ -1,5 +1,5 @@ #!/bin/sh - +exit 0 # hack umountfs script to cleanly unmount live systems sed \ -- cgit v1.2.3 From 1109c04fec9a201d3cb321ab5eb4d5b496eac540 Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Tue, 28 May 2019 22:57:46 +0200 Subject: T1415: disable 24-efi_packages.chroot as it fails apply'ing by live-build The package grub-efi and grub-efi-amd64 is not existant on buster --- data/live-build-config/hooks/live/24-efi_packages.chroot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/live-build-config/hooks') diff --git a/data/live-build-config/hooks/live/24-efi_packages.chroot b/data/live-build-config/hooks/live/24-efi_packages.chroot index c2b1ff11..49bc6ebb 100755 --- a/data/live-build-config/hooks/live/24-efi_packages.chroot +++ b/data/live-build-config/hooks/live/24-efi_packages.chroot @@ -1,5 +1,5 @@ #!/bin/sh - +exit 0 echo I: Download grub-efi packages. mkdir -p /usr/share/vyos/packages -- cgit v1.2.3 From 1ff1b22726f1f4678dca8295860623d728e20521 Mon Sep 17 00:00:00 2001 From: hagbard Date: Tue, 8 Oct 2019 11:29:50 -0700 Subject: systemd-services: disable pacemaker, corosync, wpa_supplicant, squid - dusable their autostart at boot time via systemd defaults --- data/live-build-config/hooks/live/18-enable-disable_services.chroot | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'data/live-build-config/hooks') 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 0caed88a..93e413d0 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 @@ -39,5 +39,10 @@ systemctl disable strongswan.service systemctl disable frr.service systemctl disable salt-minion.service systemctl disable nginx.service +systemctl disable pacemaker.service +systemctl disable corosync.service +systemctl disable wpa_supplicant.service +systemctl disable squid.service + systemctl enable vyos-hostsd.service -- cgit v1.2.3 From 29147950487514dd34fa486a5d1d42412a90ce43 Mon Sep 17 00:00:00 2001 From: hagbard Date: Tue, 8 Oct 2019 14:40:36 -0700 Subject: systemd-disable - heartbeat.service disabled --- data/live-build-config/hooks/live/18-enable-disable_services.chroot | 1 + 1 file changed, 1 insertion(+) (limited to 'data/live-build-config/hooks') 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 93e413d0..42fb3020 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 @@ -43,6 +43,7 @@ systemctl disable pacemaker.service systemctl disable corosync.service systemctl disable wpa_supplicant.service systemctl disable squid.service +systemctl disable heartbeat.service systemctl enable vyos-hostsd.service -- cgit v1.2.3 From c293b710ab331612ec714c89abb286e0f7c6b7d1 Mon Sep 17 00:00:00 2001 From: hagbard Date: Fri, 11 Oct 2019 13:02:30 -0700 Subject: acpid: enable acpid to enable power button triggered shutdowns --- data/live-build-config/hooks/live/18-enable-disable_services.chroot | 1 + 1 file changed, 1 insertion(+) (limited to 'data/live-build-config/hooks') 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 42fb3020..fc6d2b76 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,3 +47,4 @@ systemctl disable heartbeat.service systemctl enable vyos-hostsd.service +systemctl enable acpid.service -- cgit v1.2.3 From 9986845896f64f6a3b5556519fb26b678b59d1be Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Mon, 11 Nov 2019 16:39:40 +0100 Subject: hooks: synchronize Linux Firmware with current branch Imported from commit 2382c90dc7a30d17628a11f9ff41f8c63867887a --- .../hooks/live/40-linux-firmware.chroot | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'data/live-build-config/hooks') diff --git a/data/live-build-config/hooks/live/40-linux-firmware.chroot b/data/live-build-config/hooks/live/40-linux-firmware.chroot index cd944faf..d3f34dec 100755 --- a/data/live-build-config/hooks/live/40-linux-firmware.chroot +++ b/data/live-build-config/hooks/live/40-linux-firmware.chroot @@ -2,15 +2,22 @@ # To get the possibility of reproducible builds we pin to a specific commit # of the linux-firmware repository -COMMIT="7bc246451318b3536d9bfd3c4e46d541a9831b33" +COMMIT="aa95e90b2c638f1ca6647d12b2d1b18284428f9c" -echo I: Retrieving Linux Firmware - commit ${COMMIT} +echo "I: Retrieving Linux Firmware - commit ${COMMIT}" -curl -o /tmp/linux-firmware-${COMMIT}.tar.gz \ - https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${COMMIT}.tar.gz -tar xf /tmp/linux-firmware-${COMMIT}.tar.gz -C /lib -mv /lib/linux-firmware-${COMMIT} /lib/firmware -rm -f /tmp/linux-firmware-${COMMIT}.tar.gz +ret=$(curl -w "%{http_code}" -o /tmp/linux-firmware-${COMMIT}.tar.gz \ + https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${COMMIT}.tar.gz) + +if [ "${ret}" != "200" ]; then + echo E: Received HTTP error code \"${ret}\" when downloading Linux Firmware ... + exit 1 +fi + +tar xf /tmp/linux-firmware-${COMMIT}.tar.gz -C /tmp +mkdir -p /lib/firmware +mv /tmp/linux-firmware-${COMMIT}/* /lib/firmware +rm -rf /tmp/linux-firmware-${COMMIT}* # We do not need all firmware blobs .. cleanup RM_FIRMWARE=" \ -- cgit v1.2.3 From af920bd3be793e27d5460deb693ae14d42e246fa Mon Sep 17 00:00:00 2001 From: hagbard Date: Fri, 29 Nov 2019 09:24:23 -0800 Subject: syslog: T1834: 'del system syslog' doesn't stop rsyslog - disbled autostart at boot via systemd --- data/live-build-config/hooks/live/18-enable-disable_services.chroot | 2 ++ 1 file changed, 2 insertions(+) (limited to 'data/live-build-config/hooks') 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 fc6d2b76..54f1fa5c 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 @@ -44,6 +44,8 @@ systemctl disable corosync.service systemctl disable wpa_supplicant.service systemctl disable squid.service systemctl disable heartbeat.service +systemctl disable syslog.socket +systemctl disable rsyslog.service systemctl enable vyos-hostsd.service -- cgit v1.2.3 From 672cff5ebf2a61ed5bc075fcab03a806d3c1139c Mon Sep 17 00:00:00 2001 From: hagbard Date: Fri, 29 Nov 2019 11:05:27 -0800 Subject: syslog: T1834: 'del system syslog' doesn't stop rsyslog - disable syslog.socket unit is not required, it's no service --- data/live-build-config/hooks/live/18-enable-disable_services.chroot | 1 - 1 file changed, 1 deletion(-) (limited to 'data/live-build-config/hooks') 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 54f1fa5c..4ae8d478 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 @@ -44,7 +44,6 @@ systemctl disable corosync.service systemctl disable wpa_supplicant.service systemctl disable squid.service systemctl disable heartbeat.service -systemctl disable syslog.socket systemctl disable rsyslog.service -- cgit v1.2.3 From 2a5c58f4d0624243cbcc1a8070bd5446da948aba Mon Sep 17 00:00:00 2001 From: hagbard Date: Fri, 29 Nov 2019 12:17:08 -0800 Subject: rsyslog: disabling rsyslog causes start issues if required - socket.service can be found since disabling rsyslog removes the link to socket.service too and causes a dependency error --- data/live-build-config/hooks/live/18-enable-disable_services.chroot | 2 -- 1 file changed, 2 deletions(-) (limited to 'data/live-build-config/hooks') 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 4ae8d478..b726bc3a 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 @@ -44,8 +44,6 @@ systemctl disable corosync.service systemctl disable wpa_supplicant.service systemctl disable squid.service systemctl disable heartbeat.service -systemctl disable rsyslog.service - systemctl enable vyos-hostsd.service systemctl enable acpid.service -- cgit v1.2.3 From a276c3e7f9b4cb913e240c71ac13c1213a6a38bb Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Mon, 2 Dec 2019 20:18:48 +0100 Subject: systemd: apt: disable daily update service As VyOS does not make use of APT for updating the system it is useless to run this service. --- data/live-build-config/hooks/live/18-enable-disable_services.chroot | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'data/live-build-config/hooks') 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 b726bc3a..511b45df 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 @@ -44,6 +44,10 @@ systemctl disable corosync.service systemctl disable wpa_supplicant.service systemctl disable squid.service systemctl disable heartbeat.service +systemctl disable apt-daily.service +systemctl disable apt-daily.timer +systemctl disable apt-daily-upgrade.timer +systemctl disable apt-daily-upgrade.service systemctl enable vyos-hostsd.service systemctl enable acpid.service -- cgit v1.2.3 From baf8e096afcb7781997c2a1d5ec2058218eb1ba9 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Mon, 2 Dec 2019 20:30:25 +0100 Subject: systemd: pcscd: disable SmartCard service PCSC is included via a dependency of wpa_supplicant. vyos@vyos:~$ apt-cache rdepends pcscd pcscd Reverse Depends: libpcsclite1 opensc libpcsclite1 vyos@vyos:~$ apt-cache rdepends libpcsclite1 libpcsclite1 Reverse Depends: pcscd wpasupplicant --- data/live-build-config/hooks/live/18-enable-disable_services.chroot | 1 + 1 file changed, 1 insertion(+) (limited to 'data/live-build-config/hooks') 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 511b45df..d3de9a43 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 @@ -48,6 +48,7 @@ systemctl disable apt-daily.service systemctl disable apt-daily.timer systemctl disable apt-daily-upgrade.timer systemctl disable apt-daily-upgrade.service +systemctl disable pcscd.service systemctl enable vyos-hostsd.service systemctl enable acpid.service -- cgit v1.2.3 From f2dd696099c684efd2b9deb19db169082487320a Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Mon, 2 Dec 2019 21:00:34 +0100 Subject: systemd: man: do not rebuild man db once a day --- data/live-build-config/hooks/live/18-enable-disable_services.chroot | 1 + 1 file changed, 1 insertion(+) (limited to 'data/live-build-config/hooks') 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 d3de9a43..5d591e7e 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 @@ -49,6 +49,7 @@ systemctl disable apt-daily.timer systemctl disable apt-daily-upgrade.timer systemctl disable apt-daily-upgrade.service systemctl disable pcscd.service +systemctl disable man-db.timer systemctl enable vyos-hostsd.service systemctl enable acpid.service -- cgit v1.2.3 From 51d1f85b515357f20fa75d08d175641e383c92f8 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Mon, 2 Dec 2019 21:00:50 +0100 Subject: systemd: ntp: service is handled by VyOS CLI --- data/live-build-config/hooks/live/18-enable-disable_services.chroot | 1 + 1 file changed, 1 insertion(+) (limited to 'data/live-build-config/hooks') 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 5d591e7e..c0c24728 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 @@ -50,6 +50,7 @@ systemctl disable apt-daily-upgrade.timer systemctl disable apt-daily-upgrade.service systemctl disable pcscd.service systemctl disable man-db.timer +systemctl disable ntp.service systemctl enable vyos-hostsd.service systemctl enable acpid.service -- cgit v1.2.3 From 143dfc0c67bef36d7d4f30fb052605b8ec6b1460 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Mon, 2 Dec 2019 21:01:35 +0100 Subject: systemd: igmpproxy: service is handled by VyOS CLI --- data/live-build-config/hooks/live/18-enable-disable_services.chroot | 1 + 1 file changed, 1 insertion(+) (limited to 'data/live-build-config/hooks') 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 c0c24728..30ed2c7a 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 @@ -51,6 +51,7 @@ systemctl disable apt-daily-upgrade.service systemctl disable pcscd.service systemctl disable man-db.timer systemctl disable ntp.service +systemctl disable igmpproxy.service systemctl enable vyos-hostsd.service systemctl enable acpid.service -- cgit v1.2.3 From 736de7a6bbfb4808eaaab27b7c18817183383e5f Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Mon, 2 Dec 2019 21:02:22 +0100 Subject: systemd: cryptsetup: we do not support encrypted volumes --- data/live-build-config/hooks/live/18-enable-disable_services.chroot | 1 + 1 file changed, 1 insertion(+) (limited to 'data/live-build-config/hooks') 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 30ed2c7a..50325aeb 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 @@ -52,6 +52,7 @@ systemctl disable pcscd.service systemctl disable man-db.timer systemctl disable ntp.service systemctl disable igmpproxy.service +systemctl disable cryptsetup.service systemctl enable vyos-hostsd.service systemctl enable acpid.service -- cgit v1.2.3