From: Zoltán Felleg <zoltan.felleg@userrendszerhaz.hu>
Date: Thu, 27 Apr 2023 11:48:27 +0000 (+0200)
Subject: Updated fds.in (updated to Fedora 38).
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=4b724942d7049248ebffcd5b4f764c554071015e;p=user-lxc.git

Updated fds.in (updated to Fedora 38).
---

diff --git a/sources/fds.in/c3d/firstboot/scripts/01_setupnetworking.sh b/sources/fds.in/c3d/firstboot/scripts/01_setupnetworking.sh
index c313f18..9f704fb 100755
--- a/sources/fds.in/c3d/firstboot/scripts/01_setupnetworking.sh
+++ b/sources/fds.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:6d53/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:6d53/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 fds.in.useribm.hu
+hostnamectl
diff --git a/sources/fds.in/envvars b/sources/fds.in/envvars
index 2f48359..73b0b7c 100644
--- a/sources/fds.in/envvars
+++ b/sources/fds.in/envvars
@@ -1,4 +1,14 @@
 DISTRIBUTION=Fedora
-DISTRIBUTION_VERSION=37
-SPEC_PACKAGES="389-ds-base acl cockpit cockpit-389-ds cronie"
-SPEC_PACKAGES="$SPEC_PACKAGES openssh-clients openssh-server rsync"
+DISTRIBUTION_VERSION=38
+SPEC_PACKAGES="389-ds-base \
+               acl \
+               cockpit \
+               cockpit-389-ds \
+               cronie \
+               openssh-clients \
+               openssh-server \
+               postfix \
+               python-unversioned-command \
+               rsync \
+               sscg \
+               sssd-client"