From 615e1e58bab14fa6566d4d7f926a35b41f52b042 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tobias@T-POWA-LX.(none)>
Date: Sun, 26 Jul 2009 18:18:30 +0200
Subject: [PATCH] fixed advanced_root array

---
 lib/initcpio/hooks/arch_advanced_root   | 8 +-------
 lib/initcpio/hooks/arch_encrypt         | 2 ++
 lib/initcpio/hooks/arch_lvm2            | 2 ++
 lib/initcpio/hooks/arch_mdadm           | 2 ++
 lib/initcpio/install/arch_advanced_root | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/initcpio/hooks/arch_advanced_root b/lib/initcpio/hooks/arch_advanced_root
index 53cf6ea52..428b290d7 100644
--- a/lib/initcpio/hooks/arch_advanced_root
+++ b/lib/initcpio/hooks/arch_advanced_root
@@ -2,23 +2,17 @@
 run_hook ()
 {
 if ! [ "${root}" = "" -a "${ip}" = "" -a "${advanced}" = "" ]; then
-    HOOKS="$(echo ${advanced})"
+    HOOKS="$(echo ${advanced} | sed -e 's#,# #g')"
     echo $HOOKS | grep -q lvm && export LVMRUN=1
     echo $HOOKS | grep -q mdadm && export MDADMRUN=1
     echo $HOOKS | grep -q encrypt && export ENCRYPTRUN=1
-    if [ -e "/hooks" ]; then
         for h in ${HOOKS}; do
-            TST=""
-            eval "TST=\$hook_${h}"
-            if [ "${TST}" != "disabled" ]; then
                 run_hook () { msg "${h}: no run function defined"; }
                 if [ -e "/hooks/${h}" ]; then
                    . /hooks/${h}
                    msg ":: Running Hook [${h}]"
                    run_hook
                 fi
-            fi
         done
-    fi
 fi
 }
\ No newline at end of file
diff --git a/lib/initcpio/hooks/arch_encrypt b/lib/initcpio/hooks/arch_encrypt
index 2f06f8a23..bd407f3dc 100644
--- a/lib/initcpio/hooks/arch_encrypt
+++ b/lib/initcpio/hooks/arch_encrypt
@@ -127,5 +127,7 @@ run_hook ()
             fi
             nuke ${ckeyfile}
         fi
+    else
+        msg ":: SKipping already run by arch_root_advanced hook..."
     fi
 }
diff --git a/lib/initcpio/hooks/arch_lvm2 b/lib/initcpio/hooks/arch_lvm2
index e153ca795..67bc61949 100644
--- a/lib/initcpio/hooks/arch_lvm2
+++ b/lib/initcpio/hooks/arch_lvm2
@@ -16,5 +16,7 @@ run_hook ()
             msg "Activating logical volumes..."
             /sbin/lvm vgchange --ignorelockingfailure -ay
         fi
+    else
+        msg ":: SKipping already run by arch_root_advanced hook..."
     fi
 }
diff --git a/lib/initcpio/hooks/arch_mdadm b/lib/initcpio/hooks/arch_mdadm
index 3e91f0d95..a19467eb5 100644
--- a/lib/initcpio/hooks/arch_mdadm
+++ b/lib/initcpio/hooks/arch_mdadm
@@ -50,5 +50,7 @@ run_hook ()
             # assemble everything
             /sbin/mdassemble.static
         fi
+    else
+        msg ":: SKipping already run by arch_root_advanced hook..."
     fi
 }
\ No newline at end of file
diff --git a/lib/initcpio/install/arch_advanced_root b/lib/initcpio/install/arch_advanced_root
index f3395ddbd..2dd3ebae6 100644
--- a/lib/initcpio/install/arch_advanced_root
+++ b/lib/initcpio/install/arch_advanced_root
@@ -12,7 +12,7 @@ help ()
 {
 cat <<HELPEOF
   This hook will override advanced hooks for your system.
-  Use advanced="your hooks hooks" eg. advanced="encrypt mdadm"
+  Use advanced=hook1,hook2,hook3 eg. advanced=arch_encrypt,arch_mdadm
   to override the defaults.
 HELPEOF
 }