summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorThomas Bächler <thomas@archlinux.org>2010-07-22 00:04:46 +0200
committerThomas Bächler <thomas@archlinux.org>2010-07-22 00:04:46 +0200
commit86ca33e76d88683f54bfb29ecb599afbd3ad7e91 (patch)
tree3f39aa6155f5668e1617c67c7a0c069109ce8d2b /configs
parentdeffe0fba938a7ef55fbecf28f20ad3d618227dc (diff)
downloadarchiso32-86ca33e76d88683f54bfb29ecb599afbd3ad7e91.tar.xz
Rename all occurrences of isolinux to syslinux
The name of the bootloader is syslinux, while isolinux is just one of many components. isolinux.bin now also accepts syslinux.cfg as a configuration file name (as do all other loaders). Thus, rename the isolinux/ folder to syslinux/, and rename isolinux.cfg to syslinux.cfg. The only occurrence of 'isolinux' is now the actual loader file 'isolinux.bin'. This makes the transition from isolinux to the other syslinux loaders easier when remastering the ISO onto another medium.
Diffstat (limited to 'configs')
-rw-r--r--configs/syslinux-iso/Makefile16
-rw-r--r--configs/syslinux-iso/boot-files/syslinux/syslinux.cfg (renamed from configs/syslinux-iso/boot-files/isolinux/isolinux.cfg)0
2 files changed, 8 insertions, 8 deletions
diff --git a/configs/syslinux-iso/Makefile b/configs/syslinux-iso/Makefile
index 5f0383f..3feb27f 100644
--- a/configs/syslinux-iso/Makefile
+++ b/configs/syslinux-iso/Makefile
@@ -41,15 +41,15 @@ bootfiles: root-image
cp $(WORKDIR)/root-image/boot/memtest86+/memtest.bin $(WORKDIR)/iso/boot/memtest
cp $(WORKDIR)/root-image/usr/share/licenses/common/GPL2/license.txt $(WORKDIR)/iso/boot/memtest.COPYING
cp -r boot-files/* $(WORKDIR)/iso/boot/
- cp $(WORKDIR)/root-image/usr/lib/syslinux/*.c32 $(WORKDIR)/iso/boot/isolinux/
- cp $(WORKDIR)/root-image/usr/lib/syslinux/isolinux.bin $(WORKDIR)/iso/boot/isolinux/
- 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/
+ cp $(WORKDIR)/root-image/usr/lib/syslinux/*.c32 $(WORKDIR)/iso/boot/syslinux/
+ cp $(WORKDIR)/root-image/usr/lib/syslinux/isolinux.bin $(WORKDIR)/iso/boot/syslinux/
+ cp $(WORKDIR)/root-image/usr/lib/syslinux/memdisk $(WORKDIR)/iso/boot/syslinux/
+ cp $(WORKDIR)/root-image/usr/lib/syslinux/pxelinux.0 $(WORKDIR)/iso/boot/syslinux/
+ cp $(WORKDIR)/root-image/usr/lib/syslinux/gpxelinux.0 $(WORKDIR)/iso/boot/syslinux/
# 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
+ mkdir -p $(WORKDIR)/iso/boot/syslinux/hdt/
+ wget -O - http://pciids.sourceforge.net/v2.2/pci.ids | gzip -9 > $(WORKDIR)/iso/boot/syslinux/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/syslinux/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/syslinux/syslinux.cfg
index 57a63fc..57a63fc 100644
--- a/configs/syslinux-iso/boot-files/isolinux/isolinux.cfg
+++ b/configs/syslinux-iso/boot-files/syslinux/syslinux.cfg