November 2009 - Arch-releng - lists.archlinux.org

[arch-releng] [PATCH] Fix grub lines for various encryption setups
by Thomas Bächler 06 Mar '10

06 Mar '10

The first one used a deprecated syntax and failed whenever / was not called /dev/mapper/root The second one got a cosmetical cleanup to be more consistent with what was set during the installer The third one also failed whenever / was not called /dev/mapper/root --- src/core/libs/lib-ui-interactive.sh | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh index 586abc9..d9f8795 100644 --- a/src/core/libs/lib-ui-interactive.sh +++ b/src/core/libs/lib-ui-interactive.sh @@ -1089,20 +1089,21 @@ generate_grub_menulst() { then debug 'FS' 'Grub kernel line? Found / on dm_crypt on raw' raw_device=`echo "$ANSWER_DEVICES" | sed -n '2p' | cut -d ' ' -f1` - kernel="kernel $subdir/vmlinuz26 root=$raw_device ro" + crypt_device=`echo "$ANSWER_DEVICES" | sed -n '1p' | cut -d ' ' -f1` + kernel="kernel $subdir/vmlinuz26 root=$crypt_device cryptdevice=$raw_device:`basename $crypt_device` ro" elif echo "$ANSWER_DEVICES" | sed -n '1p' | grep -q 'lvm-lv$' && echo "$ANSWER_DEVICES" | sed -n '4p' | grep -q 'dm_crypt$' && echo "$ANSWER_DEVICES" | sed -n '5p' | grep -q 'raw$' then debug 'FS' 'Grub kernel line? Found / on lvm on dm_crypt on raw' lv_device=`echo "$ANSWER_DEVICES" | sed -n '1p' | cut -d ' ' -f1` - vg_device=`echo "$ANSWER_DEVICES" | sed -n '2p' | cut -d ' ' -f1` + crypt_device=`echo "$ANSWER_DEVICES" | sed -n '4p' | cut -d ' ' -f1` raw_device=`echo "$ANSWER_DEVICES" | sed -n '5p' | cut -d ' ' -f1` - kernel="kernel $subdir/vmlinuz26 root=$lv_device cryptdevice=$raw_device:`basename $vg_device` ro" + kernel="kernel $subdir/vmlinuz26 root=$lv_device cryptdevice=$raw_device:`basename $crypt_device` ro" elif echo "$ANSWER_DEVICES" | sed -n '1p' | grep -q 'dm_crypt$' && echo "$ANSWER_DEVICES" | sed -n '2p' | grep -q 'lvm-lv$' && echo "$ANSWER_DEVICES" | sed -n '5p' | grep -q 'raw$' then debug 'FS' 'Grub kernel line? Found / on dm_crypt on lvm on raw' crypt_device=`echo "$ANSWER_DEVICES" | sed -n '1p' | cut -d ' ' -f1` lv_device=`echo "$ANSWER_DEVICES" | sed -n '2p' | cut -d ' ' -f1` - kernel=" kernel $subdir/vmlinuz26 root=$crypt_device cryptdevice=$lv_device:root ro" + kernel=" kernel $subdir/vmlinuz26 root=$crypt_device cryptdevice=$lv_device:`basename $crypt_device` ro" elif echo "$ANSWER_DEVICES" | sed -n '1p' | grep -q 'raw$' then debug 'FS' 'Grub kernel line? Found / on raw' -- 1.6.4.1

2 1

[arch-releng] new release images?
by Dieter Plaetinck 30 Nov '09

30 Nov '09

Hi guys, how do you feel about working again on some new images? for the upcoming 2.6.32 kernel? I personally wouldn't like to invest as much time as the previous times, but for 2009.08 Gerhard and i have done a lot of "infrastructure" & "process" work of which we should now feel the benefits: building new images should be smoother. So I would suggest to start working on new images in which we fix the biggest issues from last time, and add some useful features (such as http://bugs.archlinux.org/task/13213 and/or http://bugs.archlinux.org/task/10753) I've been to build.archlinux.org again to check out the state of our chroots, but I wondered: can i safely upgrade all packages (including kernel stuff)? what's the state of archiso? did we do any manual modifications to scripts such as archiso? should I install archiso from git (master) or is there a new package? Maybe we should just put an archiso git checkout in /home/archiso because it will keep on getting improvements anyway. Anything else I'm forgetting before we can start to actually build images in the chroot? Also, Gerardo has been doing great work on our bugtracker and many nice patches for archiso, and he will gladly help us out. Dieter

3 3

[arch-releng] what should AIF depend on?
by Dieter Plaetinck 27 Nov '09

27 Nov '09

dieter@dieter-ws-a7n8x-arch ~ pacman -Si aif Depends On : bash pacman Optional Deps : markdown: to generate the html installation guide is this enough? should i include coreutils and grub? (requested @ http://bugs.archlinux.org/task/16205?project=6&status[0]= ) afaik there was some stuff "that is always assumed to be installed" such as packages in the base group. But i can't find back the info about that on the developerwiki.. Dieter

2 1

[arch-releng] [PATCH 13/13] Only lock the optical drive if mounted from this
by Gerardo Exequiel Pozzi 17 Nov '09

17 Nov '09

Check if FSTYPE is iso9660 or UDF, and only in this case look the optical drive. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- archiso/hooks/archiso | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/archiso/hooks/archiso b/archiso/hooks/archiso index cf13e3d..336a014 100644 --- a/archiso/hooks/archiso +++ b/archiso/hooks/archiso @@ -124,9 +124,11 @@ run_hook () # Bind our bootmnt dir into the live system _mnt_bind /bootmnt /bootmnt - if [ -d /proc/sys/dev/cdrom ]; then - echo 0 > /proc/sys/dev/cdrom/lock - echo 0 > /proc/sys/dev/cdrom/autoeject + if [ "${FSTYPE}" = "iso9660" -o "${FSTYPE}" = "udf" ]; then + if [ -d /proc/sys/dev/cdrom ]; then + echo 0 > /proc/sys/dev/cdrom/lock + echo 0 > /proc/sys/dev/cdrom/autoeject + fi fi if [ "${break}" = "y" ]; then -- 1.6.5.2

1 0

[arch-releng] [PATCH 12/12] Rename ramdisk_size parameter to tmpfs_size to avoid conflict
by Gerardo Exequiel Pozzi 17 Nov '09

17 Nov '09

Rename ramdisk_size parameter to tmpfs_size to avoid conflict with the kernel parameter that is for old ramdisk based blockdevs (/dev/ramN) and confusion to users. The kernel parameter ramdisk_size=N is in "N * k size", while tmpfs size=N is in "N * [ k | m | g ] byte size" or "in N% of RAM", like is used by default on archiso. This parameter is used only for tmpfs in size option. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- archiso/hooks/archiso | 8 ++++---- configs/default/menu.lst | 2 +- configs/install-iso/boot-files/grub/menu.lst | 4 ++-- .../install-iso/boot-files/isolinux/isolinux.cfg | 4 ++-- configs/xfce4/overlay/boot/grub/menu.lst | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/archiso/hooks/archiso b/archiso/hooks/archiso index aeaded2..cf13e3d 100644 --- a/archiso/hooks/archiso +++ b/archiso/hooks/archiso @@ -46,8 +46,8 @@ run_hook () arch="$(uname -m)" fi - if [ "x${ramdisk_size}" = "x" ]; then - ramdisk_size="75%" + if [ "x${tmpfs_size}" = "x" ]; then + tmpfs_size="75%" fi if [ "x${isomounts}" != "x" ]; then @@ -56,8 +56,8 @@ run_hook () isomounts="/bootmnt/isomounts" fi - msg -n ":: Mounting tmpfs, size=${ramdisk_size}..." - mount -t tmpfs -o "size=${ramdisk_size}" tmpfs /tmpfs + msg -n ":: Mounting tmpfs, size=${tmpfs_size}..." + mount -t tmpfs -o "size=${tmpfs_size}" tmpfs /tmpfs msg "done." msg ":: Waiting for boot device..." diff --git a/configs/default/menu.lst b/configs/default/menu.lst index 0852720..8cad364 100644 --- a/configs/default/menu.lst +++ b/configs/default/menu.lst @@ -4,7 +4,7 @@ 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 ramdisk_size=75% +kernel /boot/vmlinuz26 lang=en locale=en_US.UTF-8 tmpfs_size=75% initrd /boot/archiso.img title Shutdown the Computer diff --git a/configs/install-iso/boot-files/grub/menu.lst b/configs/install-iso/boot-files/grub/menu.lst index 41a72f9..07bfd71 100644 --- a/configs/install-iso/boot-files/grub/menu.lst +++ b/configs/install-iso/boot-files/grub/menu.lst @@ -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 archisolabel=XXX ramdisk_size=75% +kernel /boot/vmlinuz26 lang=en locale=en_US.UTF-8 archisolabel=XXX tmpfs_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 archisolabel=XXX ramdisk_size=75% +kernel /boot/vmlinuz26 lang=en locale=en_US.UTF-8 archisolabel=XXX tmpfs_size=75% initrd /boot/archiso_ide.img title Release Notes diff --git a/configs/install-iso/boot-files/isolinux/isolinux.cfg b/configs/install-iso/boot-files/isolinux/isolinux.cfg index 793271e..5686af3 100644 --- a/configs/install-iso/boot-files/isolinux/isolinux.cfg +++ b/configs/install-iso/boot-files/isolinux/isolinux.cfg @@ -8,11 +8,11 @@ DEFAULT arch LABEL arch KERNEL /boot/vmlinuz26 -APPEND lang=en locale=en_US.UTF-8 archisolabel=XXX ramdisk_size=75% initrd=/boot/archiso_pata.img +APPEND lang=en locale=en_US.UTF-8 archisolabel=XXX tmpfs_size=75% initrd=/boot/archiso_pata.img LABEL archide KERNEL /boot/vmlinuz26 -APPEND lang=en locale=en_US.UTF-8 archisolabel=XXX ramdisk_size=75% initrd=/boot/archiso_ide.img +APPEND lang=en locale=en_US.UTF-8 archisolabel=XXX tmpfs_size=75% initrd=/boot/archiso_ide.img LABEL memtest KERNEL /boot/memtest diff --git a/configs/xfce4/overlay/boot/grub/menu.lst b/configs/xfce4/overlay/boot/grub/menu.lst index 4cd24a3..a9c964a 100644 --- a/configs/xfce4/overlay/boot/grub/menu.lst +++ b/configs/xfce4/overlay/boot/grub/menu.lst @@ -4,7 +4,7 @@ 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 ramdisk_size=75% +kernel /boot/vmlinuz26 lang=en locale=en_US.UTF-8 tmpfs_size=75% initrd /boot/archiso.img title Tools... -- 1.6.5.2

1 0

[arch-releng] [PATCH 11/11] Add a default install-iso/overlay/etc/hosts with archiso alias
by Gerardo Exequiel Pozzi 11 Nov '09

11 Nov '09

With this add if some program is started and query about hostname, no annoying delay of ~10 seconds will occur. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- configs/install-iso/overlay/etc/hosts | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) create mode 100644 configs/install-iso/overlay/etc/hosts diff --git a/configs/install-iso/overlay/etc/hosts b/configs/install-iso/overlay/etc/hosts new file mode 100644 index 0000000..b6f25e3 --- /dev/null +++ b/configs/install-iso/overlay/etc/hosts @@ -0,0 +1,8 @@ +# +# /etc/hosts: static lookup table for host names +# + +#<ip-address> <hostname.domain.org> <hostname> +127.0.0.1 localhost.localdomain localhost archiso + +# End of file -- 1.6.5.2

1 0

[arch-releng] [PATCH] Avoid force/rebuild of squashfs images if already updated.
by Gerardo Exequiel Pozzi 10 Nov '09

10 Nov '09

Check if there are any modification of files/directories inside the target directory for squashfs image. Implements in some way this item in TODO: * Add 'needsupdate' function to check if a squashfs image in the iso dir is up to date, if so, skip it; else rebuild it. No more need for the -f flag Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- archiso/mkarchiso | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/archiso/mkarchiso b/archiso/mkarchiso index b6d0f54..e71660e 100755 --- a/archiso/mkarchiso +++ b/archiso/mkarchiso @@ -159,13 +159,13 @@ _mksquash () { sqimg="${work_dir}/iso/$(basename ${1}).sqfs" echo "====> Generating SquashFS image for '${1}'" if [ -e "${sqimg}" ]; then - if [ "${FORCE}" = "y" ]; then - echo -n "Removing old SquashFS image..." + dirhaschanged=$(find ${1} -newer ${sqimg}) + if [ "${dirhaschanged}" != "" ]; then + echo "SquashFS image '${sqimg}' is not up to date, rebuilding..." rm "${sqimg}" - echo "done." else - echo "error: SquashFS image '${sqimg}' already exists, aborting." - exit 1 + echo "SquashFS image '${sqimg}' is up to date, skipping." + return fi fi -- 1.6.5.2

1 0