Avoid copying files to temporary root

legionus · legionus · commit b5aabdb65a4e · 2025-07-15T23:56:08.000+02:00
Signed-off-by: Alexey Gladkov &lt;gladkov.alexey@gmail.com&gt;
diff --git a/features/fsck/rules.mk b/features/fsck/rules.mk
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-$(call assgin-shell-once,FSCK_RUNTIME_FILES,$(FEATURESDIR)/fsck/bin/find-files)
+$(call assign-shell-once,FSCK_RUNTIME_FILES,$(FEATURESDIR)/fsck/bin/find-files)
 
 PUT_FEATURE_DIRS  += $(FSCK_DATADIR)
 PUT_FEATURE_FILES += $(FSCK_FILES) $(FSCK_RUNTIME_FILES)
diff --git a/features/gpu-drm/rules.mk b/features/gpu-drm/rules.mk
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-$(call assgin-shell-once,GPUDRM_MODULES,$(FEATURESDIR)/gpu-drm/bin/get-modules)
+$(call assign-shell-once,GPUDRM_MODULES,$(FEATURESDIR)/gpu-drm/bin/get-modules)
 
 MODULES_ADD += $(GPUDRM_MODULES)
diff --git a/features/kickstart/bin/get-ks-configs b/features/kickstart/bin/get-ks-configs
diff --git a/features/kickstart/rules.mk b/features/kickstart/rules.mk
@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-$(call assgin-shell-once,KICKSTART_DIRS,$(FEATURESDIR)/kickstart/bin/get-ks-configs)
-
 FAT_MODULES = fs-vfat /fs/nls/
 ZFS_MODULES = zfs
 
@@ -10,6 +8,13 @@ MODULES_TRY_ADD += $(FAT_MODULES)
 MODULES_TRY_ADD += $(ZFS_MODULES)
 
 PUT_FEATURE_FILES += $(KICKSTART_FILES)
-PUT_FEATURE_DIRS += $(KICKSTART_DATADIR) $(KICKSTART_DIRS)
+PUT_FEATURE_DIRS += $(KICKSTART_DATADIR)
 PUT_FEATURE_PROGS += $(KICKSTART_PROGS)
 PUT_FEATURE_PROGS_WILDCARD += $(KICKSTART_PROGS_PATTERNS)
+
+kickstart: create
+	@$(VMSG) "Adding kickstart configs..."
+	@mkdir -p -- "$(ROOTDIR)/etc/ks.conf.d"
+	@[ -z "$(KICKSTART_CONFIGS)" ] || cp -f -- $(KICKSTART_CONFIGS) "$(ROOTDIR)"/etc/ks.conf.d
+
+pack: kickstart
diff --git a/features/luks/bin/get-data b/features/luks/bin/get-data
@@ -7,7 +7,7 @@
 . shell-error
 . "$FEATURESDIR"/luks/data/bin/crypttab-sh-functions
 
-DIR="$WORKDIR/root"
+DIR="$ROOTDIR"
 unsupported=()
 
 join_by()
@@ -110,5 +110,3 @@ shell_foreach_crypttab "$LUKS_CRYPTTAB" crypttab_entry ||:
 if [ "${#unsupported[@]}" -gt 0 ]; then
 	message "luks: $(join_by , "${unsupported[@]}") from crypttab is not supported."
 fi
-
-printf '%s\n' "$DIR"
diff --git a/features/luks/rules.mk b/features/luks/rules.mk
@@ -1,11 +1,14 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
-LUKS_CRYPTTAB_DATA =
-
-ifneq ($(LUKS_CRYPTTAB),)
-$(call assgin-shell-once,LUKS_CRYPTTAB_DATA,$(FEATURESDIR)/luks/bin/get-data)
-endif
 
 MODULES_LOAD += $(LUKS_MODULES)
 
-PUT_FEATURE_DIRS  += $(LUKS_DATADIR) $(LUKS_CRYPTTAB_DATA)
+PUT_FEATURE_DIRS  += $(LUKS_DATADIR)
 PUT_FEATURE_PROGS += $(CRYPTSETUP_BIN)
