From d63ac28d5a1d1822c45793aa386c58e1fada1704 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Zolt=C3=A1n=20Felleg?= <zoltan.felleg@userrendszerhaz.hu>
Date: Fri, 20 Sep 2019 15:33:29 +0200
Subject: [PATCH] Updated efg.pm.f30 and ifg.usr.f30 (fixed nft include
 statement, removed old files).

---
 .../install/etc/sysconfig/nftables.conf       |  2 +-
 .../firstboot/01_setupnetworking.sh           |  8 --------
 .../postinstall/install/etc/sysconfig/network |  1 -
 .../etc/sysconfig/network-scripts/ifcfg-eth0  | 16 ----------------
 .../etc/sysconfig/network-scripts/ifcfg-ifg   | 19 -------------------
 .../etc/sysconfig/network-scripts/route-ifg   |  2 --
 .../install/etc/sysconfig/nftables.conf       |  2 +-
 7 files changed, 2 insertions(+), 48 deletions(-)
 delete mode 100644 sources/ifg.usr.f30/postinstall/install/etc/sysconfig/network
 delete mode 100644 sources/ifg.usr.f30/postinstall/install/etc/sysconfig/network-scripts/ifcfg-eth0
 delete mode 100644 sources/ifg.usr.f30/postinstall/install/etc/sysconfig/network-scripts/ifcfg-ifg
 delete mode 100644 sources/ifg.usr.f30/postinstall/install/etc/sysconfig/network-scripts/route-ifg

diff --git a/sources/efg.pm.f30/postinstall/install/etc/sysconfig/nftables.conf b/sources/efg.pm.f30/postinstall/install/etc/sysconfig/nftables.conf
index b25a4e2..0c461d7 100644
--- a/sources/efg.pm.f30/postinstall/install/etc/sysconfig/nftables.conf
+++ b/sources/efg.pm.f30/postinstall/install/etc/sysconfig/nftables.conf
@@ -1 +1 @@
-include /etc/nftables/efg.nft
+include "/etc/nftables/efg.nft"
diff --git a/sources/ifg.usr.f30/firstboot/01_setupnetworking.sh b/sources/ifg.usr.f30/firstboot/01_setupnetworking.sh
index f8c1498..3c31156 100755
--- a/sources/ifg.usr.f30/firstboot/01_setupnetworking.sh
+++ b/sources/ifg.usr.f30/firstboot/01_setupnetworking.sh
@@ -42,14 +42,6 @@ done
 INTERNAL_DEVICE=ifg
 PM_DEVICE=eth0
 
-#CONNECTION_LINE_INTERNAL=$(nmcli --terse connection show | grep ":${INTERNAL_DEVICE}$")
-#CONNECTION_LINE_PM=$(nmcli --terse connection show | grep ":${PM_DEVICE}$")
-#CONNECTION_UUID_INTERNAL=$(echo $CONNECTION_LINE_INTERNAL | cut -f 2 -d ':')
-#CONNECTION_UUID_PM=$(echo $CONNECTION_LINE_PM | cut -f 2 -d ':')
-
-#nmcli connection delete uuid "$CONNECTION_UUID_INTERNAL"
-#nmcli connection delete uuid "$CONNECTION_UUID_PM"
-
 nmcli connection add \
     connection.autoconnect yes \
     connection.id internal \
diff --git a/sources/ifg.usr.f30/postinstall/install/etc/sysconfig/network b/sources/ifg.usr.f30/postinstall/install/etc/sysconfig/network
deleted file mode 100644
index 5b2803b..0000000
--- a/sources/ifg.usr.f30/postinstall/install/etc/sysconfig/network
+++ /dev/null
@@ -1 +0,0 @@
-NOZEROCONF=yes
diff --git a/sources/ifg.usr.f30/postinstall/install/etc/sysconfig/network-scripts/ifcfg-eth0 b/sources/ifg.usr.f30/postinstall/install/etc/sysconfig/network-scripts/ifcfg-eth0
deleted file mode 100644
index d53531e..0000000
--- a/sources/ifg.usr.f30/postinstall/install/etc/sysconfig/network-scripts/ifcfg-eth0
+++ /dev/null
@@ -1,16 +0,0 @@
-NAME=eth0
-DEVICE=eth0
-TYPE=Ethernet
-ONBOOT=yes
-BOOTPROTO=static
-IPADDR=192.168.173.1
-PREFIX=24
-DEFROUTE=yes
-GATEWAY=192.168.173.254
-IPV4_FAILURE_FATAL=no
-IPV6INIT=yes
-IPV6_AUTOCONF=yes
-IPV6_DEFROUTE=yes
-IPV6_PEERDNS=yes
-IPV6_PEERROUTES=yes
-IPV6_FAILURE_FATAL=no
diff --git a/sources/ifg.usr.f30/postinstall/install/etc/sysconfig/network-scripts/ifcfg-ifg b/sources/ifg.usr.f30/postinstall/install/etc/sysconfig/network-scripts/ifcfg-ifg
deleted file mode 100644
index b28e8ce..0000000
--- a/sources/ifg.usr.f30/postinstall/install/etc/sysconfig/network-scripts/ifcfg-ifg
+++ /dev/null
@@ -1,19 +0,0 @@
-NAME=ifg
-DEVICE=ifg
-TYPE=Ethernet
-ONBOOT=yes
-BOOTPROTO=none
-IPADDR0=10.228.109.254
-PREFIX0=16
-IPADDR1=192.168.42.254
-PREFIX1=24
-IPADDR2=192.168.43.254
-PREFIX2=24
-DEFROUTE=no
-IPV4_FAILURE_FATAL=no
-IPV6INIT=yes
-IPV6_AUTOCONF=yes
-IPV6_DEFROUTE=yes
-IPV6_PEERDNS=yes
-IPV6_PEERROUTES=yes
-IPV6_FAILURE_FATAL=no
diff --git a/sources/ifg.usr.f30/postinstall/install/etc/sysconfig/network-scripts/route-ifg b/sources/ifg.usr.f30/postinstall/install/etc/sysconfig/network-scripts/route-ifg
deleted file mode 100644
index 9bc258f..0000000
--- a/sources/ifg.usr.f30/postinstall/install/etc/sysconfig/network-scripts/route-ifg
+++ /dev/null
@@ -1,2 +0,0 @@
-10.162.104.0/24 via 10.228.109.236
-172.16.223.0/24 via 10.228.109.236
diff --git a/sources/ifg.usr.f30/postinstall/install/etc/sysconfig/nftables.conf b/sources/ifg.usr.f30/postinstall/install/etc/sysconfig/nftables.conf
index e6bf91c..a6d184f 100644
--- a/sources/ifg.usr.f30/postinstall/install/etc/sysconfig/nftables.conf
+++ b/sources/ifg.usr.f30/postinstall/install/etc/sysconfig/nftables.conf
@@ -1 +1 @@
-include /etc/nftables/ifg.nft
+include "/etc/nftables/ifg.nft"
-- 
2.54.0