summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Griffin <aaronmgriffin@gmail.com>2008-09-06 21:07:57 -0500
committerAaron Griffin <aaronmgriffin@gmail.com>2008-09-06 21:07:57 -0500
commit00853df32ba9cb01a755de946ba65d45a3300ac7 (patch)
tree2da4226a1f6e76083fba84505195562bb84fbc6e
parent9417199206e59c2015ba764e66a4b536b95629f5 (diff)
downloadarchiso32-00853df32ba9cb01a755de946ba65d45a3300ac7.tar.xz
Convert to unified archiso hook
No longer any difference between USB and CD booting Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-rw-r--r--configs/install-iso/Makefile8
-rw-r--r--configs/install-iso/initcpio-ide2
-rw-r--r--configs/install-iso/initcpio-pata2
-rw-r--r--configs/install-iso/initcpio-usb-ide6
-rw-r--r--configs/install-iso/initcpio-usb-pata6
5 files changed, 6 insertions, 18 deletions
diff --git a/configs/install-iso/Makefile b/configs/install-iso/Makefile
index 4af62c3..5a9331e 100644
--- a/configs/install-iso/Makefile
+++ b/configs/install-iso/Makefile
@@ -7,8 +7,8 @@ COREname=$(PWD)/archlinux-$(ver)-core-$(carch)
all: core-iso core-usb ftp-iso ftp-usb
core-usb: .work-core
- mkinitcpio -c initcpio-usb-ide -b .work-core/install -k $(kver) -g .work-core/img/boot/archlive-ide.img
- mkarchiso -v -t disk -i initcpio-usb-pata img .work-core $(COREname).img
+ mkinitcpio -c initcpio-ide -b .work-core/install -k $(kver) -g .work-core/img/boot/archlive-ide.img
+ mkarchiso -v -t disk -i initcpio-pata img .work-core $(COREname).img
core-iso: .work-core
mkinitcpio -c initcpio-ide -b .work-core/install -k $(kver) -g .work-core/img/boot/archlive-ide.img
@@ -16,8 +16,8 @@ core-iso: .work-core
ftp-usb: .work-ftp
- mkinitcpio -c initcpio-usb-ide -b .work-ftp/install -k $(kver) -g .work-ftp/img/boot/archlive-ide.img
- mkarchiso -v -t disk -i initcpio-usb-pata img .work-ftp $(FTPname).img
+ mkinitcpio -c initcpio-ide -b .work-ftp/install -k $(kver) -g .work-ftp/img/boot/archlive-ide.img
+ mkarchiso -v -t disk -i initcpio-pata img .work-ftp $(FTPname).img
ftp-iso: .work-ftp
mkinitcpio -c initcpio-ide -b .work-ftp/install -k $(kver) -g .work-ftp/img/boot/archlive-ide.img
diff --git a/configs/install-iso/initcpio-ide b/configs/install-iso/initcpio-ide
index 4571664..e8cb0af 100644
--- a/configs/install-iso/initcpio-ide
+++ b/configs/install-iso/initcpio-ide
@@ -3,4 +3,4 @@ MODULES=""
BINARIES=""
FILES=""
-HOOKS="base udev boot-cd archiso ide scsi sata usb fw filesystems"
+HOOKS="base udev archiso ide scsi sata usb fw filesystems"
diff --git a/configs/install-iso/initcpio-pata b/configs/install-iso/initcpio-pata
index ef64f9c..ecda1b9 100644
--- a/configs/install-iso/initcpio-pata
+++ b/configs/install-iso/initcpio-pata
@@ -3,4 +3,4 @@ MODULES=""
BINARIES=""
FILES=""
-HOOKS="base udev boot-cd archiso pata scsi sata usb fw filesystems"
+HOOKS="base udev archiso pata scsi sata usb fw filesystems"
diff --git a/configs/install-iso/initcpio-usb-ide b/configs/install-iso/initcpio-usb-ide
deleted file mode 100644
index 7803b79..0000000
--- a/configs/install-iso/initcpio-usb-ide
+++ /dev/null
@@ -1,6 +0,0 @@
-# vim:set ft=sh
-MODULES=""
-BINARIES=""
-FILES=""
-
-HOOKS="base udev boot-usb archiso ide scsi sata usb fw filesystems"
diff --git a/configs/install-iso/initcpio-usb-pata b/configs/install-iso/initcpio-usb-pata
deleted file mode 100644
index 51dcb14..0000000
--- a/configs/install-iso/initcpio-usb-pata
+++ /dev/null
@@ -1,6 +0,0 @@
-# vim:set ft=sh
-MODULES=""
-BINARIES=""
-FILES=""
-
-HOOKS="base udev boot-usb archiso pata scsi sata usb fw filesystems"