+
+ifneq ($(LUKS_CRYPTTAB),)
+luks-crypttab: create
+	@$(VMSG) "Adding LUKS crypttab..."
+	@$(FEATURESDIR)/luks/bin/get-data
+
+pack: luks-crypttab
+endif
diff --git a/features/mdadm/bin/generate-udev-rules b/features/mdadm/bin/generate-udev-rules
@@ -3,14 +3,15 @@
 
 . sh-functions
 
-DIR="$WORKDIR/root"
+DIR="$ROOTDIR"
 
 if [ "${1-}" = dirs ]; then
-	mkdir -p -- "$DIR/etc/initrd/md"
-	printf '%s\n' "$DIR"
+	mkdir ${verbose2-} -p -- "$DIR/etc/initrd/md"
 fi
 
 for majmin in ${GENERATE_UDEV_RULES_FOR_MD_DEVICE-}; do
+	verbose2 "Processing MD device $majmin..."
+
 	DEVNAME=
 
 	. "$SYSFS_PATH/dev/block/$majmin/uevent"
@@ -32,6 +33,7 @@ for majmin in ${GENERATE_UDEV_RULES_FOR_MD_DEVICE-}; do
 	uuid="${MD_UUID//:}"
 
 	if [ "${1-}" = dirs ]; then
+		verbose2 "Creating: /etc/initrd/md/$uuid"
 		:> "$DIR/etc/initrd/md/$uuid"
 		continue
 	fi
@@ -66,5 +68,6 @@ ACTION=="remove", ENV{ID_PATH}!="?*", RUN+="/sbin/mdadm -If \$name"
 
 LABEL="md_inc_end"
 EOF
+	verbose2 "Adding udev rules: $rules"
 	printf '%s\n' "$rules"
 done
diff --git a/features/mdadm/rules.mk b/features/mdadm/rules.mk
@@ -1,9 +1,14 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-$(call assgin-shell-once,MDADM_UDEV_RULES,$(FEATURESDIR)/mdadm/bin/generate-udev-rules)
-$(call assgin-shell-once,MDADM_DIRS,      $(FEATURESDIR)/mdadm/bin/generate-udev-rules dirs)
+$(call assign-shell-once,MDADM_UDEV_RULES,$(FEATURESDIR)/mdadm/bin/generate-udev-rules)
 
 PUT_UDEV_RULES    += $(MDAMD_RULES_OLD) $(MDAMD_RULES) $(MDADM_UDEV_RULES)
-PUT_FEATURE_DIRS  += $(MDADM_DATADIR) $(MDADM_DIRS)
+PUT_FEATURE_DIRS  += $(MDADM_DATADIR)
 PUT_FEATURE_FILES += $(MDADM_FILES)
 PUT_FEATURE_PROGS += $(MDADM_PROGS) $(MDADM_EXTRA_PROGS)
+
+mdadm: create
+	@$(VMSG) "Adding mdadm uuids..."
+	@$(FEATURESDIR)/mdadm/bin/generate-udev-rules dirs
+
+pack: mdadm
diff --git a/features/plymouth/rules.mk b/features/plymouth/rules.mk
@@ -1,9 +1,9 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 PLYMOUTH_DIRS := $(foreach d,$(LIB_DIRS),$(wildcard $(d)/plymouth))
 
