Both ISO and USB images now have a disk label like ARCHISO-yyyy.mm (ex.
ARCHISO-2009.08). This is usefull to identify the images by user and is
a base to identify the boot device during archiso-hook (see FS#10831) by
/dev/disk/by-label.
Also enabled the missing -C option of mkarchiso, so a specific
pacman.conf could be supplied to mkarchiso.
Signed-off-by: Gerhard Brauer
---
archiso/mkarchiso | 7 +++++--
configs/install-iso/Makefile | 8 ++++----
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 530403c..0e843cb 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -15,6 +15,7 @@ usage ()
echo " -f Force overwrite of working files/squashfs image/bootable image"
echo " -p PACKAGE(S) Additional package(s) to install, can be used multiple times"
echo " -C <file> Config file for pacman. Default $PACCONFIG"
+ echo " -L <label> ISO/Image label"
echo " -v Enable verbose output."
echo " -h This message."
echo " commands:"
@@ -28,10 +29,11 @@ usage ()
exit $1
}
-while getopts 'i:P:p:a:t:fvh' arg; do
+while getopts 'L:C:i:P:p:a:t:fvh' arg; do
case "${arg}" in
p) PKGLIST="${PKGLIST} ${OPTARG}" ;;
C) PACCONFIG="${OPTARG}" ;;
+ L) LABEL="${OPTARG}" ;;
f) FORCE="y" ;;
v) QUIET="n" ;;
h|?) usage 0 ;;
@@ -251,6 +253,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 +270,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
diff --git a/configs/install-iso/Makefile b/configs/install-iso/Makefile
index 77ed056..63f7935 100644
--- a/configs/install-iso/Makefile
+++ b/configs/install-iso/Makefile
@@ -19,16 +19,16 @@ all-ftp: ftp-iso ftp-usb
all-core: core-iso core-usb
core-usb: core-pkgs overlay $(BOOTLOADER)
- mkarchiso -f -p $(BOOTLOADER) usb $(WORKDIR) $(COREname).img
+ mkarchiso -L "ARCHISO-${ver}" -f -p $(BOOTLOADER) usb $(WORKDIR) $(COREname).img
core-iso: core-pkgs overlay $(BOOTLOADER)
- mkarchiso -f -p $(BOOTLOADER) iso $(WORKDIR) $(COREname).iso
+ mkarchiso -L "ARCHISO-${ver}" -f -p $(BOOTLOADER) iso $(WORKDIR) $(COREname).iso
ftp-usb: overlay $(BOOTLOADER)
- mkarchiso -f -p $(BOOTLOADER) usb $(WORKDIR) $(FTPname).img
+ mkarchiso -L "ARCHISO-${ver}" -f -p $(BOOTLOADER) usb $(WORKDIR) $(FTPname).img
ftp-iso: overlay $(BOOTLOADER)
- mkarchiso -f -p $(BOOTLOADER) iso $(WORKDIR) $(FTPname).iso
+ mkarchiso -L "ARCHISO-${ver}" -f -p $(BOOTLOADER) iso $(WORKDIR) $(FTPname).iso
overlay: base-iso
cp -r overlay $(WORKDIR)/
--
1.6.3.3