Updated wiki.in (updated to Fedora 38).

diff --git a/sources/wiki.in/c3d/firstboot/scripts/01_setupnetworking.sh b/sources/wiki.in/c3d/firstboot/scripts/01_setupnetworking.sh
index 3d6d32ffd6c1f2e441fb0cc384b8a70ade17b4fa..6c7188c3a55c698c65fe53a7b739b6b70c3ec95e 100755 (executable)
--- a/sources/wiki.in/c3d/firstboot/scripts/01_setupnetworking.sh
+++ b/sources/wiki.in/c3d/firstboot/scripts/01_setupnetworking.sh
@@ -14,6 +14,10 @@ do
     then
         exit 1
     fi
+    if [ $CYCLES_WAITED -eq 0 ]
+    then
+        echo -n "Waiting for NetworkManager"
+    fi
     echo -n .
     sleep 1
     CYCLES_WAITED=$(( $CYCLES_WAITED + 1 ))
@@ -22,17 +26,21 @@ 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
         nmcli connection show
         exit 1
     fi
+    if [ $CYCLES_WAITED -eq 0 ]
+    then
+        echo -n "Waiting for the network connection"
+    fi
     echo -n .
     sleep 1
     CYCLES_WAITED=$(( $CYCLES_WAITED + 1 ))
@@ -42,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:6def/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 \
@@ -64,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:6def/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 sns.in.useribm.hu
+hostnamectl

diff --git a/sources/wiki.in/envvars b/sources/wiki.in/envvars
index 48a1b9985a1fd331cd995357db4e553dbbc9dc56..16b0dc3d4a0bf305ec84468f1d2c1aa4485a7a26 100644 (file)
--- a/sources/wiki.in/envvars
+++ b/sources/wiki.in/envvars
@@ -1,3 +1,7 @@
 DISTRIBUTION=Fedora
-DISTRIBUTION_VERSION=37
-SPEC_PACKAGES="dokuwiki httpd php php-fpm php-ldap"
+DISTRIBUTION_VERSION=38
+SPEC_PACKAGES="dokuwiki \
+               httpd \
+               php \
+               php-fpm \
+               php-ldap"