From: Zoltán Felleg <zoltan.felleg@userrendszerhaz.hu>
Date: Mon, 7 Mar 2022 12:24:50 +0000 (+0100)
Subject: Updated sns.in (converted to the new c3d format).
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=42a20896526f09fce773cabc50ff4012317c60d5;p=user-lxc.git

Updated sns.in (converted to the new c3d format).
---

diff --git a/sources/sns.in/firstboot/01_setupnetworking.sh b/sources/sns.in/c3d/firstboot/scripts/01_setupnetworking.sh
similarity index 62%
rename from sources/sns.in/firstboot/01_setupnetworking.sh
rename to sources/sns.in/c3d/firstboot/scripts/01_setupnetworking.sh
index 3d637f6..d451742 100755
--- a/sources/sns.in/firstboot/01_setupnetworking.sh
+++ b/sources/sns.in/c3d/firstboot/scripts/01_setupnetworking.sh
@@ -4,34 +4,46 @@
 sleep 1
 systemctl --quiet is-active NetworkManager.service
 NM_RC=$?
-WAITED=0
+CYCLES_WAITED=0
 while [ $NM_RC -ne 0 ]
 do
+    if [ $CYCLES_WAITED -ge 10 ]
+    then
+        exit 1
+    fi
     echo -n .
     sleep 1
-    WAITED=1
+    CYCLES_WAITED=$(( $CYCLES_WAITED + 1 ))
     systemctl --quiet is-active NetworkManager.service
     NM_RC=$?
 done
-[ $WAITED -eq 1 ] && echo
+[ $CYCLES_WAITED -gt 0 ] && echo
 
-CONNECTIONS=$(nmcli --terse connection show | wc -l)
-while [ $CONNECTIONS -ne 1 ]
+# wait for one/the network connection to come up
+CONNECTION_DEVICES_UP=$(nmcli --terse connection show \
+                            | grep --invert-match ':$' | wc -l)
+CYCLES_WAITED=0
+while [ $CONNECTION_DEVICES_UP -lt 1 ]
 do
-    echo "Number of connections: $CONNECTIONS" >&2
+    if [ $CYCLES_WAITED -ge 10 ]
+    then
+        nmcli connection show
+        exit 1
+    fi
+    echo -n .
     sleep 1
-    CONNECTIONS=$(nmcli --terse connection show | wc -l)
+    CYCLES_WAITED=$(( $CYCLES_WAITED + 1 ))
+    CONNECTION_DEVICES_UP=$(nmcli --terse connection show \
+                                | grep --invert-match ':$' | wc -l)
 done
+[ $CYCLES_WAITED -gt 0 ] && echo
 
-nmcli --terse connection show | grep ':$' >/dev/null
-ALL_CONNECTION_DEVICES_KNOWN=$?
-while [ $ALL_CONNECTION_DEVICES_KNOWN -eq 0 ]
-do
-    echo "Not all connection devices are known yet" >&2
-    sleep 1
-    nmcli --terse connection show | grep ':$' >/dev/null
-    ALL_CONNECTION_DEVICES_KNOWN=$?
-done
+CONNECTIONS=$(nmcli --terse connection show | wc -l)
+if [ $CONNECTIONS -ne 1 ]
+then
+    echo "Number of connections: $CONNECTIONS" >&2
+    exit 1
+fi
 
 CONNECTION_LINE=$(nmcli --terse connection show)
 CONNECTION_UUID=$(echo $CONNECTION_LINE | cut -f 2 -d ':')
