From eb176bfabb4ef04a4df504def0fd7476d71b69f0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zolt=C3=A1n=20Felleg?= Date: Fri, 11 Feb 2022 15:55:30 +0100 Subject: [PATCH] Updated ls.in (converted to the new c3d format). --- .../firstboot/scripts}/01_setupnetworking.sh | 4 ++-- .../firstboot/scripts}/02_settimezone.sh | 0 sources/ls.in/c3d/mode.txt | 3 +++ .../install-data}/etc/logrotate.d/remote | 0 .../postinstall/scripts}/10_setupservices.sh | 0 .../postinstall/scripts}/20_setuprsyslog.sh | 0 sources/ls.in/envvars | 2 -- sources/ls.in/firstboot/03_setupldap.sh | 10 ---------- sources/ls.in/firstboot/99_cleanup.sh | 6 ------ sources/ls.in/postinstall/01_setownership.sh | 7 ------- sources/ls.in/postinstall/02_setpermissions.sh | 5 ----- sources/ls.in/postinstall/03_installfiles.sh | 16 ---------------- sources/ls.in/postinstall/99_cleanup.sh | 6 ------ 13 files changed, 5 insertions(+), 54 deletions(-) rename sources/ls.in/{firstboot => c3d/firstboot/scripts}/01_setupnetworking.sh (100%) rename sources/ls.in/{firstboot => c3d/firstboot/scripts}/02_settimezone.sh (100%) create mode 100644 sources/ls.in/c3d/mode.txt rename sources/ls.in/{postinstall/install => c3d/postinstall/install-data}/etc/logrotate.d/remote (100%) rename sources/ls.in/{postinstall => c3d/postinstall/scripts}/10_setupservices.sh (100%) rename sources/ls.in/{postinstall => c3d/postinstall/scripts}/20_setuprsyslog.sh (100%) delete mode 100755 sources/ls.in/firstboot/03_setupldap.sh delete mode 100755 sources/ls.in/firstboot/99_cleanup.sh delete mode 100755 sources/ls.in/postinstall/01_setownership.sh delete mode 100755 sources/ls.in/postinstall/02_setpermissions.sh delete mode 100755 sources/ls.in/postinstall/03_installfiles.sh delete mode 100755 sources/ls.in/postinstall/99_cleanup.sh diff --git a/sources/ls.in/firstboot/01_setupnetworking.sh b/sources/ls.in/c3d/firstboot/scripts/01_setupnetworking.sh similarity index 100% rename from sources/ls.in/firstboot/01_setupnetworking.sh rename to sources/ls.in/c3d/firstboot/scripts/01_setupnetworking.sh index ba84a19..cefcd32 100755 --- a/sources/ls.in/firstboot/01_setupnetworking.sh +++ b/sources/ls.in/c3d/firstboot/scripts/01_setupnetworking.sh @@ -37,8 +37,6 @@ CONNECTION_LINE=$(nmcli --terse connection show) CONNECTION_UUID=$(echo $CONNECTION_LINE | cut -f 2 -d ':') CONNECTION_DEVICE=$(echo $CONNECTION_LINE | cut -f 4 -d ':') -nmcli connection delete uuid "$CONNECTION_UUID" - nmcli connection add \ connection.autoconnect yes \ connection.id internal \ @@ -56,4 +54,6 @@ nmcli connection add \ ipv6.method "manual" \ save yes +nmcli connection delete uuid "$CONNECTION_UUID" + nmcli connection show diff --git a/sources/ls.in/firstboot/02_settimezone.sh b/sources/ls.in/c3d/firstboot/scripts/02_settimezone.sh similarity index 100% rename from sources/ls.in/firstboot/02_settimezone.sh rename to sources/ls.in/c3d/firstboot/scripts/02_settimezone.sh diff --git a/sources/ls.in/c3d/mode.txt b/sources/ls.in/c3d/mode.txt new file mode 100644 index 0000000..d0ff0b1 --- /dev/null +++ b/sources/ls.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/ls.in/postinstall/install/etc/logrotate.d/remote b/sources/ls.in/c3d/postinstall/install-data/etc/logrotate.d/remote similarity index 100% rename from sources/ls.in/postinstall/install/etc/logrotate.d/remote rename to sources/ls.in/c3d/postinstall/install-data/etc/logrotate.d/remote diff --git a/sources/ls.in/postinstall/10_setupservices.sh b/sources/ls.in/c3d/postinstall/scripts/10_setupservices.sh similarity index 100% rename from sources/ls.in/postinstall/10_setupservices.sh rename to sources/ls.in/c3d/postinstall/scripts/10_setupservices.sh diff --git a/sources/ls.in/postinstall/20_setuprsyslog.sh b/sources/ls.in/c3d/postinstall/scripts/20_setuprsyslog.sh similarity index 100% rename from sources/ls.in/postinstall/20_setuprsyslog.sh rename to sources/ls.in/c3d/postinstall/scripts/20_setuprsyslog.sh diff --git a/sources/ls.in/envvars b/sources/ls.in/envvars index 912a0d5..9283890 100644 --- a/sources/ls.in/envvars +++ b/sources/ls.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="rsyslog-doc" diff --git a/sources/ls.in/firstboot/03_setupldap.sh b/sources/ls.in/firstboot/03_setupldap.sh deleted file mode 100755 index 415d6db..0000000 --- a/sources/ls.in/firstboot/03_setupldap.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - - -exit 0 -authselect select sssd with-mkhomedir --force - -cat >>/etc/openldap/ldap.conf <