stage2: fix cifs-related bits

sin@ was kind enough to just stick mount.cifs into initrd regardless of its presence in the chroot in question; let's look first and only add what's found. This started as a stopgap fix after make-initrd 2.2.0 which happened to collide with cifs-related m-p commits in a somewhat unfortunate manner...

stage2: fix cifs-related bits
2b3455c2 · Michael Shigorin · 1710b000 · 2b3455c2 · 2b3455c2
Commit 2b3455c2 authored Sep 19, 2018 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 2 deletions

config.mk features.in/stage2/config.mk +3 -1

20-initrd-cifs features.in/stage2/stage1/scripts.d/20-initrd-cifs +6 -1

No files found.
--- a/features.in/stage2/config.mk
+++ b/features.in/stage2/config.mk
 # "1" is not a typo
 use/stage2: sub/stage1
 	@$(call add_feature)
-	@$(call add,STAGE1_PACKAGES,file make-initrd make-initrd-propagator propagator)
+	@$(call add,STAGE1_PACKAGES,make-initrd iproute2)
+	@$(call add,STAGE1_PACKAGES,make-initrd-propagator propagator)
 	@$(call add,STAGE1_MODLISTS,$$(FEATURES))
+	@$(call xport,STAGE1_PACKAGES)
 	@$(call xport,STAGE1_KCONFIG)
 # building blocks for propagator's module cove

--- a/features.in/stage2/stage1/scripts.d/20-initrd-cifs
+++ b/features.in/stage2/stage1/scripts.d/20-initrd-cifs
 #!/bin/sh
 # add mount.cifs to for get image from samba server
+# if it's available
-echo 'PUT_FILES += /sbin/mount.cifs' >> /etc/initrd.mk
+if [ -f /sbin/mount.cifs ]; then
+	echo "PUT_FILES += /sbin/mount.cifs" >> /etc/initrd.mk
+else
+	echo "20-initrd-cifs: skipping mount.cifs (missing)"
+fi