stage2: updated 80-make-initfs

propagator-20121109-alt1 obsoleted initfs (and dropped mkinitfs script altogether); that was taken into account in both make-initrd-propagator and mkimage-profiles-desktop but not in mkimage proper, see also discussion in #27976.

stage2: updated 80-make-initfs
bd427df7 · Michael Shigorin · 06b97858 · bd427df7
Commit bd427df7 authored Nov 14, 2012 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 6 deletions

80-make-initfs features.in/stage2/stage1/scripts.d/80-make-initfs +3 -6

No files found.
--- a/features.in/stage2/stage1/scripts.d/80-make-initfs
+++ b/features.in/stage2/stage1/scripts.d/80-make-initfs
@@ -23,13 +23,10 @@ fi
 if make-initrd $MAKE_INITRD_OPTS; then
 	pdir="$(getconf LIBDIR)/propagator"
-	if [ -d "$pdir" ]; then		# p5/t6
+	mkdir -p "$pdir"
-		verbose "$pdir exists"
+	gzip < /boot/initrd-$kver.img > "$pdir"/initfs
-		gzip < /boot/initrd-$kver.img > "$pdir"/initfs
-	else
-		verbose "$pdir missing, no-op"
-	fi
 else
+	verbose "make-initrd failed"
 	exit 1
 fi