diff --git a/sources/sns.in/firstboot/02_settimezone.sh b/sources/sns.in/c3d/firstboot/scripts/02_settimezone.sh
similarity index 100%
rename from sources/sns.in/firstboot/02_settimezone.sh
rename to sources/sns.in/c3d/firstboot/scripts/02_settimezone.sh
diff --git a/sources/sns.in/c3d/firstboot/scripts/90_setupservices.sh b/sources/sns.in/c3d/firstboot/scripts/90_setupservices.sh
new file mode 100755
index 0000000..d758570
--- /dev/null
+++ b/sources/sns.in/c3d/firstboot/scripts/90_setupservices.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+
+systemctl enable named.service
+systemctl start named.service
+systemctl enable NetworkManager-wait-online.service
+systemctl start NetworkManager-wait-online.service
+
+systemctl enable logrotate.timer
+systemctl start logrotate.timer
diff --git a/sources/sns.in/c3d/mode.txt b/sources/sns.in/c3d/mode.txt
new file mode 100644
index 0000000..d17d0e6
--- /dev/null
+++ b/sources/sns.in/c3d/mode.txt
@@ -0,0 +1,6 @@
+# mode file (relative to /c3d)
+755 firstboot/scripts/*.sh
+640 postinstall/install-data/etc/named.conf
+600 postinstall/install-data/var/named/*.private
+640 postinstall/install-data/var/named/*.zonesource
+755 postinstall/scripts/*.sh
diff --git a/sources/sns.in/c3d/owner.txt b/sources/sns.in/c3d/owner.txt
new file mode 100644
index 0000000..5bc4606
--- /dev/null
+++ b/sources/sns.in/c3d/owner.txt
@@ -0,0 +1,3 @@
+# owner file (relative to /c3d)
+root.named postinstall/install-data/etc/named.conf
+named.named postinstall/install-data/var/named/*
diff --git a/sources/sns.in/postinstall/install/etc/named.conf b/sources/sns.in/c3d/postinstall/install-data/etc/named.conf
similarity index 100%
rename from sources/sns.in/postinstall/install/etc/named.conf
rename to sources/sns.in/c3d/postinstall/install-data/etc/named.conf
diff --git a/sources/sns.in/postinstall/install/var/named/131.16.172.in-addr.arpa.zonesource b/sources/sns.in/c3d/postinstall/install-data/var/named/131.16.172.in-addr.arpa.zonesource
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/131.16.172.in-addr.arpa.zonesource
rename to sources/sns.in/c3d/postinstall/install-data/var/named/131.16.172.in-addr.arpa.zonesource
diff --git a/sources/sns.in/postinstall/install/var/named/132.16.172.in-addr.arpa.zonesource b/sources/sns.in/c3d/postinstall/install-data/var/named/132.16.172.in-addr.arpa.zonesource
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/132.16.172.in-addr.arpa.zonesource
rename to sources/sns.in/c3d/postinstall/install-data/var/named/132.16.172.in-addr.arpa.zonesource
diff --git a/sources/sns.in/postinstall/install/var/named/173.168.192.in-addr.arpa.zonesource b/sources/sns.in/c3d/postinstall/install-data/var/named/173.168.192.in-addr.arpa.zonesource
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/173.168.192.in-addr.arpa.zonesource
rename to sources/sns.in/c3d/postinstall/install-data/var/named/173.168.192.in-addr.arpa.zonesource
diff --git a/sources/sns.in/postinstall/install/var/named/2.f.0.0.0.0.0.0.4.d.2.0.a.2.ip6.arpa.zonesource b/sources/sns.in/c3d/postinstall/install-data/var/named/2.f.0.0.0.0.0.0.4.d.2.0.a.2.ip6.arpa.zonesource
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/2.f.0.0.0.0.0.0.4.d.2.0.a.2.ip6.arpa.zonesource
rename to sources/sns.in/c3d/postinstall/install-data/var/named/2.f.0.0.0.0.0.0.4.d.2.0.a.2.ip6.arpa.zonesource
diff --git a/sources/sns.in/postinstall/install/var/named/228.10.in-addr.arpa.zonesource b/sources/sns.in/c3d/postinstall/install-data/var/named/228.10.in-addr.arpa.zonesource
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/228.10.in-addr.arpa.zonesource
rename to sources/sns.in/c3d/postinstall/install-data/var/named/228.10.in-addr.arpa.zonesource
diff --git a/sources/sns.in/postinstall/install/var/named/42.168.192.in-addr.arpa.zonesource b/sources/sns.in/c3d/postinstall/install-data/var/named/42.168.192.in-addr.arpa.zonesource
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/42.168.192.in-addr.arpa.zonesource
rename to sources/sns.in/c3d/postinstall/install-data/var/named/42.168.192.in-addr.arpa.zonesource
diff --git a/sources/sns.in/postinstall/install/var/named/43.168.192.in-addr.arpa.zonesource b/sources/sns.in/c3d/postinstall/install-data/var/named/43.168.192.in-addr.arpa.zonesource
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/43.168.192.in-addr.arpa.zonesource
rename to sources/sns.in/c3d/postinstall/install-data/var/named/43.168.192.in-addr.arpa.zonesource
diff --git a/sources/sns.in/postinstall/install/var/named/8.6.2.f.0.0.0.0.0.0.4.d.2.0.a.2.ip6.arpa.zonesource b/sources/sns.in/c3d/postinstall/install-data/var/named/8.6.2.f.0.0.0.0.0.0.4.d.2.0.a.2.ip6.arpa.zonesource
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/8.6.2.f.0.0.0.0.0.0.4.d.2.0.a.2.ip6.arpa.zonesource
rename to sources/sns.in/c3d/postinstall/install-data/var/named/8.6.2.f.0.0.0.0.0.0.4.d.2.0.a.2.ip6.arpa.zonesource
diff --git a/sources/sns.in/postinstall/install/var/named/Kin.useribm.hu.+008+15139.key b/sources/sns.in/c3d/postinstall/install-data/var/named/Kin.useribm.hu.+008+15139.key
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/Kin.useribm.hu.+008+15139.key
rename to sources/sns.in/c3d/postinstall/install-data/var/named/Kin.useribm.hu.+008+15139.key
diff --git a/sources/sns.in/postinstall/install/var/named/Kin.useribm.hu.+008+15139.private b/sources/sns.in/c3d/postinstall/install-data/var/named/Kin.useribm.hu.+008+15139.private
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/Kin.useribm.hu.+008+15139.private
rename to sources/sns.in/c3d/postinstall/install-data/var/named/Kin.useribm.hu.+008+15139.private
diff --git a/sources/sns.in/postinstall/install/var/named/Kin.useribm.hu.+008+29779.key b/sources/sns.in/c3d/postinstall/install-data/var/named/Kin.useribm.hu.+008+29779.key
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/Kin.useribm.hu.+008+29779.key
rename to sources/sns.in/c3d/postinstall/install-data/var/named/Kin.useribm.hu.+008+29779.key
diff --git a/sources/sns.in/postinstall/install/var/named/Kin.useribm.hu.+008+29779.private b/sources/sns.in/c3d/postinstall/install-data/var/named/Kin.useribm.hu.+008+29779.private
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/Kin.useribm.hu.+008+29779.private
rename to sources/sns.in/c3d/postinstall/install-data/var/named/Kin.useribm.hu.+008+29779.private
diff --git a/sources/sns.in/postinstall/install/var/named/Kmediacube.hu.+008+55144.key b/sources/sns.in/c3d/postinstall/install-data/var/named/Kmediacube.hu.+008+55144.key
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/Kmediacube.hu.+008+55144.key
rename to sources/sns.in/c3d/postinstall/install-data/var/named/Kmediacube.hu.+008+55144.key
diff --git a/sources/sns.in/postinstall/install/var/named/Kmediacube.hu.+008+55144.private b/sources/sns.in/c3d/postinstall/install-data/var/named/Kmediacube.hu.+008+55144.private
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/Kmediacube.hu.+008+55144.private
rename to sources/sns.in/c3d/postinstall/install-data/var/named/Kmediacube.hu.+008+55144.private
diff --git a/sources/sns.in/postinstall/install/var/named/Kmediacube.hu.+008+57846.key b/sources/sns.in/c3d/postinstall/install-data/var/named/Kmediacube.hu.+008+57846.key
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/Kmediacube.hu.+008+57846.key
rename to sources/sns.in/c3d/postinstall/install-data/var/named/Kmediacube.hu.+008+57846.key
diff --git a/sources/sns.in/postinstall/install/var/named/Kmediacube.hu.+008+57846.private b/sources/sns.in/c3d/postinstall/install-data/var/named/Kmediacube.hu.+008+57846.private
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/Kmediacube.hu.+008+57846.private
rename to sources/sns.in/c3d/postinstall/install-data/var/named/Kmediacube.hu.+008+57846.private
diff --git a/sources/sns.in/postinstall/install/var/named/Kpm.user.hu.+008+51649.key b/sources/sns.in/c3d/postinstall/install-data/var/named/Kpm.user.hu.+008+51649.key
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/Kpm.user.hu.+008+51649.key
rename to sources/sns.in/c3d/postinstall/install-data/var/named/Kpm.user.hu.+008+51649.key
diff --git a/sources/sns.in/postinstall/install/var/named/Kpm.user.hu.+008+51649.private b/sources/sns.in/c3d/postinstall/install-data/var/named/Kpm.user.hu.+008+51649.private
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/Kpm.user.hu.+008+51649.private
rename to sources/sns.in/c3d/postinstall/install-data/var/named/Kpm.user.hu.+008+51649.private
diff --git a/sources/sns.in/postinstall/install/var/named/Kpm.user.hu.+008+58809.key b/sources/sns.in/c3d/postinstall/install-data/var/named/Kpm.user.hu.+008+58809.key
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/Kpm.user.hu.+008+58809.key
rename to sources/sns.in/c3d/postinstall/install-data/var/named/Kpm.user.hu.+008+58809.key
diff --git a/sources/sns.in/postinstall/install/var/named/Kpm.user.hu.+008+58809.private b/sources/sns.in/c3d/postinstall/install-data/var/named/Kpm.user.hu.+008+58809.private
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/Kpm.user.hu.+008+58809.private
rename to sources/sns.in/c3d/postinstall/install-data/var/named/Kpm.user.hu.+008+58809.private
diff --git a/sources/sns.in/postinstall/install/var/named/Kpm.useribm.hu.+008+25579.key b/sources/sns.in/c3d/postinstall/install-data/var/named/Kpm.useribm.hu.+008+25579.key
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/Kpm.useribm.hu.+008+25579.key
rename to sources/sns.in/c3d/postinstall/install-data/var/named/Kpm.useribm.hu.+008+25579.key
diff --git a/sources/sns.in/postinstall/install/var/named/Kpm.useribm.hu.+008+25579.private b/sources/sns.in/c3d/postinstall/install-data/var/named/Kpm.useribm.hu.+008+25579.private
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/Kpm.useribm.hu.+008+25579.private
rename to sources/sns.in/c3d/postinstall/install-data/var/named/Kpm.useribm.hu.+008+25579.private
diff --git a/sources/sns.in/postinstall/install/var/named/Kpm.useribm.hu.+008+53054.key b/sources/sns.in/c3d/postinstall/install-data/var/named/Kpm.useribm.hu.+008+53054.key
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/Kpm.useribm.hu.+008+53054.key
rename to sources/sns.in/c3d/postinstall/install-data/var/named/Kpm.useribm.hu.+008+53054.key
diff --git a/sources/sns.in/postinstall/install/var/named/Kpm.useribm.hu.+008+53054.private b/sources/sns.in/c3d/postinstall/install-data/var/named/Kpm.useribm.hu.+008+53054.private
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/Kpm.useribm.hu.+008+53054.private
rename to sources/sns.in/c3d/postinstall/install-data/var/named/Kpm.useribm.hu.+008+53054.private
diff --git a/sources/sns.in/postinstall/install/var/named/Kuseredms.hu.+008+03229.key b/sources/sns.in/c3d/postinstall/install-data/var/named/Kuseredms.hu.+008+03229.key
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/Kuseredms.hu.+008+03229.key
rename to sources/sns.in/c3d/postinstall/install-data/var/named/Kuseredms.hu.+008+03229.key
diff --git a/sources/sns.in/postinstall/install/var/named/Kuseredms.hu.+008+03229.private b/sources/sns.in/c3d/postinstall/install-data/var/named/Kuseredms.hu.+008+03229.private
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/Kuseredms.hu.+008+03229.private
rename to sources/sns.in/c3d/postinstall/install-data/var/named/Kuseredms.hu.+008+03229.private
diff --git a/sources/sns.in/postinstall/install/var/named/Kuseredms.hu.+008+22599.key b/sources/sns.in/c3d/postinstall/install-data/var/named/Kuseredms.hu.+008+22599.key
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/Kuseredms.hu.+008+22599.key
rename to sources/sns.in/c3d/postinstall/install-data/var/named/Kuseredms.hu.+008+22599.key
diff --git a/sources/sns.in/postinstall/install/var/named/Kuseredms.hu.+008+22599.private b/sources/sns.in/c3d/postinstall/install-data/var/named/Kuseredms.hu.+008+22599.private
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/Kuseredms.hu.+008+22599.private
rename to sources/sns.in/c3d/postinstall/install-data/var/named/Kuseredms.hu.+008+22599.private
diff --git a/sources/sns.in/postinstall/install/var/named/Kuseribm.hu.+008+24465.key b/sources/sns.in/c3d/postinstall/install-data/var/named/Kuseribm.hu.+008+24465.key
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/Kuseribm.hu.+008+24465.key
rename to sources/sns.in/c3d/postinstall/install-data/var/named/Kuseribm.hu.+008+24465.key
diff --git a/sources/sns.in/postinstall/install/var/named/Kuseribm.hu.+008+24465.private b/sources/sns.in/c3d/postinstall/install-data/var/named/Kuseribm.hu.+008+24465.private
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/Kuseribm.hu.+008+24465.private
rename to sources/sns.in/c3d/postinstall/install-data/var/named/Kuseribm.hu.+008+24465.private
diff --git a/sources/sns.in/postinstall/install/var/named/Kuseribm.hu.+008+56797.key b/sources/sns.in/c3d/postinstall/install-data/var/named/Kuseribm.hu.+008+56797.key
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/Kuseribm.hu.+008+56797.key
rename to sources/sns.in/c3d/postinstall/install-data/var/named/Kuseribm.hu.+008+56797.key
diff --git a/sources/sns.in/postinstall/install/var/named/Kuseribm.hu.+008+56797.private b/sources/sns.in/c3d/postinstall/install-data/var/named/Kuseribm.hu.+008+56797.private
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/Kuseribm.hu.+008+56797.private
rename to sources/sns.in/c3d/postinstall/install-data/var/named/Kuseribm.hu.+008+56797.private
diff --git a/sources/sns.in/postinstall/install/var/named/Kuserrendszerhaz.hu.+008+06526.key b/sources/sns.in/c3d/postinstall/install-data/var/named/Kuserrendszerhaz.hu.+008+06526.key
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/Kuserrendszerhaz.hu.+008+06526.key
rename to sources/sns.in/c3d/postinstall/install-data/var/named/Kuserrendszerhaz.hu.+008+06526.key
diff --git a/sources/sns.in/postinstall/install/var/named/Kuserrendszerhaz.hu.+008+06526.private b/sources/sns.in/c3d/postinstall/install-data/var/named/Kuserrendszerhaz.hu.+008+06526.private
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/Kuserrendszerhaz.hu.+008+06526.private
rename to sources/sns.in/c3d/postinstall/install-data/var/named/Kuserrendszerhaz.hu.+008+06526.private
diff --git a/sources/sns.in/postinstall/install/var/named/Kuserrendszerhaz.hu.+008+23760.key b/sources/sns.in/c3d/postinstall/install-data/var/named/Kuserrendszerhaz.hu.+008+23760.key
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/Kuserrendszerhaz.hu.+008+23760.key
rename to sources/sns.in/c3d/postinstall/install-data/var/named/Kuserrendszerhaz.hu.+008+23760.key
diff --git a/sources/sns.in/postinstall/install/var/named/Kuserrendszerhaz.hu.+008+23760.private b/sources/sns.in/c3d/postinstall/install-data/var/named/Kuserrendszerhaz.hu.+008+23760.private
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/Kuserrendszerhaz.hu.+008+23760.private
rename to sources/sns.in/c3d/postinstall/install-data/var/named/Kuserrendszerhaz.hu.+008+23760.private
diff --git a/sources/sns.in/postinstall/install/var/named/Kusr.user.hu.+008+63309.key b/sources/sns.in/c3d/postinstall/install-data/var/named/Kusr.user.hu.+008+63309.key
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/Kusr.user.hu.+008+63309.key
rename to sources/sns.in/c3d/postinstall/install-data/var/named/Kusr.user.hu.+008+63309.key
diff --git a/sources/sns.in/postinstall/install/var/named/Kusr.user.hu.+008+63309.private b/sources/sns.in/c3d/postinstall/install-data/var/named/Kusr.user.hu.+008+63309.private
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/Kusr.user.hu.+008+63309.private
rename to sources/sns.in/c3d/postinstall/install-data/var/named/Kusr.user.hu.+008+63309.private
diff --git a/sources/sns.in/postinstall/install/var/named/Kusr.user.hu.+008+64630.key b/sources/sns.in/c3d/postinstall/install-data/var/named/Kusr.user.hu.+008+64630.key
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/Kusr.user.hu.+008+64630.key
rename to sources/sns.in/c3d/postinstall/install-data/var/named/Kusr.user.hu.+008+64630.key
diff --git a/sources/sns.in/postinstall/install/var/named/Kusr.user.hu.+008+64630.private b/sources/sns.in/c3d/postinstall/install-data/var/named/Kusr.user.hu.+008+64630.private
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/Kusr.user.hu.+008+64630.private
rename to sources/sns.in/c3d/postinstall/install-data/var/named/Kusr.user.hu.+008+64630.private
diff --git a/sources/sns.in/postinstall/install/var/named/d.a.2.f.0.0.0.0.0.0.4.d.2.0.a.2.ip6.arpa.zonesource b/sources/sns.in/c3d/postinstall/install-data/var/named/d.a.2.f.0.0.0.0.0.0.4.d.2.0.a.2.ip6.arpa.zonesource
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/d.a.2.f.0.0.0.0.0.0.4.d.2.0.a.2.ip6.arpa.zonesource
rename to sources/sns.in/c3d/postinstall/install-data/var/named/d.a.2.f.0.0.0.0.0.0.4.d.2.0.a.2.ip6.arpa.zonesource
diff --git a/sources/sns.in/postinstall/install/var/named/in.user.hu.zonesource b/sources/sns.in/c3d/postinstall/install-data/var/named/in.user.hu.zonesource
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/in.user.hu.zonesource
rename to sources/sns.in/c3d/postinstall/install-data/var/named/in.user.hu.zonesource
diff --git a/sources/sns.in/postinstall/install/var/named/in.useribm.hu.zonesource b/sources/sns.in/c3d/postinstall/install-data/var/named/in.useribm.hu.zonesource
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/in.useribm.hu.zonesource
rename to sources/sns.in/c3d/postinstall/install-data/var/named/in.useribm.hu.zonesource
diff --git a/sources/sns.in/postinstall/install/var/named/mediacube.hu.zonesource b/sources/sns.in/c3d/postinstall/install-data/var/named/mediacube.hu.zonesource
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/mediacube.hu.zonesource
rename to sources/sns.in/c3d/postinstall/install-data/var/named/mediacube.hu.zonesource
diff --git a/sources/sns.in/postinstall/install/var/named/mlx1.useribm.hu.zonesource b/sources/sns.in/c3d/postinstall/install-data/var/named/mlx1.useribm.hu.zonesource
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/mlx1.useribm.hu.zonesource
rename to sources/sns.in/c3d/postinstall/install-data/var/named/mlx1.useribm.hu.zonesource
diff --git a/sources/sns.in/postinstall/install/var/named/mlx2.useribm.hu.zonesource b/sources/sns.in/c3d/postinstall/install-data/var/named/mlx2.useribm.hu.zonesource
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/mlx2.useribm.hu.zonesource
rename to sources/sns.in/c3d/postinstall/install-data/var/named/mlx2.useribm.hu.zonesource
diff --git a/sources/sns.in/postinstall/install/var/named/pm.useribm.hu.zonesource b/sources/sns.in/c3d/postinstall/install-data/var/named/pm.useribm.hu.zonesource
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/pm.useribm.hu.zonesource
rename to sources/sns.in/c3d/postinstall/install-data/var/named/pm.useribm.hu.zonesource
diff --git a/sources/sns.in/postinstall/install/var/named/sr.user.hu.zonesource b/sources/sns.in/c3d/postinstall/install-data/var/named/sr.user.hu.zonesource
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/sr.user.hu.zonesource
rename to sources/sns.in/c3d/postinstall/install-data/var/named/sr.user.hu.zonesource
diff --git a/sources/sns.in/postinstall/install/var/named/useredms.hu.zonesource b/sources/sns.in/c3d/postinstall/install-data/var/named/useredms.hu.zonesource
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/useredms.hu.zonesource
rename to sources/sns.in/c3d/postinstall/install-data/var/named/useredms.hu.zonesource
diff --git a/sources/sns.in/postinstall/install/var/named/useribm.hu.zonesource b/sources/sns.in/c3d/postinstall/install-data/var/named/useribm.hu.zonesource
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/useribm.hu.zonesource
rename to sources/sns.in/c3d/postinstall/install-data/var/named/useribm.hu.zonesource
diff --git a/sources/sns.in/postinstall/install/var/named/userrendszerhaz.hu.zonesource b/sources/sns.in/c3d/postinstall/install-data/var/named/userrendszerhaz.hu.zonesource
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/userrendszerhaz.hu.zonesource
rename to sources/sns.in/c3d/postinstall/install-data/var/named/userrendszerhaz.hu.zonesource
diff --git a/sources/sns.in/postinstall/install/var/named/usr.user.hu.zonesource b/sources/sns.in/c3d/postinstall/install-data/var/named/usr.user.hu.zonesource
similarity index 100%
rename from sources/sns.in/postinstall/install/var/named/usr.user.hu.zonesource
rename to sources/sns.in/c3d/postinstall/install-data/var/named/usr.user.hu.zonesource
diff --git a/sources/sns.in/c3d/postinstall/scripts/01_editfiles.sh b/sources/sns.in/c3d/postinstall/scripts/01_editfiles.sh
new file mode 100755
index 0000000..816ca13
--- /dev/null
+++ b/sources/sns.in/c3d/postinstall/scripts/01_editfiles.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+
+sed --in-place=.orig \
+    '/^After=.*network\.target.*$/a After=network-online.target\nWants=network-online.target' \
+    /usr/lib/systemd/system/named.service
diff --git a/sources/sns.in/c3d/postinstall/scripts/10_setupservices.sh b/sources/sns.in/c3d/postinstall/scripts/10_setupservices.sh
new file mode 100755
index 0000000..7241e78
--- /dev/null
+++ b/sources/sns.in/c3d/postinstall/scripts/10_setupservices.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+
+systemctl disable named.service
+systemctl disable NetworkManager-wait-online.service
+
+systemctl disable logrotate.timer
diff --git a/sources/sns.in/postinstall/20_setupzonefiles.sh b/sources/sns.in/c3d/postinstall/scripts/20_setupzonefiles.sh
similarity index 74%
rename from sources/sns.in/postinstall/20_setupzonefiles.sh
rename to sources/sns.in/c3d/postinstall/scripts/20_setupzonefiles.sh
index 8161750..fc083ac 100755
--- a/sources/sns.in/postinstall/20_setupzonefiles.sh
+++ b/sources/sns.in/c3d/postinstall/scripts/20_setupzonefiles.sh
@@ -8,13 +8,10 @@ do
     EXTERNAL_FILE=$(echo $FILE | sed 's/zonesource$/external.zone/')
     INTERNAL_FILE=$(echo $FILE | sed 's/zonesource$/internal.zone/')
     PERIMETER_FILE=$(echo $FILE | sed 's/zonesource$/perimeter.zone/')
-    grep -v 'E: *[-n]' $FILE >$EXTERNAL_FILE
-    grep -v 'I: *[-n]' $FILE >$INTERNAL_FILE
-    grep -v 'P: *[-n]' $FILE >$PERIMETER_FILE
+    grep --invert-match 'E: *[-n]' $FILE >$EXTERNAL_FILE
+    grep --invert-match 'I: *[-n]' $FILE >$INTERNAL_FILE
+    grep --invert-match 'P: *[-n]' $FILE >$PERIMETER_FILE
 done
-#rm -f *.zonesource
-chown named.named *.zone
-chmod 640 *.zone
 
 # set serial in zone files
 SERIAL=$(date "+%s")
@@ -22,3 +19,6 @@ for FILE in *.zone
 do
     sed --in-place "s/__SERIAL__/$SERIAL/" $FILE
 done
+
+chmod 640 *.zone
+chown named.named *.zone
diff --git a/sources/sns.in/postinstall/21_setupdnssec.sh b/sources/sns.in/c3d/postinstall/scripts/21_setupdnssec.sh
similarity index 98%
rename from sources/sns.in/postinstall/21_setupdnssec.sh
rename to sources/sns.in/c3d/postinstall/scripts/21_setupdnssec.sh
index 60de387..280e71e 100755
--- a/sources/sns.in/postinstall/21_setupdnssec.sh
+++ b/sources/sns.in/c3d/postinstall/scripts/21_setupdnssec.sh
@@ -86,7 +86,7 @@ then
                   pm.useribm.hu
 fi
 
-# Sign Zones
+# Sign Zones (for 180 days)
 cd /var/named
 for VIEW in external internal perimeter
 do
@@ -97,4 +97,6 @@ do
     #dnssec-signzone -e +15552000 -N unixtime -o in.useribm.hu in.useribm.hu.${VIEW}.zone
     #dnssec-signzone -e +15552000 -N unixtime -o pm.useribm.hu pm.useribm.hu.${VIEW}.zone
 done
+
+chmod 640 *.signed
 chown named.named dsset-* *.signed
diff --git a/sources/sns.in/envvars b/sources/sns.in/envvars
index 875dfc1..67de93f 100644
--- a/sources/sns.in/envvars
+++ b/sources/sns.in/envvars
@@ -1,5 +1,3 @@
 DISTRIBUTION=Fedora
 DISTRIBUTION_VERSION=35
-ROOT_PACKAGES="hostname initscripts iproute rootfiles systemd-udev"
-BASE_PACKAGES="NetworkManager iputils logrotate rsyslog tar vim-minimal"
 SPEC_PACKAGES="bind bind-utils"
diff --git a/sources/sns.in/firstboot/99_cleanup.sh b/sources/sns.in/firstboot/99_cleanup.sh
deleted file mode 100755
index b87f2f4..0000000
--- a/sources/sns.in/firstboot/99_cleanup.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-
-REAL_PATH=$(dirname $(realpath $0))
-
-echo rm -Rf $REAL_PATH
diff --git a/sources/sns.in/postinstall/01_setownership.sh b/sources/sns.in/postinstall/01_setownership.sh
deleted file mode 100755
index 82ed4bb..0000000
--- a/sources/sns.in/postinstall/01_setownership.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-
-REAL_PATH=$(dirname $(realpath $0))
-SOURCE_PATH=$REAL_PATH/install
-
-chown -R root.root $SOURCE_PATH/*
-
-chgrp named $SOURCE_PATH/etc/named.conf
-
-chown -R named.named $SOURCE_PATH/var/named
diff --git a/sources/sns.in/postinstall/02_setpermissions.sh b/sources/sns.in/postinstall/02_setpermissions.sh
deleted file mode 100755
index e7e809e..0000000
--- a/sources/sns.in/postinstall/02_setpermissions.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-
-REAL_PATH=$(dirname $(realpath $0))
-SOURCE_PATH=$REAL_PATH/install
-
-chmod 640 $SOURCE_PATH/etc/named.conf
diff --git a/sources/sns.in/postinstall/03_installfiles.sh b/sources/sns.in/postinstall/03_installfiles.sh
deleted file mode 100755
index e4ee7ff..0000000
--- a/sources/sns.in/postinstall/03_installfiles.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-
-REAL_PATH=$(dirname $(realpath $0))
-
-tar --create \
-    --directory=$REAL_PATH \
-    --exclude=.placeholder \
-    --to-stdout \
-    install \
-    | tar --extract \
-          --backup \
-          --directory=/ \
-          --no-overwrite-dir \
-          --strip-components=1 \
-          --suffix=.orig
diff --git a/sources/sns.in/postinstall/04_editfiles.sh b/sources/sns.in/postinstall/04_editfiles.sh
deleted file mode 100755
index 097b9b0..0000000
--- a/sources/sns.in/postinstall/04_editfiles.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/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/sns.in/postinstall/10_setupservices.sh b/sources/sns.in/postinstall/10_setupservices.sh
deleted file mode 100755
index 47869ee..0000000
--- a/sources/sns.in/postinstall/10_setupservices.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-
-systemctl enable named.service
-systemctl enable NetworkManager-wait-online.service
diff --git a/sources/sns.in/postinstall/99_cleanup.sh b/sources/sns.in/postinstall/99_cleanup.sh
deleted file mode 100755
index b87f2f4..0000000
--- a/sources/sns.in/postinstall/99_cleanup.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-
-REAL_PATH=$(dirname $(realpath $0))
-
-echo rm -Rf $REAL_PATH