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 /archiso | |
| 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 'archiso')
| -rwxr-xr-x | archiso/mkarchiso | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/archiso/mkarchiso b/archiso/mkarchiso index 2f51ef1..7b706ca 100755 --- a/archiso/mkarchiso +++ b/archiso/mkarchiso @@ -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 |