From c65f9d7b48587a1e5dfb4fd226a0a731a94b7f57 Mon Sep 17 00:00:00 2001 From: Kim Hagen Date: Thu, 7 Nov 2019 13:42:05 +0100 Subject: prevent 70-persistent-net.rules from being created --- Makefile | 4 +++- tools/vep4600/90-vep4600.chroot | 2 ++ tools/vep4600/vep4600 | 17 +++++++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100755 tools/vep4600/vep4600 diff --git a/Makefile b/Makefile index f5265750..36aa9387 100644 --- a/Makefile +++ b/Makefile @@ -204,8 +204,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 c4bb7496..a88a7de1 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 00000000..4d9c5748 --- /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/ -- cgit v1.2.3