Updated ifg.in (converted to the new c3d format).

diff --git a/sources/ifg.in/firstboot/nftables.config b/sources/ifg.in/c3d/firstboot/data/nftables.config
similarity index 100%
rename from sources/ifg.in/firstboot/nftables.config
rename to sources/ifg.in/c3d/firstboot/data/nftables.config

diff --git a/sources/ifg.in/firstboot/traversal.txt b/sources/ifg.in/c3d/firstboot/data/traversal.txt
similarity index 100%
rename from sources/ifg.in/firstboot/traversal.txt
rename to sources/ifg.in/c3d/firstboot/data/traversal.txt

diff --git a/sources/ifg.in/firstboot/01_setupnetworking.sh b/sources/ifg.in/c3d/firstboot/scripts/01_setupnetworking.sh
similarity index 100%
rename from sources/ifg.in/firstboot/01_setupnetworking.sh
rename to sources/ifg.in/c3d/firstboot/scripts/01_setupnetworking.sh

diff --git a/sources/ifg.in/firstboot/02_settimezone.sh b/sources/ifg.in/c3d/firstboot/scripts/02_settimezone.sh
similarity index 100%
rename from sources/ifg.in/firstboot/02_settimezone.sh
rename to sources/ifg.in/c3d/firstboot/scripts/02_settimezone.sh

diff --git a/sources/ifg.in/firstboot/10_setupnftables.sh b/sources/ifg.in/c3d/firstboot/scripts/10_setupnftables.sh
similarity index 63%
rename from sources/ifg.in/firstboot/10_setupnftables.sh
rename to sources/ifg.in/c3d/firstboot/scripts/10_setupnftables.sh
index 714ff6b11582fe49eee33d0847886e21c83440f7..c56d9330c33dba5eaa4e0cbf0a3b76f619cbfb15 100755 (executable)
--- a/sources/ifg.in/firstboot/10_setupnftables.sh
+++ b/sources/ifg.in/c3d/firstboot/scripts/10_setupnftables.sh
@@ -2,10 +2,11 @@
 
 
 REAL_PATH=$(realpath $(dirname $0))
+DATA_PATH=$(realpath $REAL_PATH/../data)
 
 
 nft flush ruleset
-nft --echo --file $REAL_PATH/nftables.config
+nft --echo --file $DATA_PATH/nftables.config
 nft list ruleset | tee /etc/nftables/ifg.nft
 
 systemctl enable nftables.service

diff --git a/sources/ifg.in/c3d/mode.txt b/sources/ifg.in/c3d/mode.txt
new file mode 100644 (file)
index 0000000..d0ff0b1
--- /dev/null
+++ b/sources/ifg.in/c3d/mode.txt
@@ -0,0 +1,3 @@
+# mode file (relative to /c3d)
+755 firstboot/scripts/*.sh
+755 postinstall/scripts/*.sh

diff --git a/sources/ifg.in/postinstall/install/etc/radvd.conf b/sources/ifg.in/c3d/postinstall/install-data/etc/radvd.conf
similarity index 100%
rename from sources/ifg.in/postinstall/install/etc/radvd.conf
rename to sources/ifg.in/c3d/postinstall/install-data/etc/radvd.conf

diff --git a/sources/ifg.in/postinstall/install/etc/sysconfig/nftables.conf b/sources/ifg.in/c3d/postinstall/install-data/etc/sysconfig/nftables.conf
similarity index 100%
rename from sources/ifg.in/postinstall/install/etc/sysconfig/nftables.conf
rename to sources/ifg.in/c3d/postinstall/install-data/etc/sysconfig/nftables.conf

diff --git a/sources/ifg.in/postinstall/install/etc/sysctl.d/01_ipforward.conf b/sources/ifg.in/c3d/postinstall/install-data/etc/sysctl.d/01_ipforward.conf
similarity index 100%
rename from sources/ifg.in/postinstall/install/etc/sysctl.d/01_ipforward.conf
rename to sources/ifg.in/c3d/postinstall/install-data/etc/sysctl.d/01_ipforward.conf

diff --git a/sources/ifg.in/postinstall/10_setupservices.sh b/sources/ifg.in/c3d/postinstall/scripts/10_setupservices.sh
similarity index 100%
rename from sources/ifg.in/postinstall/10_setupservices.sh
rename to sources/ifg.in/c3d/postinstall/scripts/10_setupservices.sh

diff --git a/sources/ifg.in/envvars b/sources/ifg.in/envvars
index bf19a51d728658e1a1c4f4ef96b46be7378551ef..8b18d160d944e23766583cb69b8fba66719e4f1b 100644 (file)
--- a/sources/ifg.in/envvars
+++ b/sources/ifg.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="ethtool nftables radvd tcpdump"

diff --git a/sources/ifg.in/firstboot/99_cleanup.sh b/sources/ifg.in/firstboot/99_cleanup.sh
deleted file mode 100755 (executable)
index b87f2f4..0000000
--- a/sources/ifg.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/ifg.in/postinstall/01_setownership.sh b/sources/ifg.in/postinstall/01_setownership.sh
deleted file mode 100755 (executable)
index f2e6b94..0000000
--- a/sources/ifg.in/postinstall/01_setownership.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-
-REAL_PATH=$(dirname $(realpath $0))
-SOURCE_PATH=$REAL_PATH/install
-
-chown -R root.root $SOURCE_PATH/*

diff --git a/sources/ifg.in/postinstall/02_setpermissions.sh b/sources/ifg.in/postinstall/02_setpermissions.sh
deleted file mode 100755 (executable)
index 241386a..0000000
--- a/sources/ifg.in/postinstall/02_setpermissions.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-
-REAL_PATH=$(dirname $(realpath $0))
-SOURCE_PATH=$REAL_PATH/install

diff --git a/sources/ifg.in/postinstall/03_installfiles.sh b/sources/ifg.in/postinstall/03_installfiles.sh
deleted file mode 100755 (executable)
index e4ee7ff..0000000
--- a/sources/ifg.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/ifg.in/postinstall/99_cleanup.sh b/sources/ifg.in/postinstall/99_cleanup.sh
deleted file mode 100755 (executable)
index b87f2f4..0000000
--- a/sources/ifg.in/postinstall/99_cleanup.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-
-REAL_PATH=$(dirname $(realpath $0))
-
-echo rm -Rf $REAL_PATH