From f349c98d9a5d66fd9f39d59af159e994fc48c8f4 Mon Sep 17 00:00:00 2001 From: Kim Hagen Date: Sun, 27 Mar 2016 16:16:11 -0400 Subject: add vyos-remove package and remove ddclient dhclient hook --- .../hooks/13-firmware-linux-nonfree.chroot | 6 ----- .../live-build-config/hooks/13-vyos_replace.chroot | 3 +++ .../hooks/14-firmware-linux-nonfree.chroot | 6 +++++ .../live-build-config/hooks/14-sources_list.chroot | 4 ---- data/live-build-config/hooks/15-fuse.chroot | 4 ---- .../live-build-config/hooks/15-sources_list.chroot | 4 ++++ data/live-build-config/hooks/16-fuse.chroot | 4 ++++ .../hooks/16-gen_initramfs.chroot | 4 ---- .../hooks/17-disable_services.chroot | 27 ---------------------- .../hooks/17-gen_initramfs.chroot | 4 ++++ .../hooks/18-disable_services.chroot | 27 ++++++++++++++++++++++ .../hooks/18-kernel_symlinks.chroot | 6 ----- .../hooks/19-kernel_symlinks.chroot | 6 +++++ .../hooks/20-rm_ddclient_hook.chroot | 3 +++ 14 files changed, 57 insertions(+), 51 deletions(-) delete mode 100755 data/live-build-config/hooks/13-firmware-linux-nonfree.chroot create mode 100755 data/live-build-config/hooks/13-vyos_replace.chroot create mode 100755 data/live-build-config/hooks/14-firmware-linux-nonfree.chroot delete mode 100755 data/live-build-config/hooks/14-sources_list.chroot delete mode 100755 data/live-build-config/hooks/15-fuse.chroot create mode 100755 data/live-build-config/hooks/15-sources_list.chroot create mode 100755 data/live-build-config/hooks/16-fuse.chroot delete mode 100755 data/live-build-config/hooks/16-gen_initramfs.chroot delete mode 100755 data/live-build-config/hooks/17-disable_services.chroot create mode 100755 data/live-build-config/hooks/17-gen_initramfs.chroot create mode 100755 data/live-build-config/hooks/18-disable_services.chroot delete mode 100755 data/live-build-config/hooks/18-kernel_symlinks.chroot create mode 100755 data/live-build-config/hooks/19-kernel_symlinks.chroot create mode 100755 data/live-build-config/hooks/20-rm_ddclient_hook.chroot (limited to 'data') diff --git a/data/live-build-config/hooks/13-firmware-linux-nonfree.chroot b/data/live-build-config/hooks/13-firmware-linux-nonfree.chroot deleted file mode 100755 index 3cb7dc6b..00000000 --- a/data/live-build-config/hooks/13-firmware-linux-nonfree.chroot +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -cp /etc/apt/sources.list /etc/apt/sources.list.d/non-free.list -sed -i 's/main/non-free/g' /etc/apt/sources.list.d/non-free.list -apt-get update -apt-get -y install firmware-linux-nonfree diff --git a/data/live-build-config/hooks/13-vyos_replace.chroot b/data/live-build-config/hooks/13-vyos_replace.chroot new file mode 100755 index 00000000..dcb00ff6 --- /dev/null +++ b/data/live-build-config/hooks/13-vyos_replace.chroot @@ -0,0 +1,3 @@ +#!/bin/sh + +apt-get -y install vyos-replace diff --git a/data/live-build-config/hooks/14-firmware-linux-nonfree.chroot b/data/live-build-config/hooks/14-firmware-linux-nonfree.chroot new file mode 100755 index 00000000..3cb7dc6b --- /dev/null +++ b/data/live-build-config/hooks/14-firmware-linux-nonfree.chroot @@ -0,0 +1,6 @@ +#!/bin/sh + +cp /etc/apt/sources.list /etc/apt/sources.list.d/non-free.list +sed -i 's/main/non-free/g' /etc/apt/sources.list.d/non-free.list +apt-get update +apt-get -y install firmware-linux-nonfree diff --git a/data/live-build-config/hooks/14-sources_list.chroot b/data/live-build-config/hooks/14-sources_list.chroot deleted file mode 100755 index 956f9bba..00000000 --- a/data/live-build-config/hooks/14-sources_list.chroot +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -rm -f /etc/apt/sources.list.d/*.list >/dev/null 2>&1 || true - diff --git a/data/live-build-config/hooks/15-fuse.chroot b/data/live-build-config/hooks/15-fuse.chroot deleted file mode 100755 index 126dc626..00000000 --- a/data/live-build-config/hooks/15-fuse.chroot +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -sed -i 's/#user_allow_other/user_allow_other/g' /etc/fuse.conf -chmod a+r /etc/fuse.conf diff --git a/data/live-build-config/hooks/15-sources_list.chroot b/data/live-build-config/hooks/15-sources_list.chroot new file mode 100755 index 00000000..956f9bba --- /dev/null +++ b/data/live-build-config/hooks/15-sources_list.chroot @@ -0,0 +1,4 @@ +#!/bin/sh + +rm -f /etc/apt/sources.list.d/*.list >/dev/null 2>&1 || true + diff --git a/data/live-build-config/hooks/16-fuse.chroot b/data/live-build-config/hooks/16-fuse.chroot new file mode 100755 index 00000000..126dc626 --- /dev/null +++ b/data/live-build-config/hooks/16-fuse.chroot @@ -0,0 +1,4 @@ +#!/bin/sh + +sed -i 's/#user_allow_other/user_allow_other/g' /etc/fuse.conf +chmod a+r /etc/fuse.conf diff --git a/data/live-build-config/hooks/16-gen_initramfs.chroot b/data/live-build-config/hooks/16-gen_initramfs.chroot deleted file mode 100755 index aced728a..00000000 --- a/data/live-build-config/hooks/16-gen_initramfs.chroot +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -echo I: Create initramfs if it does not exist. -update-initramfs -c -k `ls /boot | grep vmlinuz- | sed 's/vmlinuz-//g'` diff --git a/data/live-build-config/hooks/17-disable_services.chroot b/data/live-build-config/hooks/17-disable_services.chroot deleted file mode 100755 index c68a6b3d..00000000 --- a/data/live-build-config/hooks/17-disable_services.chroot +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -echo I: Disabling services. -systemctl disable exim4 -/usr/sbin/update-rc.d -f exim4 remove -systemctl disable isc-dhcp-server -/usr/sbin/update-rc.d -f isc-dhcp-server remove -systemctl disable isc-dhcp-relay -/usr/sbin/update-rc.d -f isc-dhcp-relay remove -systemctl disable nfacctd -/usr/sbin/update-rc.d -f nfacctd remove -systemctl disable pmacctd -/usr/sbin/update-rc.d -f pmacctd remove -systemctl disable sfacctd -/usr/sbin/update-rc.d -f sfacctd remove -systemctl disable uacctd -/usr/sbin/update-rc.d -f uacctd remove -systemctl disable lighttpd -/usr/sbin/update-rc.d -f lighttpd remove -systemctl disable ssh -/usr/sbin/update-rc.d -f ssh remove -systemctl disable openvpn -/usr/sbin/update-rc.d -f openvpn remove -systemctl disable dnsmasq -/usr/sbin/update-rc.d -f dnsmasq remove -systemctl disable lldpd -/usr/sbin/update-rc.d -f lldpd remove diff --git a/data/live-build-config/hooks/17-gen_initramfs.chroot b/data/live-build-config/hooks/17-gen_initramfs.chroot new file mode 100755 index 00000000..aced728a --- /dev/null +++ b/data/live-build-config/hooks/17-gen_initramfs.chroot @@ -0,0 +1,4 @@ +#!/bin/sh + +echo I: Create initramfs if it does not exist. +update-initramfs -c -k `ls /boot | grep vmlinuz- | sed 's/vmlinuz-//g'` diff --git a/data/live-build-config/hooks/18-disable_services.chroot b/data/live-build-config/hooks/18-disable_services.chroot new file mode 100755 index 00000000..c68a6b3d --- /dev/null +++ b/data/live-build-config/hooks/18-disable_services.chroot @@ -0,0 +1,27 @@ +#!/bin/sh + +echo I: Disabling services. +systemctl disable exim4 +/usr/sbin/update-rc.d -f exim4 remove +systemctl disable isc-dhcp-server +/usr/sbin/update-rc.d -f isc-dhcp-server remove +systemctl disable isc-dhcp-relay +/usr/sbin/update-rc.d -f isc-dhcp-relay remove +systemctl disable nfacctd +/usr/sbin/update-rc.d -f nfacctd remove +systemctl disable pmacctd +/usr/sbin/update-rc.d -f pmacctd remove +systemctl disable sfacctd +/usr/sbin/update-rc.d -f sfacctd remove +systemctl disable uacctd +/usr/sbin/update-rc.d -f uacctd remove +systemctl disable lighttpd +/usr/sbin/update-rc.d -f lighttpd remove +systemctl disable ssh +/usr/sbin/update-rc.d -f ssh remove +systemctl disable openvpn +/usr/sbin/update-rc.d -f openvpn remove +systemctl disable dnsmasq +/usr/sbin/update-rc.d -f dnsmasq remove +systemctl disable lldpd +/usr/sbin/update-rc.d -f lldpd remove diff --git a/data/live-build-config/hooks/18-kernel_symlinks.chroot b/data/live-build-config/hooks/18-kernel_symlinks.chroot deleted file mode 100755 index e63ca263..00000000 --- a/data/live-build-config/hooks/18-kernel_symlinks.chroot +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -echo I: Creating kernel symlinks. -cd /boot -ln -s initrd.img-* initrd.img -ln -s vmlinuz-* vmlinuz diff --git a/data/live-build-config/hooks/19-kernel_symlinks.chroot b/data/live-build-config/hooks/19-kernel_symlinks.chroot new file mode 100755 index 00000000..e63ca263 --- /dev/null +++ b/data/live-build-config/hooks/19-kernel_symlinks.chroot @@ -0,0 +1,6 @@ +#!/bin/sh + +echo I: Creating kernel symlinks. +cd /boot +ln -s initrd.img-* initrd.img +ln -s vmlinuz-* vmlinuz diff --git a/data/live-build-config/hooks/20-rm_ddclient_hook.chroot b/data/live-build-config/hooks/20-rm_ddclient_hook.chroot new file mode 100755 index 00000000..173b4e5c --- /dev/null +++ b/data/live-build-config/hooks/20-rm_ddclient_hook.chroot @@ -0,0 +1,3 @@ +#!/bin/sh + +rm -f /etc/dhcp/dhclient-exit-hooks.d/ddclient -- cgit v1.2.3