From ed7d3d112f99b677421bf768825fdaf8e1984d64 Mon Sep 17 00:00:00 2001 From: Braiden Vasco Date: Wed, 5 Jul 2017 08:58:12 +0000 Subject: [PATCH] Remove network persistence patch --- build.sh | 6 ------ patches/02-persistant-net.diff | 11 ----------- patches/series | 1 - 3 files changed, 18 deletions(-) delete mode 100644 patches/02-persistant-net.diff diff --git a/build.sh b/build.sh index 9795368..d84e3ce 100755 --- a/build.sh +++ b/build.sh @@ -226,12 +226,6 @@ EOF ## # Configure network. # -apply_patches '02-persistant-net.diff' - -on_chroot << EOF -dpkg-divert --add --local /lib/udev/rules.d/75-persistent-net-generator.rules -EOF - install -m 644 files/resolv.conf "$ROOTFS_DIR/etc/" install -m 644 files/interfaces "$ROOTFS_DIR/etc/network/interfaces" install -m 644 files/ipv6.conf "$ROOTFS_DIR/etc/modprobe.d/ipv6.conf" diff --git a/patches/02-persistant-net.diff b/patches/02-persistant-net.diff deleted file mode 100644 index b0f2dee..0000000 --- a/patches/02-persistant-net.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- rootfs.orig/lib/udev/rules.d/75-persistent-net-generator.rules -+++ rootfs/lib/udev/rules.d/75-persistent-net-generator.rules -@@ -22,7 +22,7 @@ IMPORT{cmdline}="net.ifnames" - ENV{net.ifnames}=="1", GOTO="persistent_net_generator_end" - - # device name whitelist --KERNEL!="eth*|ath*|wlan*[0-9]|msh*|ra*|sta*|ctc*|lcs*|hsi*", \ -+KERNEL!="ath*|msh*|ra*|sta*|ctc*|lcs*|hsi*", \ - GOTO="persistent_net_generator_end" - - # ignore Xen virtual interfaces diff --git a/patches/series b/patches/series index 9db89dc..33dfd84 100644 --- a/patches/series +++ b/patches/series @@ -1,5 +1,4 @@ 01-no-root-login.diff -02-persistant-net.diff 03-bashrc.diff 04-useradd.diff 05-swap.diff