From 2d375dd6f6570d09d0ee0338b1aa479a730b1253 Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Tue, 19 Feb 2013 17:40:40 +0400 Subject: [PATCH] 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. --- features.in/stage2/stage1/scripts.d/10-initrd-base | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/features.in/stage2/stage1/scripts.d/10-initrd-base b/features.in/stage2/stage1/scripts.d/10-initrd-base index 8de01af..eb8e856 100755 --- 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 -- 1.8.1.3