From a048845a6e7c8884937529657f6066c63a0969fa Mon Sep 17 00:00:00 2001 From: Ark74 Date: Wed, 23 Nov 2022 00:41:18 -0600 Subject: [PATCH] netcfg: prevent interfaces file be overwritten with loopback --- helpers/DATA/netcfg/ifupdown.patch | 15 ++++++++++++++- helpers/make-netcfg | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/helpers/DATA/netcfg/ifupdown.patch b/helpers/DATA/netcfg/ifupdown.patch index 616dd74..4ad0b79 100644 --- a/helpers/DATA/netcfg/ifupdown.patch +++ b/helpers/DATA/netcfg/ifupdown.patch @@ -16,7 +16,7 @@ else NM_IS_INSTALLED=false + chroot /target apt-get -y install ifupdown -+ if [ $NETCFG_CONNECTION_TYPE="wireless" ]; then ++ if [ "$NETCFG_CONNECTION_TYPE" = "wireless" ]; then + chroot /target apt-get -y install wireless-tools + fi fi @@ -30,3 +30,16 @@ # netcfg/target_network_config question values CONFIG_NM="nm_config" CONFIG_INTERFACES="ifupdown" +@@ -43,11 +47,7 @@ + if $NM_IS_INSTALLED; then + db_set netcfg/target_network_config $CONFIG_NM + else +- if [ "$NETCFG_CONNECTION_TYPE" = "wired" ]; then +- db_set netcfg/target_network_config $CONFIG_INTERFACES +- else # wireless +- db_set netcfg/target_network_config $CONFIG_LOOPBACK +- fi ++ db_set netcfg/target_network_config $CONFIG_INTERFACES + fi + fi + diff --git a/helpers/make-netcfg b/helpers/make-netcfg index 27fce6b..18f6ef7 100644 --- a/helpers/make-netcfg +++ b/helpers/make-netcfg @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=2.3 +VERSION=2.4 EXTERNAL='deb-src http://ftp.debian.org/debian stable main' REPOKEY=648ACFD622F3D138 NETINST=true