stage2: fix 10-initrd-base for current make-initrd

It was removing autodetection setting completely thus implicitly setting it to the default "all" with make-initrd-0.8.1+; just set it to be empty. Thanks legion@ and boyarsh@; see also #28578.

stage2: fix 10-initrd-base for current make-initrd
6139571a · Michael Shigorin · d3a39f21 · 6139571a
Commit 6139571a authored Feb 19, 2013 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

10-initrd-base features.in/stage2/stage1/scripts.d/10-initrd-base +9 -1

No files found.
--- a/features.in/stage2/stage1/scripts.d/10-initrd-base
+++ b/features.in/stage2/stage1/scripts.d/10-initrd-base
@@ -2,5 +2,13 @@
 # prepare base make-initrd configuration for stage1
 # see also http://www.altlinux.org/Make-initrd-propagator

-sed -i 's/AUTODETECT/#&/' /etc/initrd.mk
+MAKE_INITRD_VER="`make-initrd -V \
+	| sed -rn 's/^make-initrd version ([0-9.]+)/\1/p'`"
+
+if [ "`rpmvercmp "$MAKE_INITRD_VER" "0.8.1"`" != "-1" ]; then
+	echo 'AUTODETECT =' >> /etc/initrd.mk	# make-initrd >= 0.8.1
+else
+	sed -i 's/AUTODETECT/#&/' /etc/initrd.mk	# see also #28578
+fi
+
 echo 'FEATURES += propagator' >> /etc/initrd.mk