From f8d5efc70388822c06a2dc026db2ffbc29357afe Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sun, 14 Sep 2025 12:12:04 +0900 Subject: [PATCH 1/2] mkosi: drop man package from global config Some distributions does not have man package, but named man-db or so, and most distribution specific mkosi.conf files already have them. Let's drop man from the global config. --- mkosi/mkosi.conf | 1 - mkosi/mkosi.conf.d/opensuse/mkosi.conf | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/mkosi/mkosi.conf b/mkosi/mkosi.conf index b0cedfab8e5..50d95877c5f 100644 --- a/mkosi/mkosi.conf +++ b/mkosi/mkosi.conf @@ -111,7 +111,6 @@ Packages= llvm lsof lvm2 - man mdadm mtools nano diff --git a/mkosi/mkosi.conf.d/opensuse/mkosi.conf b/mkosi/mkosi.conf.d/opensuse/mkosi.conf index 268aa589c21..1b2f80fd4d9 100644 --- a/mkosi/mkosi.conf.d/opensuse/mkosi.conf +++ b/mkosi/mkosi.conf.d/opensuse/mkosi.conf @@ -59,6 +59,7 @@ Packages= libapparmor1 libcap-progs libtss2-tcti-device0 + man multipath-tools ncat open-iscsi From 97eeecaa3caa9a78959577b657d7614f17f5e37b Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sun, 14 Sep 2025 12:13:20 +0900 Subject: [PATCH 2/2] mkosi: support the case /sbin/init is an absolute symbolic link In that case, the link points to the host file, thus we cannot update the file. --- mkosi/mkosi.images/minimal-base/mkosi.postinst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mkosi/mkosi.images/minimal-base/mkosi.postinst b/mkosi/mkosi.images/minimal-base/mkosi.postinst index 777bdfd449e..475f40fdc0c 100755 --- a/mkosi/mkosi.images/minimal-base/mkosi.postinst +++ b/mkosi/mkosi.images/minimal-base/mkosi.postinst @@ -3,6 +3,8 @@ set -e # We don't use mkosi.extra because /usr/sbin could be a symlink and cp doesn't handle that properly until # coreutils 9.5 or newer. +mkdir -p "$BUILDROOT/sbin" +rm -f "$BUILDROOT/sbin/init" cat >"$BUILDROOT/sbin/init" <