diff options
| author | Gerhard Brauer <gerbra@archlinux.de> | 2009-07-26 11:00:44 +0200 |
|---|---|---|
| committer | Aaron Griffin <aaronmgriffin@gmail.com> | 2009-07-27 11:03:38 -0700 |
| commit | 8d57752cedf7ecef5bf7b017755c7fc8274578b0 (patch) | |
| tree | 9779bbcb37a7f37fc9a9d2cb80d59ae0060346f0 /configs/install-iso | |
| parent | 9794a6fb7c9c478444d791875d7930995f33820e (diff) | |
| download | archiso32-8d57752cedf7ecef5bf7b017755c7fc8274578b0.tar.xz | |
Use a label when generating the image and pass it to the commandline
This will generate a label ARCHISO_$randomstring using the pwgen
utility and add this label to the kernel command line.
A new label will be generated for each image, so it can be uniquely
identified.
Patch from brain0 <thomas@archlinux.org>
Signed-off-by: Gerhard Brauer <gerbra@archlinux.de>
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
Diffstat (limited to 'configs/install-iso')
| -rw-r--r-- | configs/install-iso/Makefile | 4 | ||||
| -rw-r--r-- | configs/install-iso/boot-files/grub/menu.lst | 4 | ||||
| -rw-r--r-- | configs/install-iso/boot-files/isolinux/isolinux.cfg | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/configs/install-iso/Makefile b/configs/install-iso/Makefile index fad177c..83e618b 100644 --- a/configs/install-iso/Makefile +++ b/configs/install-iso/Makefile @@ -44,8 +44,8 @@ base-iso: root-image cp isomounts $(WORKDIR) sed -i "s|@ARCH@|$(ARCH)|g" "$(WORKDIR)/isomounts" - mkinitcpio -c initcpio-ide -b $(WORKDIR)/root-image -k $(kver) -g $(WORKDIR)/iso/boot/archiso_ide.img - mkinitcpio -c initcpio-pata -b $(WORKDIR)/root-image -k $(kver) -g $(WORKDIR)/iso/boot/archiso_pata.img + mkinitcpio -c ./initcpio-ide -b $(WORKDIR)/root-image -k $(kver) -g $(WORKDIR)/iso/boot/archiso_ide.img + mkinitcpio -c ./initcpio-pata -b $(WORKDIR)/root-image -k $(kver) -g $(WORKDIR)/iso/boot/archiso_pata.img core-pkgs: base-iso mkdir $(WORKDIR)/core-pkgs/ diff --git a/configs/install-iso/boot-files/grub/menu.lst b/configs/install-iso/boot-files/grub/menu.lst index fd5a4bc..41a72f9 100644 --- a/configs/install-iso/boot-files/grub/menu.lst +++ b/configs/install-iso/boot-files/grub/menu.lst @@ -4,11 +4,11 @@ color light-blue/blue black/light-grey splashimage=/boot/splash.xpm.gz title Boot Arch Linux Live CD -kernel /boot/vmlinuz26 lang=en locale=en_US.UTF-8 usbdelay=5 ramdisk_size=75% +kernel /boot/vmlinuz26 lang=en locale=en_US.UTF-8 archisolabel=XXX ramdisk_size=75% initrd /boot/archiso_pata.img title Boot Arch Linux Live CD [Legacy IDE, no SATA] -kernel /boot/vmlinuz26 lang=en locale=en_US.UTF-8 usbdelay=5 ramdisk_size=75% +kernel /boot/vmlinuz26 lang=en locale=en_US.UTF-8 archisolabel=XXX ramdisk_size=75% initrd /boot/archiso_ide.img title Release Notes diff --git a/configs/install-iso/boot-files/isolinux/isolinux.cfg b/configs/install-iso/boot-files/isolinux/isolinux.cfg index d9e5084..793271e 100644 --- a/configs/install-iso/boot-files/isolinux/isolinux.cfg +++ b/configs/install-iso/boot-files/isolinux/isolinux.cfg @@ -8,11 +8,11 @@ DEFAULT arch LABEL arch KERNEL /boot/vmlinuz26 -APPEND lang=en locale=en_US.UTF-8 usbdelay=5 ramdisk_size=75% initrd=/boot/archiso_pata.img +APPEND lang=en locale=en_US.UTF-8 archisolabel=XXX ramdisk_size=75% initrd=/boot/archiso_pata.img LABEL archide KERNEL /boot/vmlinuz26 -APPEND lang=en locale=en_US.UTF-8 usbdelay=5 ramdisk_size=75% initrd=/boot/archiso_ide.img +APPEND lang=en locale=en_US.UTF-8 archisolabel=XXX ramdisk_size=75% initrd=/boot/archiso_ide.img LABEL memtest KERNEL /boot/memtest |