From af77f560f348d415bbbe5c519681cc1485f6c4e9 Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Thu, 17 Dec 2009 18:38:51 +0100 Subject: [PATCH] fixed lts message and hwdetect module blacklisting --- lib/initcpio/hooks/arch_hwdetect | 2 +- lib/initcpio/hooks/arch_hwdetect_lts | 2 +- usr/bin/archboot-allinone.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/initcpio/hooks/arch_hwdetect b/lib/initcpio/hooks/arch_hwdetect index d2c68d143..ba1779cfd 100644 --- a/lib/initcpio/hooks/arch_hwdetect +++ b/lib/initcpio/hooks/arch_hwdetect @@ -19,7 +19,7 @@ run_hook () msg "--------------------------------------" if [ -s /tmp/.ide-blacklist ]; then for i in $(sort -u /tmp/.ide-blacklist); do - msg -n "$i\" + echo -n "$i " done msg "" msg "If you need them, please use 'ide-legacy' boot option or load them by hand!" diff --git a/lib/initcpio/hooks/arch_hwdetect_lts b/lib/initcpio/hooks/arch_hwdetect_lts index 8c9b53232..f23e26d02 100644 --- a/lib/initcpio/hooks/arch_hwdetect_lts +++ b/lib/initcpio/hooks/arch_hwdetect_lts @@ -19,7 +19,7 @@ run_hook () msg "--------------------------------------" if [ -s /tmp/.ide-blacklist ]; then for i in $(sort -u /tmp/.ide-blacklist); do - msg -n "$i\" + echo -n "$i " done msg "" msg "If you need them, please use 'ide-legacy' boot option or load them by hand!" diff --git a/usr/bin/archboot-allinone.sh b/usr/bin/archboot-allinone.sh index b79603853..2a98cc545 100755 --- a/usr/bin/archboot-allinone.sh +++ b/usr/bin/archboot-allinone.sh @@ -62,7 +62,7 @@ fi # set defaults, if nothing given [ "${KERNEL}" = "" ] && KERNEL=$(uname -r) -[ "${KERNEL_LTS}" = "" ] && KERNEL_LTS="2.6.27-lts" +[ "${LTS_KERNEL}" = "" ] && LTS_KERNEL="2.6.27-lts" [ "${RELEASENAME}" = "" ] && RELEASENAME="2k10-R1" [ "${IMAGENAME}" = "" ] && IMAGENAME="Archlinux-allinone-$(date +%Y.%m)"