From df6d648e1edb2777142779aacc0bc3eab87c5852 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Zolt=C3=A1n=20Felleg?= <zoltan.felleg@userrendszerhaz.hu>
Date: Thu, 25 May 2023 18:42:37 +0200
Subject: [PATCH] Updated mx.in (updated to Fedora 38).

---
 .../firstboot/scripts/01_setupnetworking.sh   | 24 +++++++++++--------
 .../c3d/firstboot/scripts/10_setuppostfix.sh  |  4 ++++
 sources/mx.in/envvars                         |  2 +-
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/sources/mx.in/c3d/firstboot/scripts/01_setupnetworking.sh b/sources/mx.in/c3d/firstboot/scripts/01_setupnetworking.sh
index 3c833fc..5477da1 100755
--- a/sources/mx.in/c3d/firstboot/scripts/01_setupnetworking.sh
+++ b/sources/mx.in/c3d/firstboot/scripts/01_setupnetworking.sh
@@ -26,11 +26,11 @@ do
 done
 [ $CYCLES_WAITED -gt 0 ] && echo
 
-# wait for one/the network connection to come up
+# wait for the two network connections to come up
 CONNECTION_DEVICES_UP=$(nmcli --terse connection show \
                             | grep --invert-match ':$' | wc -l)
 CYCLES_WAITED=0
-while [ $CONNECTION_DEVICES_UP -lt 1 ]
+while [ $CONNECTION_DEVICES_UP -lt 2 ]
 do
     if [ $CYCLES_WAITED -ge 10 ]
     then
@@ -50,18 +50,23 @@ done
 [ $CYCLES_WAITED -gt 0 ] && echo
 
 CONNECTIONS=$(nmcli --terse connection show | wc -l)
-if [ $CONNECTIONS -ne 1 ]
+if [ $CONNECTIONS -ne 2 ]
 then
-    echo "Number of connections: $CONNECTIONS" >&2
+    echo "Number of connections: $CONNECTIONS instead of 2" >&2
     exit 1
 fi
 
-CONNECTION_LINE=$(nmcli --terse connection show)
+CONNECTION_LINE=$(nmcli --terse connection show | grep ':eth0$')
 CONNECTION_UUID=$(echo $CONNECTION_LINE | cut -f 2 -d ':')
 CONNECTION_DEVICE=$(echo $CONNECTION_LINE | cut -f 4 -d ':')
 
 nmcli connection delete uuid "$CONNECTION_UUID"
 
+#    ipv6.addresses "2a02:d400:0000:f268:000c:18ff:fe03:6d9a/64" \
+#    ipv6.dns "2a02:d400:0000:f268:000c:18ff:fe03:6d9f, 2a02:d400:0000:f268:000c:18ff:fe03:5c9f" \
+#    ipv6.dns-search "in.useribm.hu" \
+#    ipv6.gateway "2a02:d400:0000:f268:000c:18ff:fe03:6dfe" \
+#    ipv6.method "manual" \
 nmcli connection add \
     connection.autoconnect yes \
     connection.id internal \
@@ -72,11 +77,10 @@ nmcli connection add \
     ipv4.dns-search "in.useribm.hu" \
     ipv4.gateway "10.228.109.254" \
     ipv4.method "manual" \
-    ipv6.addresses "2a02:d400:0000:f268:000c:18ff:fe03:6d9a/64" \
-    ipv6.dns "2a02:d400:0000:f268:000c:18ff:fe03:6d9f, 2a02:d400:0000:f268:000c:18ff:fe03:5c9f" \
-    ipv6.dns-search "in.useribm.hu" \
-    ipv6.gateway "2a02:d400:0000:f268:000c:18ff:fe03:6dfe" \
-    ipv6.method "manual" \
+    ipv6.method "disabled" \
     save yes
 
 nmcli connection show
+
+hostnamectl hostname mx.in.useribm.hu
+hostnamectl
diff --git a/sources/mx.in/c3d/firstboot/scripts/10_setuppostfix.sh b/sources/mx.in/c3d/firstboot/scripts/10_setuppostfix.sh
index 50fd6d5..0acf1f9 100755
--- a/sources/mx.in/c3d/firstboot/scripts/10_setuppostfix.sh
+++ b/sources/mx.in/c3d/firstboot/scripts/10_setuppostfix.sh
@@ -1,6 +1,10 @@
 #!/bin/sh
 
 
+sed --in-place=.orig \
+    --expression='s/^#\(submission \+inet \+n\)/\1/' \
+    /etc/postfix/master.cf
+
 postconf myorigin='$myhostname'
 postconf inet_interfaces='all'
 postconf inet_protocols='ipv4'
diff --git a/sources/mx.in/envvars b/sources/mx.in/envvars
index 4232ccb..b0385ff 100644
--- a/sources/mx.in/envvars
+++ b/sources/mx.in/envvars
@@ -1,3 +1,3 @@
 DISTRIBUTION=Fedora
-DISTRIBUTION_VERSION=37
+DISTRIBUTION_VERSION=38
 SPEC_PACKAGES="postfix"
-- 
2.54.0