keremet/mkimage-profiles
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

stage2: fix cifs-related bits

Browse Source 
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...
This commit is contained in:
Michael Shigorin 2018-09-19 10:16:46 +03:00
parent 1710b0005d
commit 2b3455c29a
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
features.in/stage2/config.mk
View File

@ -1,8 +1,10 @@
# "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

7
features.in/stage2/stage1/scripts.d/20-initrd-cifs
View File

@ -1,4 +1,9 @@
#!/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