-$(call assgin-shell-once,PLYMOUTH_PACK_MODULES, $(FEATURESDIR)/plymouth/bin/get-modules)
-$(call assgin-shell-once,PLYMOUTH_PACK_THEME,   $(FEATURESDIR)/plymouth/bin/get-theme-files "$(PLYMOUTH_THEME)
-$(call assgin-shell-once,PLYMOUTH_PACK_DEFFONT, fc-match -f '%{file}\n' 'DejaVuSans' ||:)
+$(call assign-shell-once,PLYMOUTH_PACK_MODULES, $(FEATURESDIR)/plymouth/bin/get-modules)
+$(call assign-shell-once,PLYMOUTH_PACK_THEME,   $(FEATURESDIR)/plymouth/bin/get-theme-files "$(PLYMOUTH_THEME)
+$(call assign-shell-once,PLYMOUTH_PACK_DEFFONT, fc-match -f '%{file}\n' 'DejaVuSans' ||:)
 
 PLYMOUTH_PACK_FONT := $(or $(PLYMOUTH_FONT),$(PLYMOUTH_PACK_DEFFONT))
 
diff --git a/features/rdshell/bin/add-login b/features/rdshell/bin/add-login
@@ -7,27 +7,18 @@ if [ -n "${RDSHELL_PASSWORD-}" ] && [ -n "${RDSHELL_COPY_PASSWORD_FROM_USER-}" ]
 	fatal 'Options "RDSHELL_PASSWORD" and "RDSHELL_COPY_PASSWORD_FROM_USER" are mutually exclusive'
 fi
 
+DIR="$ROOTDIR"
 
-case "${1-}" in
-	files)
-		;;
-	dirs)
-		DIR="$WORKDIR/root"
+mkdir -p -- "$DIR/etc/sysconfig"
 
-		mkdir -p -- "$DIR/etc/sysconfig"
+hash="${RDSHELL_PASSWORD-}"
+[ -z "${RDSHELL_COPY_PASSWORD_FROM_USER-}" ] ||
+	hash="$(getent shadow "${RDSHELL_COPY_PASSWORD_FROM_USER-}" |cut -d: -f2)"
 
-		hash="${RDSHELL_PASSWORD-}"
-		[ -z "${RDSHELL_COPY_PASSWORD_FROM_USER-}" ] ||
-			hash="$(getent shadow "${RDSHELL_COPY_PASSWORD_FROM_USER-}" |cut -d: -f2)"
+for n in passwd shadow; do
+	touch "$DIR/etc/$n"
+	sed -i -e '/^root:/d' "$DIR/etc/$n"
+done
 
-		for n in passwd shadow; do
-			touch "$DIR/etc/$n"
-			sed -i -e '/^root:/d' "$DIR/etc/$n"
-		done
-
-		printf 'root:x:0:0::/home/root:/bin/sh\n' >> "$DIR/etc/passwd"
-		printf 'root:%s:13957::::::\n' "$hash"    >> "$DIR/etc/shadow"
-
-		printf '%s\n' "$DIR"
-		;;
-esac
+printf 'root:x:0:0::/home/root:/bin/sh\n' >> "$DIR/etc/passwd"
+printf 'root:%s:13957::::::\n' "$hash"    >> "$DIR/etc/shadow"
diff --git a/features/rdshell/rules.mk b/features/rdshell/rules.mk
@@ -5,8 +5,14 @@ endif
 
 ifneq ($(RDSHELL_PASSWORD)$(RDSHELL_COPY_PASSWORD_FROM_USER),)
 RDSHELL = login
-$(call assign-shell-once,RHSHELL_DIRS,$(FEATURESDIR)/rdshell/bin/add-login dirs)
-PUT_FEATURE_DIRS += $(RHSHELL_DIRS)
 endif
 
 $(call set-sysconfig,rdshell,RDSHELL_MODE,$(RDSHELL))
+
+ifneq ($(RDSHELL_PASSWORD)$(RDSHELL_COPY_PASSWORD_FROM_USER),)
+rdshell: create
+	@$(VMSG) "Adding root password..."
+	@$(FEATURESDIR)/rdshell/bin/add-login
+
+pack: rdshell
+endif
diff --git a/features/rootfs/bin/create-fstab b/features/rootfs/bin/create-fstab
@@ -6,30 +6,22 @@
 export LIBMOUNT_FSTAB="${FSTAB:-$SYSCONFDIR/fstab}"
 export LIBMOUNT_MTAB="${PROC_MOUNTS:-$PROCFS_PATH/mounts}"
 
