Johannes/ISO
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use a label when generating the image and pass it to the commandline

Browse Source 
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>
This commit is contained in:
Gerhard Brauer 2009-07-26 11:00:44 +02:00 committed by Aaron Griffin
parent 9794a6fb7c
commit 8d57752ced
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
archiso/mkarchiso
View File

@ -214,6 +214,10 @@ _imgcommon () {
fi
cp "${work_dir}/isomounts" "${work_dir}/iso/"
export LABEL="ARCHISO_$(pwgen -n 8 1 | tr [a-z] [A-Z])"
[ -f ${work_dir}/iso/boot/grub/menu.lst ] && sed "s|archisolabel=[^ ]*|archisolabel=${LABEL}|" -i ${work_dir}/iso/boot/grub/menu.lst
[ -f ${work_dir}/iso/boot/isolinux/isolinux.cfg ] && sed "s|archisolabel=[^ ]*|archisolabel=${LABEL}|" -i ${work_dir}/iso/boot/isolinux/isolinux.cfg
}
command_iso () {
@ -251,6 +255,7 @@ command_iso () {
-no-emul-boot -boot-load-size 4 -boot-info-table \
-publisher "Arch Linux <http://www.archlinux.org>" \
-A "Arch Linux Live/Rescue CD" \
-V "${LABEL}" \
-o "${imgname}" "${work_dir}/iso/"
}
@ -267,7 +272,7 @@ command_usb () {
dd if=/dev/zero of="$fsimg" bs=512 count="$imgsz"
# create a filesystem on the image
mke2fs -m 0 -F "$fsimg"
mke2fs -m 0 -F -L "${LABEL}" "$fsimg"
# mount the filesystem and copy data
modprobe loop

4
configs/install-iso/Makefile
View File

@ -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/

4
configs/install-iso/boot-files/grub/menu.lst
View File

@ -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

4
configs/install-iso/boot-files/isolinux/isolinux.cfg
View File

@ -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