From: Zoltán Felleg <zoltan.felleg@userrendszerhaz.hu>
Date: Wed, 23 Oct 2019 08:46:16 +0000 (+0200)
Subject: Updated cvms (single nic for efg), nameservers (wait for network-online).
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=ff6f14e5b5030d9ffad533907360f11e16377f8c;p=user-lxc.git

Updated cvms (single nic for efg), nameservers (wait for network-online).
---

diff --git a/sources/cvm.usr.f30/01_setupnetworking.sh b/sources/cvm.usr.f30/01_setupnetworking.sh
index 4326842..ee1d450 100755
--- a/sources/cvm.usr.f30/01_setupnetworking.sh
+++ b/sources/cvm.usr.f30/01_setupnetworking.sh
@@ -35,7 +35,7 @@ nmcli connection add \
 
 nmcli connection show
 
-for LXC_DEVICE in efgd efgs ifg svc ldap vpn pns ins
+for LXC_DEVICE in efg ifg svc ldap vpn pns ins
 do
     CONNECTION_LINE=$(nmcli --terse connection show | grep "${LXC_DEVICE}$")
     if [ -n "$CONNECTION_LINE" ]
diff --git a/sources/cvm.usr.f30/etc/systemd/network/10-efg.link b/sources/cvm.usr.f30/etc/systemd/network/10-efg.link
new file mode 100644
index 0000000..613cb07
--- /dev/null
+++ b/sources/cvm.usr.f30/etc/systemd/network/10-efg.link
@@ -0,0 +1,5 @@
+[Match]
+MACAddress=00:50:56:1e:28:92
+
+[Link]
+Name=efg
diff --git a/sources/cvm.usr.f30/etc/systemd/network/10-efgd.link b/sources/cvm.usr.f30/etc/systemd/network/10-efgd.link
deleted file mode 100644
index b96a81b..0000000
--- a/sources/cvm.usr.f30/etc/systemd/network/10-efgd.link
+++ /dev/null
@@ -1,5 +0,0 @@
-[Match]
-MACAddress=00:50:56:1e:41:01
-
-[Link]
-Name=efgd
diff --git a/sources/cvm.usr.f30/etc/systemd/network/10-efgs.link b/sources/cvm.usr.f30/etc/systemd/network/10-efgs.link
deleted file mode 100644
index b421c5b..0000000
--- a/sources/cvm.usr.f30/etc/systemd/network/10-efgs.link
+++ /dev/null
@@ -1,5 +0,0 @@
-[Match]
-MACAddress=00:50:56:1e:d2:01
-
-[Link]
-Name=efgs
diff --git a/sources/cvm.usr.f30/packages.txt b/sources/cvm.usr.f30/packages.txt
index 5c28527..93db914 100644
--- a/sources/cvm.usr.f30/packages.txt
+++ b/sources/cvm.usr.f30/packages.txt
@@ -1,3 +1,4 @@
+chrony
 lxc
 lxc-templates
 mercurial
diff --git a/sources/cvmb.usr.f30/01_setupnetworking.sh b/sources/cvmb.usr.f30/01_setupnetworking.sh
index c65a613..10552fc 100755
--- a/sources/cvmb.usr.f30/01_setupnetworking.sh
+++ b/sources/cvmb.usr.f30/01_setupnetworking.sh
@@ -35,7 +35,7 @@ nmcli connection add \
 
 nmcli connection show
 
-for LXC_DEVICE in efgd efgs ifg svc ldap vpn pns ins
+for LXC_DEVICE in efg ifg svc ldap vpn pns ins
 do
     CONNECTION_LINE=$(nmcli --terse connection show | grep "${LXC_DEVICE}$")
     if [ -n "$CONNECTION_LINE" ]
diff --git a/sources/cvmb.usr.f30/etc/systemd/network/10-efg.link b/sources/cvmb.usr.f30/etc/systemd/network/10-efg.link
index f5569cb..0002de5 100644
--- a/sources/cvmb.usr.f30/etc/systemd/network/10-efg.link
+++ b/sources/cvmb.usr.f30/etc/systemd/network/10-efg.link
@@ -1,5 +1,5 @@
 [Match]
-MACAddress=00:50:56:9e:c2:01
+MACAddress=00:50:56:9e:28:92
 
 [Link]
 Name=efg
diff --git a/sources/cvmb.usr.f30/packages.txt b/sources/cvmb.usr.f30/packages.txt
index 5c28527..93db914 100644
--- a/sources/cvmb.usr.f30/packages.txt
+++ b/sources/cvmb.usr.f30/packages.txt
@@ -1,3 +1,4 @@
+chrony
 lxc
 lxc-templates
 mercurial
diff --git a/sources/ens.pm.f30/postinstall/04_editfiles.sh b/sources/ens.pm.f30/postinstall/04_editfiles.sh
new file mode 100755
index 0000000..097b9b0
--- /dev/null
+++ b/sources/ens.pm.f30/postinstall/04_editfiles.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+
+sed --in-place=.orig \
+    's/^After=\(.*\)network\.target\(.*\)$/After=\1network-online.target\2/' \
+    /usr/lib/systemd/system/named.service
diff --git a/sources/pns.pm.f30/postinstall/04_editfiles.sh b/sources/pns.pm.f30/postinstall/04_editfiles.sh
new file mode 100755
index 0000000..097b9b0
--- /dev/null
+++ b/sources/pns.pm.f30/postinstall/04_editfiles.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+
+sed --in-place=.orig \
+    's/^After=\(.*\)network\.target\(.*\)$/After=\1network-online.target\2/' \
+    /usr/lib/systemd/system/named.service
diff --git a/sources/pns.usr.f30/postinstall/04_editfiles.sh b/sources/pns.usr.f30/postinstall/04_editfiles.sh
new file mode 100755
index 0000000..097b9b0
--- /dev/null
+++ b/sources/pns.usr.f30/postinstall/04_editfiles.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+
+sed --in-place=.orig \
+    's/^After=\(.*\)network\.target\(.*\)$/After=\1network-online.target\2/' \
+    /usr/lib/systemd/system/named.service
diff --git a/sources/svc.usr.f30/postinstall/04_editfiles.sh b/sources/svc.usr.f30/postinstall/04_editfiles.sh
new file mode 100755
index 0000000..0aa3be0
--- /dev/null
+++ b/sources/svc.usr.f30/postinstall/04_editfiles.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+
+sed --in-place=.orig \
+    's/^After=\(.*\)network\.target\(.*\)$/After=\1network-online.target\2/' \
+    /usr/lib/systemd/system/named.service
+
+sed --in-place=.orig \
+    's/^After=\(.*\)network\.target\(.*\)$/After=\1network-online.target\2/' \
+    /usr/lib/systemd/system/postfix.service