-case "${1-}" in
-	files)
-		;;
-	dirs)
-		DIR="$WORKDIR/root"
+DIR="$ROOTDIR"
 
-		mkdir -p -- "$DIR"/etc
+mkdir -p -- "$DIR"/etc
 
-		for d in ${MOUNTPOINTS-}; do
-			out="$(sys_findmnt -n -o TARGET,FSTYPE,OPTIONS --target "$d")" ||
-				continue
+for d in ${MOUNTPOINTS-}; do
+	out="$(sys_findmnt -n -o TARGET,FSTYPE,OPTIONS --target "$d")" ||
+		continue
 
-			src="$(sys_findmnt -n -o UUID --target "$d")"
-			prefix='UUID='
+	src="$(sys_findmnt -n -o UUID --target "$d")"
+	prefix='UUID='
 
-			[ -n "$src" ] || { src="$(sys_findmnt -n -o LABEL  --target "$d")"; prefix='LABEL='; }
-			[ -n "$src" ] || { src="$(sys_findmnt -n -o SOURCE --target "$d")"; prefix=''; }
-			[ -n "$src" ] || continue
+	[ -n "$src" ] || { src="$(sys_findmnt -n -o LABEL  --target "$d")"; prefix='LABEL='; }
+	[ -n "$src" ] || { src="$(sys_findmnt -n -o SOURCE --target "$d")"; prefix=''; }
+	[ -n "$src" ] || continue
 
-			printf '%s%s %s 0 0\n' "$prefix" "$src" "$out"
-		done >"$DIR"/etc/fstab
+	printf '%s%s %s 0 0\n' "$prefix" "$src" "$out"
+done >"$DIR"/etc/fstab
 
-		sort -uo "$DIR"/etc/fstab "$DIR"/etc/fstab
-
-		printf '%s\n' "$DIR"
-		;;
-esac
+sort -uo "$DIR"/etc/fstab "$DIR"/etc/fstab
diff --git a/features/rootfs/rules.mk b/features/rootfs/rules.mk
@@ -1,8 +1,10 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-$(call assgin-shell-once,ROOTFS_DIRS,$(FEATURESDIR)/rootfs/bin/create-fstab dirs)
-
-PUT_FEATURE_DIR += $(ROOTFS_DIRS)
-
 $(call set-sysconfig,init,QUIET,$(RUNTIME_QUIET))
 $(call set-sysconfig,init,LOGLEVEL,$(RUNTIME_DMESG_LOGLEVEL))
+
+rootfs-fstab: create
+	@$(VMSG) "Generating fstab..."
+	@$(FEATURESDIR)/rootfs/bin/create-fstab
+
+pack: rootfs-fstab
diff --git a/features/sshfsroot/bin/get-dirs b/features/sshfsroot/bin/get-dirs
@@ -1,7 +1,8 @@
 #!/bin/bash -efu
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-DIR="$WORKDIR/root"
+DIR="$ROOTDIR"
+
 mkdir -p -- "$DIR/home/root/.ssh"
 chmod 700 -- "$DIR/home/root/.ssh"
 
@@ -20,5 +21,3 @@ done
 
 [ -z "${SSHFS_CONFIG-}" ] ||
 	cp -- "$SSHFS_CONFIG" "$DIR/home/root/.ssh/config"
-
-printf '%s\n' "$DIR"
diff --git a/features/sshfsroot/rules.mk b/features/sshfsroot/rules.mk
@@ -1,8 +1,12 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-$(call assgin-shell-once,SSHFS_DIRS,$(FEATURESDIR)/sshfsroot/bin/get-dirs)
-
 MODULES_PRELOAD	+= $(SSHFS_PRELOAD)
 
-PUT_FEATURE_DIRS  += $(SSHFS_DATADIR) $(SSHFS_DIRS)
+PUT_FEATURE_DIRS  += $(SSHFS_DATADIR)
 PUT_FEATURE_PROGS += $(SSHFS_PROGS)
