I applied this and the other 3 to mkinitfs git.
Thanks!
-nc
---
Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org
Help: alpine-devel+help@lists.alpinelinux.org
---
mdadm otherwise complains about not being able to lock
/run/mdadm/map.lock
---
mkinitfs.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mkinitfs.in b/mkinitfs.in
index 04dc99c..ced6792 100755
--- a/mkinitfs.in+++ b/mkinitfs.in
@@ -36,7 +36,7 @@ feature_files() {
initfs_base() {
local i= dirs= glob= file=
- for i in dev proc sys sbin bin .modloop lib/modules media/cdrom \+ for i in dev proc sys sbin bin run .modloop lib/modules media/cdrom \ etc/apk media/floppy media/usb newroot; do
dirs="$dirs $tmpdir/$i"
done
Thanks for this fix. I am about to refactor the way the root is
detected and not having /run made mdadm not coldplug. It took a while
for me to realize what was going bad.
I think we also need mkdir /run in initramfs-init.
Thanks!
-nc
---
Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org
Help: alpine-devel+help@lists.alpinelinux.org
---
---
initramfs-init.in | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/initramfs-init.in b/initramfs-init.in
index d687e64..78500aa 100755
--- a/initramfs-init.in+++ b/initramfs-init.in
@@ -227,12 +227,14 @@ setup_inittab_console(){
start_raid() {
local n= i=
+ local mdadm_flags= case "$KOPT_root" in
/dev/md*) n=${KOPT_root#/dev/md} ;;
esac
case "$KOPT_autoraid" in
[0-9]*) n="$n $(echo $KOPT_autoraid | tr ',' ' ')" ;;
esac
+ [ "$KOPT_quiet" = yes ] && mdadm_flags="$mdadm_flags -q" # if kernel can autostart the raid he will
for i in $n; do
mknod /dev/md$i b 9 $i
@@ -241,7 +243,7 @@ start_raid() {
# kernel cannot autostart newer versions of mdadm metadata
# so we also check if mdadm binary is there
if [ -x /sbin/mdadm ]; then
- mdadm --assemble --scan+ mdadm $mdadm_flags --assemble --scan fi
}
--
2.4.1
---
Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org
Help: alpine-devel+help@lists.alpinelinux.org
---