Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bächler <thomas@archlinux.org>2010-07-21 23:54:05 +0200
committerThomas Bächler <thomas@archlinux.org>2010-07-21 23:54:05 +0200
commit3c7340c6aa30737fe04c9ea1ec8a5ea0a4f2e2a9 (patch)
tree67c21810a359dddf713fe998d54af6eb1a6f9d0f
parent7725dba216a8152ab77a1f16a68e1965875b6a72 (diff)
Add HDT to the boot menu
HDT is a hardware detection/info tool. It will show information about your hardware, including PCI devices. It will also show the names of the kernel modules that will support your devices.
-rwxr-xr-xarchiso2dual/archiso2dual1
-rw-r--r--archiso2dual/isolinux.cfg6
-rw-r--r--configs/syslinux-iso/Makefile5
-rw-r--r--configs/syslinux-iso/boot-files/isolinux/isolinux.cfg6
4 files changed, 17 insertions, 1 deletions
diff --git a/archiso2dual/archiso2dual b/archiso2dual/archiso2dual
index e3b49ad..a269de8 100755
--- a/archiso2dual/archiso2dual
+++ b/archiso2dual/archiso2dual
@@ -55,6 +55,7 @@ isolinux_copy() {
cp ${_v} $work_dir/i686/mnt/boot/isolinux/isolinux.bin $work_dir/iso/boot/isolinux/
cp ${_v} $work_dir/i686/mnt/boot/isolinux/pxelinux.0 $work_dir/iso/boot/isolinux/
cp ${_v} $work_dir/i686/mnt/boot/isolinux/gpxelinux.0 $work_dir/iso/boot/isolinux/
+ cp ${_v} -r $work_dir/i686/mnt/boot/isolinux/hdt $work_dir/iso/boot/isolinux/
}
isolinuxcfg_copy() {
diff --git a/archiso2dual/isolinux.cfg b/archiso2dual/isolinux.cfg
index 071c87b..7632257 100644
--- a/archiso2dual/isolinux.cfg
+++ b/archiso2dual/isolinux.cfg
@@ -67,6 +67,12 @@ LABEL memtest
MENU LABEL Run Memtest86+ (RAM test)
KERNEL /boot/memtest
+# http://hdt-project.org/
+LABEL hdt
+MENU LABEL Hardware Information (HDT)
+KERNEL hdt.c32
+APPEND modules_alias=hdt/modalias.gz pciids=hdt/pciids.gz
+
# http://www.vortex.prodigynet.co.uk/x86test/
LABEL x86test
MENU LABEL Run x86test (CPU test)
diff --git a/configs/syslinux-iso/Makefile b/configs/syslinux-iso/Makefile
index 8990f0f..5f0383f 100644
--- a/configs/syslinux-iso/Makefile
+++ b/configs/syslinux-iso/Makefile
@@ -46,7 +46,10 @@ bootfiles: root-image
cp $(WORKDIR)/root-image/usr/lib/syslinux/memdisk $(WORKDIR)/iso/boot/isolinux/
cp $(WORKDIR)/root-image/usr/lib/syslinux/pxelinux.0 $(WORKDIR)/iso/boot/isolinux/
cp $(WORKDIR)/root-image/usr/lib/syslinux/gpxelinux.0 $(WORKDIR)/iso/boot/isolinux/
-
+ # Add pci.ids and modules.alias for hdt
+ mkdir -p $(WORKDIR)/iso/boot/isolinux/hdt/
+ wget -O - http://pciids.sourceforge.net/v2.2/pci.ids | gzip -9 > $(WORKDIR)/iso/boot/isolinux/hdt/pciids.gz
+ cat $(WORKDIR)/root-image/lib/modules/$(shell grep ^ALL_kver $(kver_FILE) | cut -d= -f2)/modules.alias | gzip -9 > $(WORKDIR)/iso/boot/isolinux/hdt/modalias.gz
# Rules for initcpio images
initcpio: $(WORKDIR)/iso/boot/archiso.img
diff --git a/configs/syslinux-iso/boot-files/isolinux/isolinux.cfg b/configs/syslinux-iso/boot-files/isolinux/isolinux.cfg
index 3cac5da..a0d258e 100644
--- a/configs/syslinux-iso/boot-files/isolinux/isolinux.cfg
+++ b/configs/syslinux-iso/boot-files/isolinux/isolinux.cfg
@@ -56,6 +56,12 @@ LABEL memtest
MENU LABEL Run Memtest86+ (RAM test)
KERNEL /boot/memtest
+# http://hdt-project.org/
+LABEL hdt
+MENU LABEL Hardware Information (HDT)
+KERNEL hdt.c32
+APPEND modules_alias=hdt/modalias.gz pciids=hdt/pciids.gz
+
# http://www.vortex.prodigynet.co.uk/x86test/
LABEL x86test
MENU LABEL Run x86test (CPU test)