80-make-initfs: fix for current make-initrd*

Thanks mithraen@ for spotting, boyarsh@ for explaining, and legion@ for hearty support :) The problem would manifest itself like this: /.host/script.sh: line 20: /usr/lib64/propagator/initfs: \ No such file or directory mki-scripts: .../stage1/scripts.d/80-make-initfs: unable to run script.

80-make-initfs: fix for current make-initrd*
12a2fc98 · Michael Shigorin · 30d0340d · 12a2fc98
Commit 12a2fc98 authored Sep 24, 2012 by Michael Shigorin
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

80-make-initfs features.in/stage2/stage1/scripts.d/80-make-initfs +4 -1

No files found.
--- a/features.in/stage2/stage1/scripts.d/80-make-initfs
+++ b/features.in/stage2/stage1/scripts.d/80-make-initfs
@@ -17,7 +17,10 @@ if [ "`rpmvercmp "$MAKE_INITRD_VER" "0.7.8"`" != "-1" ]; then
 fi

 if make-initrd $MAKE_INITRD_OPTS; then
-	gzip < /boot/initrd-$kver.img > $(getconf LIBDIR)/propagator/initfs
+	pdir="$(getconf LIBDIR)/propagator/initfs"
+	if [ -d "$pdir" ]; then		# p5/t6
+		gzip < /boot/initrd-$kver.img > "$pdir"/initfs
+	fi
 else
 	exit 1
 fi