Merge branch 'current' of github.com:vyos/vyos-build into current

8 files changed, 12 insertions, 0 deletions

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/13-sources_list.chroot b/data/live-build-config/hooks/15-sources_list.chroot
index 956f9bba..956f9bba 100755
--- a/data/live-build-config/hooks/13-sources_list.chroot
+++ b/data/live-build-config/hooks/15-sources_list.chroot
diff --git a/data/live-build-config/hooks/14-fuse.chroot b/data/live-build-config/hooks/16-fuse.chroot
index 126dc626..126dc626 100755
--- a/data/live-build-config/hooks/14-fuse.chroot
+++ b/data/live-build-config/hooks/16-fuse.chroot
diff --git a/data/live-build-config/hooks/15-gen_initramfs.chroot b/data/live-build-config/hooks/17-gen_initramfs.chroot
index aced728a..aced728a 100755
--- a/data/live-build-config/hooks/15-gen_initramfs.chroot
+++ b/data/live-build-config/hooks/17-gen_initramfs.chroot
diff --git a/data/live-build-config/hooks/16-disable_services.chroot b/data/live-build-config/hooks/18-disable_services.chroot
index c68a6b3d..c68a6b3d 100755
--- a/data/live-build-config/hooks/16-disable_services.chroot
+++ b/data/live-build-config/hooks/18-disable_services.chroot
diff --git a/data/live-build-config/hooks/17-kernel_symlinks.chroot b/data/live-build-config/hooks/19-kernel_symlinks.chroot
index e63ca263..e63ca263 100755
--- a/data/live-build-config/hooks/17-kernel_symlinks.chroot
+++ b/data/live-build-config/hooks/19-kernel_symlinks.chroot
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