Unify initcpio hooks to one glorious archiso hook

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>

3 files changed, 7 insertions, 33 deletions

diff --git a/archiso/install/archiso b/archiso/install/archiso
index 7b58831..1ec09ed 100644
--- a/archiso/install/archiso
+++ b/archiso/install/archiso
@@ -1,10 +1,17 @@
 install ()
 {
     MODULES="cdrom ide-cd_mod ide-core ide-generic unionfs squashfs isofs loop $(all_modules '/kernel/fs' | grep -v "nls") "
+    MODULES="${MODULES} $(checked_modules "/usb/host" | grep -ve "_cs" -e "sl1811-hcd" -e "isp116x-hcd")"
+    MODULES=$(echo ${MODULES}) #trim whitespace
+    if [ "x${MODULES}" != "x" ]; then
+        MODULES="${MODULES} usb_storage sd_mod sr_mod"
+    fi
+
     BINARIES=""
     FILES=""
     add_dir /real_root
     add_dir /tmpfs
+    add_dir /bootmnt
     SCRIPT="archiso"
 }
 
diff --git a/archiso/install/boot-cd b/archiso/install/boot-cd
deleted file mode 100644
index 2d96869..0000000
--- a/archiso/install/boot-cd
+++ /dev/null
@@ -1,17 +0,0 @@
-install ()
-{
-    MODULES="cdrom ide-cd_mod ide-core ide-generic unionfs squashfs isofs $(all_modules '/kernel/fs' | grep -v "nls") "
-
-    # need usb modules for external drives
-    MODULES="${MODULES} $(checked_modules "/usb/host" | grep -ve "_cs" -e "sl1811-hcd" -e "isp116x-hcd")"
-    MODULES=$(echo ${MODULES}) #trim whitespace
-    if [ "x${MODULES}" != "x" ]; then
-        MODULES="${MODULES} usb_storage sd_mod sr_mod"
-    fi
-
-    BINARIES=""
-    FILES=""
-    SCRIPT="boot-cd"
-}
-
-# vim:ft=sh:ts=4:sw=4:et:
diff --git a/archiso/install/boot-usb b/archiso/install/boot-usb
deleted file mode 100644
index 32d451f..0000000
--- a/archiso/install/boot-usb
+++ /dev/null
@@ -1,16 +0,0 @@
-install ()
-{
-    MODULES="cdrom ide-cd_mod ide-core ide-generic unionfs squashfs $(all_modules '/kernel/fs' | grep -v "nls") "
-
-    MODULES="${MODULES} $(checked_modules "/usb/host" | grep -ve "_cs" -e "sl1811-hcd" -e "isp116x-hcd")"
-
-    MODULES=$(echo ${MODULES}) #trim whitespace
-    if [ "x${MODULES}" != "x" ]; then
-        MODULES="${MODULES} usb_storage sd_mod sr_mod"
-    fi
-    BINARIES=""
-    FILES=""
-    SCRIPT="boot-usb"
-}
-
-# vim:ft=sh:ts=4:sw=4:et: