From be47ea1eedda09c93ede4f97ff2c7dccee444d94 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zolt=C3=A1n=20Felleg?= Date: Fri, 17 May 2019 17:30:23 +0200 Subject: [PATCH] Upgraded ifg.usr.f29 to ifg.usr.f30. --- sources/cvm.usr.f30/01_setupnetworking.sh | 13 +++++++++++++ sources/{ifg.usr.f29 => ifg.usr.f30}/config | 0 sources/{ifg.usr.f29 => ifg.usr.f30}/envvars | 0 .../firstboot/01_setupnetworking.sh | 0 .../firstboot/02_settimezone.sh | 0 .../firstboot/03_setupldap.sh | 0 .../firstboot/10_iptables_reset.sh | 0 .../firstboot/11_iptables_set_ifg_rules.sh | 0 .../firstboot/12_iptables_log_dropped.sh | 0 .../firstboot/13_iptables_save.sh | 0 .../firstboot/99_cleanup.sh | 0 .../firstboot/definitions | 0 .../firstboot/traversal.txt | 0 .../postinstall/01_setownership.sh | 0 .../postinstall/02_setpermissions.sh | 0 .../postinstall/03_installfiles.sh | 0 .../postinstall/10_setupservices.sh | 0 .../postinstall/99_cleanup.sh | 0 .../postinstall/install/etc/hosts | 0 .../postinstall/install/etc/resolv.conf | 0 .../postinstall/install/etc/sysconfig/network | 0 .../etc/sysconfig/network-scripts/ifcfg-eth0 | 0 .../install/etc/sysconfig/network-scripts/ifcfg-ifg | 0 .../install/etc/sysconfig/network-scripts/route-ifg | 0 .../install/etc/sysctl.d/01_ipforward.conf | 0 25 files changed, 13 insertions(+) rename sources/{ifg.usr.f29 => ifg.usr.f30}/config (100%) rename sources/{ifg.usr.f29 => ifg.usr.f30}/envvars (100%) rename sources/{ifg.usr.f29 => ifg.usr.f30}/firstboot/01_setupnetworking.sh (100%) rename sources/{ifg.usr.f29 => ifg.usr.f30}/firstboot/02_settimezone.sh (100%) rename sources/{ifg.usr.f29 => ifg.usr.f30}/firstboot/03_setupldap.sh (100%) rename sources/{ifg.usr.f29 => ifg.usr.f30}/firstboot/10_iptables_reset.sh (100%) rename sources/{ifg.usr.f29 => ifg.usr.f30}/firstboot/11_iptables_set_ifg_rules.sh (100%) rename sources/{ifg.usr.f29 => ifg.usr.f30}/firstboot/12_iptables_log_dropped.sh (100%) rename sources/{ifg.usr.f29 => ifg.usr.f30}/firstboot/13_iptables_save.sh (100%) rename sources/{ifg.usr.f29 => ifg.usr.f30}/firstboot/99_cleanup.sh (100%) rename sources/{ifg.usr.f29 => ifg.usr.f30}/firstboot/definitions (100%) rename sources/{ifg.usr.f29 => ifg.usr.f30}/firstboot/traversal.txt (100%) rename sources/{ifg.usr.f29 => ifg.usr.f30}/postinstall/01_setownership.sh (100%) rename sources/{ifg.usr.f29 => ifg.usr.f30}/postinstall/02_setpermissions.sh (100%) rename sources/{ifg.usr.f29 => ifg.usr.f30}/postinstall/03_installfiles.sh (100%) rename sources/{ifg.usr.f29 => ifg.usr.f30}/postinstall/10_setupservices.sh (100%) rename sources/{ifg.usr.f29 => ifg.usr.f30}/postinstall/99_cleanup.sh (100%) rename sources/{ifg.usr.f29 => ifg.usr.f30}/postinstall/install/etc/hosts (100%) rename sources/{ifg.usr.f29 => ifg.usr.f30}/postinstall/install/etc/resolv.conf (100%) rename sources/{ifg.usr.f29 => ifg.usr.f30}/postinstall/install/etc/sysconfig/network (100%) rename sources/{ifg.usr.f29 => ifg.usr.f30}/postinstall/install/etc/sysconfig/network-scripts/ifcfg-eth0 (100%) rename sources/{ifg.usr.f29 => ifg.usr.f30}/postinstall/install/etc/sysconfig/network-scripts/ifcfg-ifg (100%) rename sources/{ifg.usr.f29 => ifg.usr.f30}/postinstall/install/etc/sysconfig/network-scripts/route-ifg (100%) rename sources/{ifg.usr.f29 => ifg.usr.f30}/postinstall/install/etc/sysctl.d/01_ipforward.conf (100%) diff --git a/sources/cvm.usr.f30/01_setupnetworking.sh b/sources/cvm.usr.f30/01_setupnetworking.sh index aaa4925..4326842 100755 --- a/sources/cvm.usr.f30/01_setupnetworking.sh +++ b/sources/cvm.usr.f30/01_setupnetworking.sh @@ -20,6 +20,19 @@ nmcli connection add \ ipv6.method "ignore" \ save yes +HOST_BRIDGE_DEVICE=brh +CONNECTION_LINE=$(nmcli --terse connection show | grep "${HOST_BRIDGE_DEVICE}$") +CONNECTION_UUID=$(echo $CONNECTION_LINE | cut -f 2 -d ':') + +nmcli connection delete uuid "$CONNECTION_UUID" + +nmcli connection add \ + connection.autoconnect yes \ + connection.id brh \ + connection.interface-name $HOST_BRIDGE_DEVICE \ + connection.type bridge \ + save yes + nmcli connection show for LXC_DEVICE in efgd efgs ifg svc ldap vpn pns ins diff --git a/sources/ifg.usr.f29/config b/sources/ifg.usr.f30/config similarity index 100% rename from sources/ifg.usr.f29/config rename to sources/ifg.usr.f30/config diff --git a/sources/ifg.usr.f29/envvars b/sources/ifg.usr.f30/envvars similarity index 100% rename from sources/ifg.usr.f29/envvars rename to sources/ifg.usr.f30/envvars diff --git a/sources/ifg.usr.f29/firstboot/01_setupnetworking.sh b/sources/ifg.usr.f30/firstboot/01_setupnetworking.sh similarity index 100% rename from sources/ifg.usr.f29/firstboot/01_setupnetworking.sh rename to sources/ifg.usr.f30/firstboot/01_setupnetworking.sh diff --git a/sources/ifg.usr.f29/firstboot/02_settimezone.sh b/sources/ifg.usr.f30/firstboot/02_settimezone.sh similarity index 100% rename from sources/ifg.usr.f29/firstboot/02_settimezone.sh rename to sources/ifg.usr.f30/firstboot/02_settimezone.sh diff --git a/sources/ifg.usr.f29/firstboot/03_setupldap.sh b/sources/ifg.usr.f30/firstboot/03_setupldap.sh similarity index 100% rename from sources/ifg.usr.f29/firstboot/03_setupldap.sh rename to sources/ifg.usr.f30/firstboot/03_setupldap.sh diff --git a/sources/ifg.usr.f29/firstboot/10_iptables_reset.sh b/sources/ifg.usr.f30/firstboot/10_iptables_reset.sh similarity index 100% rename from sources/ifg.usr.f29/firstboot/10_iptables_reset.sh rename to sources/ifg.usr.f30/firstboot/10_iptables_reset.sh diff --git a/sources/ifg.usr.f29/firstboot/11_iptables_set_ifg_rules.sh b/sources/ifg.usr.f30/firstboot/11_iptables_set_ifg_rules.sh similarity index 100% rename from sources/ifg.usr.f29/firstboot/11_iptables_set_ifg_rules.sh rename to sources/ifg.usr.f30/firstboot/11_iptables_set_ifg_rules.sh diff --git a/sources/ifg.usr.f29/firstboot/12_iptables_log_dropped.sh b/sources/ifg.usr.f30/firstboot/12_iptables_log_dropped.sh similarity index 100% rename from sources/ifg.usr.f29/firstboot/12_iptables_log_dropped.sh rename to sources/ifg.usr.f30/firstboot/12_iptables_log_dropped.sh diff --git a/sources/ifg.usr.f29/firstboot/13_iptables_save.sh b/sources/ifg.usr.f30/firstboot/13_iptables_save.sh similarity index 100% rename from sources/ifg.usr.f29/firstboot/13_iptables_save.sh rename to sources/ifg.usr.f30/firstboot/13_iptables_save.sh diff --git a/sources/ifg.usr.f29/firstboot/99_cleanup.sh b/sources/ifg.usr.f30/firstboot/99_cleanup.sh similarity index 100% rename from sources/ifg.usr.f29/firstboot/99_cleanup.sh rename to sources/ifg.usr.f30/firstboot/99_cleanup.sh diff --git a/sources/ifg.usr.f29/firstboot/definitions b/sources/ifg.usr.f30/firstboot/definitions similarity index 100% rename from sources/ifg.usr.f29/firstboot/definitions rename to sources/ifg.usr.f30/firstboot/definitions diff --git a/sources/ifg.usr.f29/firstboot/traversal.txt b/sources/ifg.usr.f30/firstboot/traversal.txt similarity index 100% rename from sources/ifg.usr.f29/firstboot/traversal.txt rename to sources/ifg.usr.f30/firstboot/traversal.txt diff --git a/sources/ifg.usr.f29/postinstall/01_setownership.sh b/sources/ifg.usr.f30/postinstall/01_setownership.sh similarity index 100% rename from sources/ifg.usr.f29/postinstall/01_setownership.sh rename to sources/ifg.usr.f30/postinstall/01_setownership.sh diff --git a/sources/ifg.usr.f29/postinstall/02_setpermissions.sh b/sources/ifg.usr.f30/postinstall/02_setpermissions.sh similarity index 100% rename from sources/ifg.usr.f29/postinstall/02_setpermissions.sh rename to sources/ifg.usr.f30/postinstall/02_setpermissions.sh diff --git a/sources/ifg.usr.f29/postinstall/03_installfiles.sh b/sources/ifg.usr.f30/postinstall/03_installfiles.sh similarity index 100% rename from sources/ifg.usr.f29/postinstall/03_installfiles.sh rename to sources/ifg.usr.f30/postinstall/03_installfiles.sh diff --git a/sources/ifg.usr.f29/postinstall/10_setupservices.sh b/sources/ifg.usr.f30/postinstall/10_setupservices.sh similarity index 100% rename from sources/ifg.usr.f29/postinstall/10_setupservices.sh rename to sources/ifg.usr.f30/postinstall/10_setupservices.sh diff --git a/sources/ifg.usr.f29/postinstall/99_cleanup.sh b/sources/ifg.usr.f30/postinstall/99_cleanup.sh similarity index 100% rename from sources/ifg.usr.f29/postinstall/99_cleanup.sh rename to sources/ifg.usr.f30/postinstall/99_cleanup.sh diff --git a/sources/ifg.usr.f29/postinstall/install/etc/hosts b/sources/ifg.usr.f30/postinstall/install/etc/hosts similarity index 100% rename from sources/ifg.usr.f29/postinstall/install/etc/hosts rename to sources/ifg.usr.f30/postinstall/install/etc/hosts diff --git a/sources/ifg.usr.f29/postinstall/install/etc/resolv.conf b/sources/ifg.usr.f30/postinstall/install/etc/resolv.conf similarity index 100% rename from sources/ifg.usr.f29/postinstall/install/etc/resolv.conf rename to sources/ifg.usr.f30/postinstall/install/etc/resolv.conf diff --git a/sources/ifg.usr.f29/postinstall/install/etc/sysconfig/network b/sources/ifg.usr.f30/postinstall/install/etc/sysconfig/network similarity index 100% rename from sources/ifg.usr.f29/postinstall/install/etc/sysconfig/network rename to sources/ifg.usr.f30/postinstall/install/etc/sysconfig/network diff --git a/sources/ifg.usr.f29/postinstall/install/etc/sysconfig/network-scripts/ifcfg-eth0 b/sources/ifg.usr.f30/postinstall/install/etc/sysconfig/network-scripts/ifcfg-eth0 similarity index 100% rename from sources/ifg.usr.f29/postinstall/install/etc/sysconfig/network-scripts/ifcfg-eth0 rename to sources/ifg.usr.f30/postinstall/install/etc/sysconfig/network-scripts/ifcfg-eth0 diff --git a/sources/ifg.usr.f29/postinstall/install/etc/sysconfig/network-scripts/ifcfg-ifg b/sources/ifg.usr.f30/postinstall/install/etc/sysconfig/network-scripts/ifcfg-ifg similarity index 100% rename from sources/ifg.usr.f29/postinstall/install/etc/sysconfig/network-scripts/ifcfg-ifg rename to sources/ifg.usr.f30/postinstall/install/etc/sysconfig/network-scripts/ifcfg-ifg diff --git a/sources/ifg.usr.f29/postinstall/install/etc/sysconfig/network-scripts/route-ifg b/sources/ifg.usr.f30/postinstall/install/etc/sysconfig/network-scripts/route-ifg similarity index 100% rename from sources/ifg.usr.f29/postinstall/install/etc/sysconfig/network-scripts/route-ifg rename to sources/ifg.usr.f30/postinstall/install/etc/sysconfig/network-scripts/route-ifg diff --git a/sources/ifg.usr.f29/postinstall/install/etc/sysctl.d/01_ipforward.conf b/sources/ifg.usr.f30/postinstall/install/etc/sysctl.d/01_ipforward.conf similarity index 100% rename from sources/ifg.usr.f29/postinstall/install/etc/sysctl.d/01_ipforward.conf rename to sources/ifg.usr.f30/postinstall/install/etc/sysctl.d/01_ipforward.conf -- 2.54.0