From 253d32f13dbc71bc66894c526f248dedd71dacfc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Gertz?= Date: Thu, 31 Jan 2019 18:42:32 +0100 Subject: [PATCH 01/11] Force enable systemd networkd service Add mysql and mail subvol --- lib/pattern.sh | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/lib/pattern.sh b/lib/pattern.sh index ee96dec..c4581c9 100755 --- a/lib/pattern.sh +++ b/lib/pattern.sh @@ -82,13 +82,21 @@ DHCP=yes EOF fi +#Mysql +mkdir -p "$PWD/root/var/lib/mysql" + +#Mail +mkdir -p "$PWD/root/var/spool/mail" + #Fstab cat << EOF > "$PWD/root/etc/fstab" -UUID=${BOOTUUID} /boot ext3 defaults,noatime 1 2 -UUID=${DATAUUID} / btrfs subvol=/slash,defaults,relatime 1 1 -UUID=${SWAPAUUID} none swap sw 0 0 -UUID=${SWAPBUUID} none swap sw 0 0 -UUID=${DATAUUID} /home btrfs subvol=/home,defaults,relatime 1 1 +UUID=${BOOTUUID} /boot ext3 defaults,noatime 1 2 +UUID=${DATAUUID} / btrfs subvol=/slash,defaults,relatime 1 1 +UUID=${SWAPAUUID} none swap sw 0 0 +UUID=${SWAPBUUID} none swap sw 0 0 +UUID=${DATAUUID} /home btrfs subvol=/home,defaults,relatime 1 1 +UUID=${DATAUUID} /var/lib/mysql btrfs subvol=/mysql,defaults,relatime 1 1 +UUID=${DATAUUID} /var/spool/mail btrfs subvol=/mail,defaults,relatime 1 1 proc /proc proc defaults 0 0 EOF @@ -230,5 +238,8 @@ fi #TODO ntp /etc/systemd/timesyncd.conf +# Force enable systemd-networkd.service +chroot "$PWD/root" /usr/bin/systemctl enable systemd-networkd.service + # Cleanup tmp and run rm -fr $PWD/root/tmp/* $PWD/root/run/* -- 2.41.0 From 084d63c192b2fc2537cb267adb8d4f56237d828b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Gertz?= Date: Thu, 2 Sep 2021 03:42:52 +0200 Subject: [PATCH 02/11] Enable systemd-resolved by default --- lib/pattern.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/pattern.sh b/lib/pattern.sh index c4581c9..5088194 100755 --- a/lib/pattern.sh +++ b/lib/pattern.sh @@ -241,5 +241,8 @@ fi # Force enable systemd-networkd.service chroot "$PWD/root" /usr/bin/systemctl enable systemd-networkd.service +# Force enable systemd-resolved.service +chroot "$PWD/root" /usr/bin/systemctl enable systemd-resolved.service + # Cleanup tmp and run rm -fr $PWD/root/tmp/* $PWD/root/run/* -- 2.41.0 From a922253e3098b29c87f8bfc14c2f8297de8fb325 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Gertz?= Date: Thu, 2 Sep 2021 03:45:02 +0200 Subject: [PATCH 03/11] New mageia 8 version --- config/flavour.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/flavour.conf b/config/flavour.conf index 8881256..7196b19 100644 --- a/config/flavour.conf +++ b/config/flavour.conf @@ -1,4 +1,4 @@ # Mageia arch (i586|x86_64) ARCH='x86_64' -# Mageia release (1|2|3|4|5|6|cauldron) -MGARELEASE='7' +# Mageia release (1|2|3|4|5|6|7|8|cauldron) +MGARELEASE='8' -- 2.41.0 From 359c5ac95488bc236d90a20f4114f61d93567a70 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Gertz?= Date: Thu, 2 Sep 2021 05:43:41 +0200 Subject: [PATCH 04/11] Drop removed package --- lib/install.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/install.sh b/lib/install.sh index c3be521..7147109 100755 --- a/lib/install.sh +++ b/lib/install.sh @@ -95,7 +95,6 @@ LC_ALL=C urpmi --downloader=wget --no-verify-rpm --no-recommends --noclean --aut rsnapshot \ rsync \ screen \ - sectool \ shorewall \ shorewall-ipv6 \ smartmontools \ -- 2.41.0 From ee49b8dbf7ed7370fa541fafdcd42c0b287863d5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Gertz?= Date: Sat, 3 Dec 2022 05:14:24 +0100 Subject: [PATCH 05/11] Prevent msec perms btmp warning Handle rsa and ed25519 pubkey addition in authorized_keys --- lib/pattern.sh | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/lib/pattern.sh b/lib/pattern.sh index 5088194..8315ae1 100755 --- a/lib/pattern.sh +++ b/lib/pattern.sh @@ -229,11 +229,29 @@ chroot "$PWD/root" /usr/sbin/sshd-keygen #XXX: forced because msec decides otherwise perl -pne 's%^PermitRootLogin .*%PermitRootLogin yes%' -i "$PWD/root/etc/ssh/sshd_config" -# Add rsa key if available -#XXX: dsa is unsupported anymore -if [ -e "$HOME/.ssh/id_rsa.pub" ]; then - [ ! -d "$PWD/root/root/.ssh" ] && mkdir -m 0700 "$PWD/root/root/.ssh" - cp -f "$HOME/.ssh/id_rsa.pub" "$PWD/root/root/.ssh/authorized_keys" +# Prevent btmp warning +cat << EOF > "$PWD/root/etc/tmpfiles.d/var.conf" +# See tmpfiles.d(5) for details + +# Prevent msec warning about enforcing permissions +f /var/log/btmp 0600 root utmp - +EOF + +# Authorized keys +if [ -e "$HOME/.ssh/id_rsa.pub" -o -e "$HOME/.ssh/id_ed25519.pub" ]; then + mkdir -m 0700 "$PWD/root/root/.ssh" + touch "$PWD/root/root/.ssh/authorized_keys" + chmod u=rw,go=r "$PWD/root/root/.ssh/authorized_keys" + + # Add rsa key if available + if [ -e "$HOME/.ssh/id_rsa.pub" ]; then + cat "$HOME/.ssh/id_rsa.pub" >> "$PWD/root/root/.ssh/authorized_keys" + fi + + # Add ed25519 key if available + if [ -e "$HOME/.ssh/id_ed25519.pub" ]; then + cat "$HOME/.ssh/id_ed25519.pub" >> "$PWD/root/root/.ssh/authorized_keys" + fi fi #TODO ntp /etc/systemd/timesyncd.conf -- 2.41.0 From 881cb73da18dd0f30e701a46b5b6f51ed3628bd0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Gertz?= Date: Wed, 15 Nov 2023 13:04:20 +0100 Subject: [PATCH 06/11] Update flavour --- config/flavour.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/flavour.conf b/config/flavour.conf index 7196b19..a6744fa 100644 --- a/config/flavour.conf +++ b/config/flavour.conf @@ -1,4 +1,4 @@ -# Mageia arch (i586|x86_64) +# Mageia arch (aarch64|i586|x86_64) ARCH='x86_64' -# Mageia release (1|2|3|4|5|6|7|8|cauldron) -MGARELEASE='8' +# Mageia release (1|2|3|4|5|6|7|8|9|cauldron) +MGARELEASE='9' -- 2.41.0 From d19d63740a654fc891edac1beb5da7fc164aa5a7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Gertz?= Date: Wed, 15 Nov 2023 13:04:42 +0100 Subject: [PATCH 07/11] Readd urpmi setup --- cook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cook b/cook index c3d1a4f..5b50b50 100755 --- a/cook +++ b/cook @@ -11,7 +11,7 @@ cat config/*.conf | perl -pne 'if (/^#/) {undef $_;} else {s/^/export /;}' >> li . lib/config.sh # Configure urpmi -#. lib/urpmi.sh +. lib/urpmi.sh # Install rpm . lib/install.sh -- 2.41.0 From 9bb661531f4fc9925f78c4f63b0cda9f50bd1e6d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Gertz?= Date: Wed, 15 Nov 2023 13:05:38 +0100 Subject: [PATCH 08/11] Update plocate name change --- lib/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/install.sh b/lib/install.sh index 7147109..43120cf 100755 --- a/lib/install.sh +++ b/lib/install.sh @@ -80,7 +80,7 @@ LC_ALL=C urpmi --downloader=wget --no-verify-rpm --no-recommends --noclean --aut mdadm \ microcode \ mirrordir \ - mlocate \ + plocate \ msec \ nail \ ntfs-3g \ -- 2.41.0 From ef7067a1fbe460f378880439771f802746395843 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Gertz?= Date: Wed, 15 Nov 2023 13:06:30 +0100 Subject: [PATCH 09/11] Comment dropped sysconfig file --- lib/pattern.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/pattern.sh b/lib/pattern.sh index 8315ae1..4c167fb 100755 --- a/lib/pattern.sh +++ b/lib/pattern.sh @@ -4,7 +4,8 @@ perl -pne 's%(?:(COMP_CONFIGURE_HINTS|COMP_TAR_INTERNAL_PATHS)=1?)%${1}=1%' -i "$PWD/root/etc/sysconfig/bash-completion" #Disable gpg agent -perl -pne 's%(?:(START_GPGAGENT|START_GPGAGENT_SH)=(?:"?(no|yes)"?)?)%${1}="no"%' -i "$PWD/root/etc/sysconfig/gnupg2" +#XXX: moved to a user systemd service +#perl -pne 's%(?:(START_GPGAGENT|START_GPGAGENT_SH)=(?:"?(no|yes)"?)?)%${1}="no"%' -i "$PWD/root/etc/sysconfig/gnupg2" #Locale config cat << EOF > "$PWD/root/etc/vconsole.conf" -- 2.41.0 From 8e2c032fc8f9550b165bc3f6584a43611a039302 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Gertz?= Date: Wed, 15 Nov 2023 13:08:11 +0100 Subject: [PATCH 10/11] Ignore testing, debug and sources medias --- lib/urpmi.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/urpmi.sh b/lib/urpmi.sh index 5d72d1c..98e138e 100755 --- a/lib/urpmi.sh +++ b/lib/urpmi.sh @@ -1,6 +1,6 @@ #! /bin/sh -e urpmi.removemedia -a urpmi.addmedia --distrib --all-media --mirrorlist http://mirrors.mageia.org/api/mageia.$MGARELEASE.$ARCH.list -perl -pne 's%(.*testing.*) {\n%\1 {\n ignore\n%i' -i /etc/urpmi/urpmi.cfg +perl -pne 's%(.*(?:testing|debug|sources).*) {\n%\1 {\n ignore\n%i' -i /etc/urpmi/urpmi.cfg #remove distrib-coffee line from mirrors cache #perl -pne 'undef $/; s% +{(?:\n +.(?:country|proximity|longitude|arch|version|zone|latitude).[^,]+,){7}\n +.url.[^,]+distrib-coffee[^,]+,(?:\n +.(?:type|proximity_corrected).[^,]+,){2}\n%%' -i /var/cache/urpmi/mirrors.cache -- 2.41.0 From 1aa323398b3be427e4adab91386d2c98da3c69e8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Gertz?= Date: Thu, 1 Feb 2024 03:02:50 +0100 Subject: [PATCH 11/11] Add root.mount to ignored files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index dff65a8..06dc2f0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ root root.conf +root.mount root.tar.xz lib/config.sh ihttpd-*.rpm -- 2.41.0