+
+sshfs-keys: create
+	@$(VMSG) "Adding ssh keys..."
+	@$(FEATURESDIR)/sshfsroot/bin/get-dirs
+
+pack: sshfs-keys
diff --git a/features/system-glibc/bin/system-glibc-libgcc_s b/features/system-glibc/bin/system-glibc-libgcc_s
@@ -3,13 +3,7 @@
 
 . sh-functions
 
-verbose1 "Copying files from libgcc_s.so* ..."
+verbose1 "Searching files from libgcc_s.so* ..."
 
-case "${1-}" in
-	files)
-		get-ldconfig --libs |
-			grep -e '/libgcc_s\.so.*' ||:
-		;;
-	dirs)
-		;;
-esac
+get-ldconfig --libs |
+	grep -e '/libgcc_s\.so.*' ||:
diff --git a/features/system-glibc/bin/system-glibc-libnss b/features/system-glibc/bin/system-glibc-libnss
@@ -3,30 +3,9 @@
 
 . sh-functions
 
-verbose1 "Copying files from libnss_files.so* ..."
+verbose1 "Searching files from libnss_files.so* ..."
 
-case "${1-}" in
-	files)
-		get-ldconfig --libs |
-			grep \
-				-e '/libnss_files\.so.*' \
-				-e '/libnss_dns\.so.*' ||:
-		;;
-	dirs)
-		DIR="$WORKDIR/root"
-
-		mkdir -p -- "$DIR"/etc
-		cat >"$DIR"/etc/nsswitch.conf <<-EOF
-			passwd:    files
-			group:     files
-			shadow:    files
-			hosts:     files dns
-			networks:  files
-			rpc:       files
-			services:  files
-			protocols: files
-		EOF
-
-		printf '%s\n' "$DIR"
-		;;
-esac
+get-ldconfig --libs |
+	grep \
+		-e '/libnss_files\.so.*' \
+		-e '/libnss_dns\.so.*' ||:
diff --git a/features/system-glibc/bin/system-glibc-network b/features/system-glibc/bin/system-glibc-network
@@ -1,30 +1,20 @@
 #!/bin/bash -efu
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-. sh-functions
+DIR="$ROOTDIR"
 
-case "${1-}" in
-	files)
-		;;
-	dirs)
-		DIR="$WORKDIR/root"
+mkdir -p -- "$DIR"/etc
 
-		mkdir -p -- "$DIR"/etc
+echo '127.0.0.1 localhost.localdomain localhost' >"$DIR"/etc/hosts
+echo ''                                          >"$DIR"/etc/resolv.conf
 
-		echo '127.0.0.1 localhost.localdomain localhost' >"$DIR"/etc/hosts
-		echo ''                                          >"$DIR"/etc/resolv.conf
+for n in protocols rpc services; do
+	:> "$DIR/etc/$n"
+	[ ! -e "/etc/$n" ] ||
+		grep -E -v '^[[:space:]]*(#.*)?$' "/etc/$n" > "$DIR/etc/$n" ||:
+done
 
-		for n in protocols rpc services; do
-			:> "$DIR/etc/$n"
-			[ ! -e "/etc/$n" ] ||
-				grep -E -v '^[[:space:]]*(#.*)?$' "/etc/$n" > "$DIR/etc/$n" ||:
-		done
-
-		cat >"$DIR"/etc/host.conf <<-EOF
-			order hosts,bind
-			multi on
-		EOF
-
-		printf '%s\n' "$DIR"
-		;;
-esac
+cat >"$DIR"/etc/host.conf <<-EOF
+	order hosts,bind
+	multi on
+EOF
diff --git a/features/system-glibc/bin/system-glibc-pwgr b/features/system-glibc/bin/system-glibc-pwgr
diff --git a/features/system-glibc/rules.mk b/features/system-glibc/rules.mk
diff --git a/features/zfs/bin/get-data b/features/zfs/bin/get-data
diff --git a/features/zfs/rules.mk b/features/zfs/rules.mk
