From 00279cff09b0b4186e57ccfe44a471a40cb26292 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tobias@T-POWA-LX.(none)>
Date: Sat, 25 Jul 2009 11:18:20 +0200
Subject: [PATCH] change to manual setting of advanced hooks

---
 lib/initcpio/hooks/arch_advanced_root   | 2 +-
 lib/initcpio/install/arch_advanced_root | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/initcpio/hooks/arch_advanced_root b/lib/initcpio/hooks/arch_advanced_root
index 0e334a46c..249fbe9ee 100644
--- a/lib/initcpio/hooks/arch_advanced_root
+++ b/lib/initcpio/hooks/arch_advanced_root
@@ -2,7 +2,7 @@
 run_hook ()
 {
 if ! [ "${root}" = "" -a "${ip}" = "" ]; then
-    HOOKS="$(hwdetect --rootdevice=${root} --advanced)"
+    HOOKS="$advanced"
     echo $HOOKS | grep -q lvm && export LVMRUN=1
     echo $HOOKS | grep -q mdadm && export MDADMRUN=1
     echo $HOOKS | grep -q encrypt && export ENCRYPTRUN=1
diff --git a/lib/initcpio/install/arch_advanced_root b/lib/initcpio/install/arch_advanced_root
index 470564f47..f3395ddbd 100644
--- a/lib/initcpio/install/arch_advanced_root
+++ b/lib/initcpio/install/arch_advanced_root
@@ -3,7 +3,7 @@
 install ()
 {
     MODULES=""
-    BINARIES="hwdetect"
+    BINARIES=""
     FILES=""
     SCRIPT="arch_advanced_root"
 }
@@ -11,7 +11,8 @@ install ()
 help ()
 {
 cat <<HELPEOF
-  This hook will use hwdetect to detect the needed 
-  advanced hooks for your system.
+  This hook will override advanced hooks for your system.
+  Use advanced="your hooks hooks" eg. advanced="encrypt mdadm"
+  to override the defaults.
 HELPEOF
 }