[arch-releng] Archiso patch (FS#10831)
[PATCH] Label creation on ISO and USB images Base modification to enable boot device mounting on Label instead of mounting each blockdevice in archiso hook. Thomas would implement the needed modifications in the hook. We have then also to modify the grub/isolinux cmdline to parse the current LABEL into initrd. Gerhard
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 <gerbra@archlinux.de> --- 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
Modified all references from old ftp-iso/-img to netinstall. This will fix FeatureRequest FS#14587 Signed-off-by: Gerhard Brauer <gerbra@archlinux.de> --- configs/install-iso/Makefile | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/configs/install-iso/Makefile b/configs/install-iso/Makefile index 63f7935..8cd05d0 100644 --- a/configs/install-iso/Makefile +++ b/configs/install-iso/Makefile @@ -7,15 +7,15 @@ ARCH?=`uname -m` BOOTLOADER?=grub-gfx PWD:=`pwd` -FTPname:=$(PWD)/archlinux-$(ver)-ftp-$(ARCH) +NETname:=$(PWD)/archlinux-$(ver)-netinstall-$(ARCH) COREname:=$(PWD)/archlinux-$(ver)-core-$(ARCH) PACKAGES="`cat packages.list` $(BOOTLOADER)" -all: ftp-iso ftp-usb core-iso core-usb -all-iso: ftp-iso core-iso -all-usb: ftp-usb core-usb -all-ftp: ftp-iso ftp-usb +all: net-iso net-usb core-iso core-usb +all-iso: net-iso core-iso +all-usb: net-usb core-usb +all-net: net-iso net-usb all-core: core-iso core-usb core-usb: core-pkgs overlay $(BOOTLOADER) @@ -24,11 +24,11 @@ core-usb: core-pkgs overlay $(BOOTLOADER) core-iso: core-pkgs overlay $(BOOTLOADER) mkarchiso -L "ARCHISO-${ver}" -f -p $(BOOTLOADER) iso $(WORKDIR) $(COREname).iso -ftp-usb: overlay $(BOOTLOADER) - mkarchiso -L "ARCHISO-${ver}" -f -p $(BOOTLOADER) usb $(WORKDIR) $(FTPname).img +net-usb: overlay $(BOOTLOADER) + mkarchiso -L "ARCHISO-${ver}" -f -p $(BOOTLOADER) usb $(WORKDIR) $(NETname).img -ftp-iso: overlay $(BOOTLOADER) - mkarchiso -L "ARCHISO-${ver}" -f -p $(BOOTLOADER) iso $(WORKDIR) $(FTPname).iso +net-iso: overlay $(BOOTLOADER) + mkarchiso -L "ARCHISO-${ver}" -f -p $(BOOTLOADER) iso $(WORKDIR) $(NETname).iso overlay: base-iso cp -r overlay $(WORKDIR)/ @@ -61,4 +61,4 @@ syslinux: cp -r $(WORKDIR)/root-image/usr/lib/syslinux/isolinux.bin $(WORKDIR)/iso/boot/isolinux clean: - rm -rf $(WORKDIR) *.img.part1 $(FTPname).img $(FTPname).iso $(COREname).img $(COREname).iso + rm -rf $(WORKDIR) *.img.part1 $(NETname).img $(NETname).iso $(COREname).img $(COREname).iso -- 1.6.3.3
Gerhard Brauer schrieb:
[PATCH] Label creation on ISO and USB images
Base modification to enable boot device mounting on Label instead of mounting each blockdevice in archiso hook. Thomas would implement the needed modifications in the hook.
We have then also to modify the grub/isolinux cmdline to parse the current LABEL into initrd.
Gerhard
I have three patches (2 + one correction) ready for this change. It boots on qemu (virtualbox crashes for some reason) from CD, didn't try USB yet. I'll clean up and send the patches tomorrow. This should make detection more reliable. @Dieter: On another note, you should probably remove the intel modem drivers from the package list (intel-536ep, intel-537). Also add the intel 5150 firmware which is missing until now.
On Sat, 25 Jul 2009 02:43:36 +0200 Thomas Bächler <thomas@archlinux.org> wrote:
@Dieter: On another note, you should probably remove the intel modem drivers from the package list (intel-536ep, intel-537). Also add the intel 5150 firmware which is missing until now.
Can you give us more info on the 2 to remove? why should we remove them? dieter@dieter-ws-a7n8x-arch ~ pacman -Ss intel | grep 5150 core/iwlwifi-5150-ucode 8.24.2.2-1 Intel wireless firmware for Intel Wireless WiFi 5150AGN this is the one we should include? @ all: is there an easy way to check if we should include any more drivers? We probably didn't give enough attention to the package list Dieter
Am Samstag, den 25.07.2009, 10:01 +0200 schrieb Dieter Plaetinck:
@ all: is there an easy way to check if we should include any more drivers? We probably didn't give enough attention to the package list
These are the packages we currently put on 2009.08-alpha2: ------------ i686 --------------------- aif aufs2-util base ddrescue dmraid dnsutils dosfstools elinks gnu-netcat grub-gfx inetutils intel-536ep intel-537 ipw2100-fw ipw2200-fw iwlwifi-3945-ucode iwlwifi-4965-ucode iwlwifi-5000-ucode joe lftp lilo memtest86+ ndiswrapper ndiswrapper-utils nfs-utils nmap ntfs-3g ntfsprogs ntp openssh openvpn parted pptpclient rt2x00-rt61-fw rt2x00-rt71w-fw speedtouch squashfs-tools tcpdump tiacx tiacx-firmware wireless_tools wlan-ng26-utils zd1211-firmware --------------- x86_64 ------------------------------- aif aufs2-util base ddrescue dmraid dnsutils dosfstools elinks gnu-netcat grub-gfx inetutils ipw2100-fw ipw2200-fw iwlwifi-3945-ucode iwlwifi-4965-ucode iwlwifi-5000-ucode joe lftp lilo memtest86+ ndiswrapper ndiswrapper-utils nfs-utils nmap ntfs-3g ntfsprogs ntp openssh openvpn parted pptpclient rt2x00-rt61-fw rt2x00-rt71w-fw speedtouch squashfs-tools tcpdump tiacx tiacx-firmware wireless_tools wlan-ng26-utils zd1211-firmware ---------------------------- Looking for firmware/driver, missing from pacman output are: core/b43-fwcutter (don't think this is usefull on LiveCD) core/iwlwifi-5150-ucode (This should be added) extra/brltty (Not sure if this is usefull without special modifications on CD/Installer. We have had already a discussion about barriere free... But adding id won't harm us and braille user has the needed kernel module) extra/madwifi (IMHO not absolute needed anymore and it could collide with kernel atheros module) IMHO with these we have most packages on image to set the user able to access internet - and install additional packages he must/will have.
Dieter
Gerhard
Gerhard Brauer schrieb:
Looking for firmware/driver, missing from pacman output are: core/b43-fwcutter (don't think this is usefull on LiveCD)
As long as it's in core, I don't mind.
core/iwlwifi-5150-ucode (This should be added)
Yes. It only supports very few cards, but still.
extra/madwifi (IMHO not absolute needed anymore and it could collide with kernel atheros module)
No. Don't add it, it will only conflict with ath5k or ath9k. It is in extra if someone really wants it.
On Sat, 25 Jul 2009 10:42:10 +0200 Gerhard Brauer <gerbra@archlinux.de> wrote:
Am Samstag, den 25.07.2009, 10:01 +0200 schrieb Dieter Plaetinck:
@ all: is there an easy way to check if we should include any more drivers? We probably didn't give enough attention to the package list
Looking for firmware/driver, missing from pacman output are: how exactly do you check this?
core/b43-fwcutter (don't think this is usefull on LiveCD) no idea
core/iwlwifi-5150-ucode (This should be added) ok
extra/brltty (Not sure if this is usefull without special modifications on CD/Installer. We have had already a discussion about barriere free... But adding id won't harm us and braille user has the needed kernel module) if it doesn't conflict with the stuff we currently use, let's add it
extra/madwifi (IMHO not absolute needed anymore and it could collide with kernel atheros module) no idea. don't know much about wireless (other then that ethernet kicks its ass and doesn't fry my brains)
IMHO with these we have most packages on image to set the user able to access internet - and install additional packages he must/will have.
Gerhard
Dieter
On Sat, Jul 25, 2009 at 12:34, Dieter Plaetinck<dieter@plaetinck.be> wrote:
On Sat, 25 Jul 2009 10:42:10 +0200 Gerhard Brauer <gerbra@archlinux.de> wrote:
Am Samstag, den 25.07.2009, 10:01 +0200 schrieb Dieter Plaetinck:
@ all: is there an easy way to check if we should include any more drivers? We probably didn't give enough attention to the package list
Looking for firmware/driver, missing from pacman output are: how exactly do you check this?
core/b43-fwcutter (don't think this is usefull on LiveCD) no idea
Yes, it is useful on LiveCD, providing that user has a firmware somewhere. I used it to install Arch on my laptop using WiFi connection on my job, with firmware downloaded from a working computer and stored on an USB flashdrive. -- Roman Kyrylych (Роман Кирилич)
Dieter Plaetinck schrieb:
@Dieter: On another note, you should probably remove the intel modem drivers from the package list (intel-536ep, intel-537). Also add the intel 5150 firmware which is missing until now.
Can you give us more info on the 2 to remove? why should we remove them?
I don't see a reason for them to be there. They're drivers for some internal windows modems, which are too slow for FTP installation anyway. And I don't like binary blobs on our ISO.
dieter@dieter-ws-a7n8x-arch ~ pacman -Ss intel | grep 5150 core/iwlwifi-5150-ucode 8.24.2.2-1 Intel wireless firmware for Intel Wireless WiFi 5150AGN
this is the one we should include?
Yes. The 5000-ucode support all 5XXX cards except the 5150.
@ all: is there an easy way to check if we should include any more drivers? We probably didn't give enough attention to the package list
Most is in-kernel anyway.
Am Samstag, den 25.07.2009, 11:35 +0200 schrieb Thomas Bächler:
Dieter Plaetinck schrieb:
@Dieter: On another note, you should probably remove the intel modem drivers from the package list (intel-536ep, intel-537). Also add the intel 5150 firmware which is missing until now.
Can you give us more info on the 2 to remove? why should we remove them?
I don't see a reason for them to be there. They're drivers for some internal windows modems, which are too slow for FTP installation anyway. And I don't like binary blobs on our ISO.
dieter@dieter-ws-a7n8x-arch ~ pacman -Ss intel | grep 5150 core/iwlwifi-5150-ucode 8.24.2.2-1 Intel wireless firmware for Intel Wireless WiFi 5150AGN
this is the one we should include?
Yes. The 5000-ucode support all 5XXX cards except the 5150.
@ all: is there an easy way to check if we should include any more drivers? We probably didn't give enough attention to the package list
Most is in-kernel anyway.
Ok, i added iwlwifi-5150-ucode to packages lists on sigurd, so it is in the next images (RC). I don't add the brltty package, cause this would install most of X libs etc. as depends.. We should think about that when looking closer to barriere free solution... I remove the intel-536ep, intel-537 from the i686 package list. I also will add pcmcia hook to the initrd images, so install devices on this bus could also be used... Gerhard
Gerhard Brauer schrieb:
I don't add the brltty package, cause this would install most of X libs etc. as depends.. We should think about that when looking closer to barriere free solution...
There was some guy working on an ISO for blind people. I think we shouldn't bother making our default ISO barriere free, as it adds much complexity. Rather see if a community project evolves out of the efforts for the blind people and then add that as a separate ISO.
I also will add pcmcia hook to the initrd images, so install devices on this bus could also be used...
Good idea, we had to do this ad-hoc last FrOSCon for some guy.
participants (4)
-
Dieter Plaetinck
-
Gerhard Brauer
-
Roman Kyrylych
-
Thomas Bächler