diff options
| author | Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> | 2010-10-21 19:36:38 -0300 |
|---|---|---|
| committer | Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> | 2010-12-07 23:48:24 -0300 |
| commit | 9629b849c5fa40bcef469a2c6f2428f2e1569ecc (patch) | |
| tree | 5d5c6dc274bc436a2761dea301e174b7f3ee7c75 /configs | |
| parent | 02caf25be944d7321506d4eb19769f7814f188f1 (diff) | |
[syslinux-iso] Unify dir scheme with -dual images
/syslinux/ syslinux only files
/arch/boot/ memtest86+ + splash.png + ...
/arch/boot/$ARCH/ Linux + initramfs
/arch/ isomounts
/arch/$ARCH/ *.sqfs
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/syslinux-iso/Makefile | 12 | ||||
| -rw-r--r-- | configs/syslinux-iso/boot-files/syslinux/syslinux.cfg | 4 | ||||
| -rw-r--r-- | configs/syslinux-iso/isomounts | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/configs/syslinux-iso/Makefile b/configs/syslinux-iso/Makefile index 7bc3a45..f9ce12f 100644 --- a/configs/syslinux-iso/Makefile +++ b/configs/syslinux-iso/Makefile @@ -36,9 +36,9 @@ $(WORKDIR)/root-image/.arch-chroot: # Rule for make /boot bootfiles: root-image - mkdir -p $(WORKDIR)/iso/$(INSTALL_DIR)/boot - cp $(WORKDIR)/root-image/boot/System.map26 $(WORKDIR)/iso/$(INSTALL_DIR)/boot/ - cp $(WORKDIR)/root-image/boot/vmlinuz26 $(WORKDIR)/iso/$(INSTALL_DIR)/boot/ + mkdir -p $(WORKDIR)/iso/$(INSTALL_DIR)/boot/$(ARCH) + cp $(WORKDIR)/root-image/boot/System.map26 $(WORKDIR)/iso/$(INSTALL_DIR)/boot/$(ARCH)/ + cp $(WORKDIR)/root-image/boot/vmlinuz26 $(WORKDIR)/iso/$(INSTALL_DIR)/boot/$(ARCH)/ cp $(WORKDIR)/root-image/boot/memtest86+/memtest.bin $(WORKDIR)/iso/$(INSTALL_DIR)/boot/memtest cp $(WORKDIR)/root-image/usr/share/licenses/common/GPL2/license.txt $(WORKDIR)/iso/$(INSTALL_DIR)/boot/memtest.COPYING cp boot-files/splash.png $(WORKDIR)/iso/$(INSTALL_DIR)/boot/ @@ -56,9 +56,9 @@ bootfiles: root-image cat $(WORKDIR)/root-image/lib/modules/$(shell grep ^ALL_kver $(kver_FILE) | cut -d= -f2)/modules.alias | gzip -9 > $(WORKDIR)/iso/syslinux/hdt/modalias.gz # Rules for initcpio images -initcpio: $(WORKDIR)/iso/$(INSTALL_DIR)/boot/archiso.img -$(WORKDIR)/iso/$(INSTALL_DIR)/boot/archiso.img: mkinitcpio.conf $(WORKDIR)/root-image/.arch-chroot - mkdir -p $(WORKDIR)/iso/$(INSTALL_DIR)/boot +initcpio: $(WORKDIR)/iso/$(INSTALL_DIR)/boot/$(ARCH)/archiso.img +$(WORKDIR)/iso/$(INSTALL_DIR)/boot/$(ARCH)/archiso.img: mkinitcpio.conf $(WORKDIR)/root-image/.arch-chroot + mkdir -p $(WORKDIR)/iso/$(INSTALL_DIR)/boot/$(ARCH)/ mkinitcpio -c ./mkinitcpio.conf -b $(WORKDIR)/root-image -k $(shell grep ^ALL_kver $(kver_FILE) | cut -d= -f2) -g $@ diff --git a/configs/syslinux-iso/boot-files/syslinux/syslinux.cfg b/configs/syslinux-iso/boot-files/syslinux/syslinux.cfg index 3ce985b..4a098f5 100644 --- a/configs/syslinux-iso/boot-files/syslinux/syslinux.cfg +++ b/configs/syslinux-iso/boot-files/syslinux/syslinux.cfg @@ -37,8 +37,8 @@ Boot the Arch Linux live medium. It allows you to install Arch Linux or perform system maintenance. ENDTEXT MENU LABEL Boot Arch Linux -LINUX /%INSTALL_DIR%/boot/vmlinuz26 -APPEND initrd=/%INSTALL_DIR%/boot/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=XXX rw_branch_size=75% locale=en_US.UTF-8 +LINUX /%INSTALL_DIR%/boot/%ARCH%/vmlinuz26 +APPEND initrd=/%INSTALL_DIR%/boot/%ARCH%/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=XXX rw_branch_size=75% locale=en_US.UTF-8 # Next line should be uncommented when prepare enviroment to boot from PXE. #IPAPPEND 3 diff --git a/configs/syslinux-iso/isomounts b/configs/syslinux-iso/isomounts index 6998f3b..608149b 100644 --- a/configs/syslinux-iso/isomounts +++ b/configs/syslinux-iso/isomounts @@ -7,6 +7,6 @@ # syntax: <img> <arch> <mount point> <type> # ORDER MATTERS! Files take top-down precedence. Be careful -overlay.sqfs @ARCH@ / squashfs -core-pkgs.sqfs @ARCH@ / squashfs -root-image.sqfs @ARCH@ / squashfs +@ARCH@/overlay.sqfs @ARCH@ / squashfs +@ARCH@/core-pkgs.sqfs @ARCH@ / squashfs +@ARCH@/root-image.sqfs @ARCH@ / squashfs |