summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKim Hagen <kim.sidney@gmail.com>2019-11-07 13:42:05 +0100
committerKim Hagen <kim.sidney@gmail.com>2019-12-03 15:47:18 +0100
commit14d6de44d12b70bba43653d10d17906772f9372e (patch)
tree400abdd8f64fdb61eaa38c0a44ba754e14bfd7f8
parent0a1ecf4928022c076c2b1275cc1369e528590da0 (diff)
downloadvyos-build-14d6de44d12b70bba43653d10d17906772f9372e.tar.gz
vyos-build-14d6de44d12b70bba43653d10d17906772f9372e.zip
prevent 70-persistent-net.rules from being created
-rw-r--r--Makefile4
-rwxr-xr-xtools/vep4600/90-vep4600.chroot2
-rwxr-xr-xtools/vep4600/vep460017
3 files changed, 22 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 7b31925..8903200 100644
--- a/Makefile
+++ b/Makefile
@@ -196,8 +196,10 @@ vep4600: check_build_config clean prepare
@set -e
@echo "It's not like I'm building this specially for you or anything!"
mkdir -p build/config/includes.chroot/etc/systemd/network
+ mkdir -p build/config/includes.chroot/usr/share/initramfs-tools/hooks
cp tools/vep4600/90-vep4600.chroot build/config/hooks/live/
- cp tools/vep4600/*.link build/config/includes.chroot/etc/systemd/network
+ cp tools/vep4600/*.link build/config/includes.chroot/etc/systemd/network/
+ cp tools/vep4600/vep4600 build/config/includes.chroot/usr/share/initramfs-tools/hooks/
cd $(build_dir)
lb build 2>&1 | tee build.log
cd ..
diff --git a/tools/vep4600/90-vep4600.chroot b/tools/vep4600/90-vep4600.chroot
index c4bb749..a88a7de 100755
--- a/tools/vep4600/90-vep4600.chroot
+++ b/tools/vep4600/90-vep4600.chroot
@@ -9,6 +9,8 @@ rm /lib/systemd/network/99-default.link
touch /lib/systemd/network/99-default.link
rm /lib/udev/rules.d/65-vyatta-net.rules
touch /lib/udev/rules.d/65-vyatta-net.rules
+rm /lib/udev/rules.d/75-persistent-net-generator.rules
+touch /lib/udev/rules.d/75-persistent-net-generator.rules
echo I: Update initramfs.
update-initramfs -u
diff --git a/tools/vep4600/vep4600 b/tools/vep4600/vep4600
new file mode 100755
index 0000000..4d9c574
--- /dev/null
+++ b/tools/vep4600/vep4600
@@ -0,0 +1,17 @@
+#!/bin/sh -e
+
+PREREQS=""
+
+prereqs() { echo "$PREREQS"; }
+
+case "$1" in
+ prereqs)
+ prereqs
+ exit 0
+ ;;
+esac
+
+. /usr/share/initramfs-tools/hook-functions
+
+mkdir -p $DESTDIR/etc/systemd/network
+cp -p /etc/systemd/network/*.link $DESTDIR/etc/systemd/network/