diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-12-18 12:41:59 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-12-18 12:41:59 +0100 |
| commit | e2559c975d22593d6edc087c51805f36ba1b7e57 (patch) | |
| tree | c0101867fb675383ba19b84140f3aa060ac965a3 /data/live-build-config/hooks | |
| parent | c12a8da143d67fa39f00ef6538bb39d03cc2e65e (diff) | |
| parent | 5d54c6390c04c9f16f7e0276500699cddccc3e60 (diff) | |
| download | vyos-build-e2559c975d22593d6edc087c51805f36ba1b7e57.tar.gz vyos-build-e2559c975d22593d6edc087c51805f36ba1b7e57.zip | |
Merge branch 'equuleus' of github.com:vyos/vyos-build into current
* 'equuleus' of github.com:vyos/vyos-build: (68 commits)
systemd: cryptsetup: we do not support encrypted volumes
systemd: igmpproxy: service is handled by VyOS CLI
systemd: ntp: service is handled by VyOS CLI
systemd: man: do not rebuild man db once a day
systemd: pcscd: disable SmartCard service
systemd: apt: disable daily update service
ndisc6: add ICMPv6 Neighbor Discovery tool
rsyslog: disabling rsyslog causes start issues if required
syslog: T1834: 'del system syslog' doesn't stop rsyslog
syslog: T1834: 'del system syslog' doesn't stop rsyslog
Jenkins: archive ISO on failed builds if possible
vyos-qat: adding pkg dependency
Kernel: T1800: update to Linux 4.19.84
hooks: synchronize Linux Firmware with current branch
Kernel: T1791: update to Linux 4.19.82
T1773: update Dockerfile for changes to libvyosconfig
kernel-version: fixing typo
Kernel: update to 4.19.76 in defaults.json
acpid: enable acpid to enable power button triggered shutdowns
systemd-disable - heartbeat.service disabled
...
Diffstat (limited to 'data/live-build-config/hooks')
3 files changed, 16 insertions, 2 deletions
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 \ 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 74d94a65..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 @@ -39,6 +39,20 @@ 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 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 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 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 |