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>
This commit is contained in:
parent
9794a6fb7c
commit
8d57752ced
4 changed files with 12 additions and 7 deletions
|
@ -214,6 +214,10 @@ _imgcommon () {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cp "${work_dir}/isomounts" "${work_dir}/iso/"
|
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 () {
|
command_iso () {
|
||||||
|
@ -251,6 +255,7 @@ command_iso () {
|
||||||
-no-emul-boot -boot-load-size 4 -boot-info-table \
|
-no-emul-boot -boot-load-size 4 -boot-info-table \
|
||||||
-publisher "Arch Linux <http://www.archlinux.org>" \
|
-publisher "Arch Linux <http://www.archlinux.org>" \
|
||||||
-A "Arch Linux Live/Rescue CD" \
|
-A "Arch Linux Live/Rescue CD" \
|
||||||
|
-V "${LABEL}" \
|
||||||
-o "${imgname}" "${work_dir}/iso/"
|
-o "${imgname}" "${work_dir}/iso/"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -267,7 +272,7 @@ command_usb () {
|
||||||
dd if=/dev/zero of="$fsimg" bs=512 count="$imgsz"
|
dd if=/dev/zero of="$fsimg" bs=512 count="$imgsz"
|
||||||
|
|
||||||
# create a filesystem on the image
|
# create a filesystem on the image
|
||||||
mke2fs -m 0 -F "$fsimg"
|
mke2fs -m 0 -F -L "${LABEL}" "$fsimg"
|
||||||
|
|
||||||
# mount the filesystem and copy data
|
# mount the filesystem and copy data
|
||||||
modprobe loop
|
modprobe loop
|
||||||
|
|
|
@ -44,8 +44,8 @@ base-iso: root-image
|
||||||
cp isomounts $(WORKDIR)
|
cp isomounts $(WORKDIR)
|
||||||
sed -i "s|@ARCH@|$(ARCH)|g" "$(WORKDIR)/isomounts"
|
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-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-pata -b $(WORKDIR)/root-image -k $(kver) -g $(WORKDIR)/iso/boot/archiso_pata.img
|
||||||
|
|
||||||
core-pkgs: base-iso
|
core-pkgs: base-iso
|
||||||
mkdir $(WORKDIR)/core-pkgs/
|
mkdir $(WORKDIR)/core-pkgs/
|
||||||
|
|
|
@ -4,11 +4,11 @@ color light-blue/blue black/light-grey
|
||||||
splashimage=/boot/splash.xpm.gz
|
splashimage=/boot/splash.xpm.gz
|
||||||
|
|
||||||
title Boot Arch Linux Live CD
|
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
|
initrd /boot/archiso_pata.img
|
||||||
|
|
||||||
title Boot Arch Linux Live CD [Legacy IDE, no SATA]
|
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
|
initrd /boot/archiso_ide.img
|
||||||
|
|
||||||
title Release Notes
|
title Release Notes
|
||||||
|
|
|
@ -8,11 +8,11 @@ DEFAULT arch
|
||||||
|
|
||||||
LABEL arch
|
LABEL arch
|
||||||
KERNEL /boot/vmlinuz26
|
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
|
LABEL archide
|
||||||
KERNEL /boot/vmlinuz26
|
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
|
LABEL memtest
|
||||||
KERNEL /boot/memtest
|
KERNEL /boot/memtest
|
||||||
|
|
Loading…
Add table
Reference in a new issue