From ff6f14e5b5030d9ffad533907360f11e16377f8c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zolt=C3=A1n=20Felleg?= Date: Wed, 23 Oct 2019 10:46:16 +0200 Subject: [PATCH] Updated cvms (single nic for efg), nameservers (wait for network-online). --- sources/cvm.usr.f30/01_setupnetworking.sh | 2 +- sources/cvm.usr.f30/etc/systemd/network/10-efg.link | 5 +++++ sources/cvm.usr.f30/etc/systemd/network/10-efgd.link | 5 ----- sources/cvm.usr.f30/etc/systemd/network/10-efgs.link | 5 ----- sources/cvm.usr.f30/packages.txt | 1 + sources/cvmb.usr.f30/01_setupnetworking.sh | 2 +- sources/cvmb.usr.f30/etc/systemd/network/10-efg.link | 2 +- sources/cvmb.usr.f30/packages.txt | 1 + sources/ens.pm.f30/postinstall/04_editfiles.sh | 6 ++++++ sources/pns.pm.f30/postinstall/04_editfiles.sh | 6 ++++++ sources/pns.usr.f30/postinstall/04_editfiles.sh | 6 ++++++ sources/svc.usr.f30/postinstall/04_editfiles.sh | 10 ++++++++++ 12 files changed, 38 insertions(+), 13 deletions(-) create mode 100644 sources/cvm.usr.f30/etc/systemd/network/10-efg.link delete mode 100644 sources/cvm.usr.f30/etc/systemd/network/10-efgd.link delete mode 100644 sources/cvm.usr.f30/etc/systemd/network/10-efgs.link create mode 100755 sources/ens.pm.f30/postinstall/04_editfiles.sh create mode 100755 sources/pns.pm.f30/postinstall/04_editfiles.sh create mode 100755 sources/pns.usr.f30/postinstall/04_editfiles.sh create mode 100755 sources/svc.usr.f30/postinstall/04_editfiles.sh 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 -- 2.54.0