- Arch-releng - lists.archlinux.org

[arch-releng] [PATCH 3/3] Fix a typo in bootloader debug message
by Thomas Hebb 21 May '12

21 May '12

Signed-off-by: Thomas Hebb <tommyhebb(a)gmail.com> --- src/core/libs/lib-ui-interactive.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh index a9362a2..bafaafb 100644 --- a/src/core/libs/lib-ui-interactive.sh +++ b/src/core/libs/lib-ui-interactive.sh @@ -1077,7 +1077,7 @@ generate_grub_menulst() { debug FS "onraid with sep boot grubdev: $grubdev" else grubdev=$(mapdev $bootdev) - debug FS "onraid with sep boot grubdev: $grubdev" + debug FS "sep boot grubdev: $grubdev" fi fi -- 1.7.10.2

1 0

[arch-releng] [PATCH 2/3] Mount special filesystems during grub actions
by Thomas Hebb 21 May '12

21 May '12

Break grub actions on the target system out into separate functions in lib-software.sh and make sure we mount special filesystems (FS#29928). Also fix a pathname bug causing grub errors to go undetected. Signed-off-by: Thomas Hebb <tommyhebb(a)gmail.com> --- src/core/libs/lib-blockdevices-filesystems.sh | 12 ----------- src/core/libs/lib-software.sh | 27 +++++++++++++++++++++++++ src/core/libs/lib-ui-interactive.sh | 14 +++++-------- 3 files changed, 32 insertions(+), 21 deletions(-) diff --git a/src/core/libs/lib-blockdevices-filesystems.sh b/src/core/libs/lib-blockdevices-filesystems.sh index 70805c8..1d101c5 100644 --- a/src/core/libs/lib-blockdevices-filesystems.sh +++ b/src/core/libs/lib-blockdevices-filesystems.sh @@ -346,18 +346,6 @@ dev_is_in_softraid_or_lvmpv () { grep -qsw "${dev##*/}" /proc/mdstat || { pvscan -s 2>/dev/null | grep -q "$dev"; } } - -# generate the grub device map, which is a translation table between grub devicenames and linux devicenames -# hard disks get entries, but not their partitions -get_grub_map() { - inform "Generating GRUB device map...\nThis could take a while.\n\n Please be patient." - chroot $var_TARGET_DIR grub --no-floppy --device-map /boot/grub/device.map &>$TMP_GRUB_LOG <<EOF -quit -EOF - cp $var_TARGET_DIR/boot/grub/device.map $TMP_DEV_MAP -} - - # for given blockdevice, echo grub notation in this form: (hd0) or (hd0,0) (if it's a partition) # $1 : blockdevice # returns 0 on success. 1 otherwise. diff --git a/src/core/libs/lib-software.sh b/src/core/libs/lib-software.sh index 942d312..909219e 100644 --- a/src/core/libs/lib-software.sh +++ b/src/core/libs/lib-software.sh @@ -120,3 +120,30 @@ target_configure_initcpio () { fi return $ret } + +# generate the grub device map, which is a translation table between grub devicenames and linux devicenames +# hard disks get entries, but not their partitions +target_grub_devicemap () { + inform "Generating GRUB device map...\nThis could take a while.\n\n Please be patient." + target_special_fs on + chroot $var_TARGET_DIR grub --no-floppy --device-map /boot/grub/device.map &>$TMP_GRUB_LOG <<EOF +quit +EOF + target_special_fs off + cp $var_TARGET_DIR/boot/grub/device.map $TMP_DEV_MAP +} + +# install grub +# $1: boot partition (grub notation) +# $2: device to install to (grub notation) +# $3: device to install to (linux notation) +target_grub_install () { + target_special_fs on + chroot $var_TARGET_DIR grub --no-floppy --batch &>$TMP_GRUB_LOG <<EOF +device $2 $3 +root $1 +setup $2 +quit +EOF + target_special_fs off +} diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh index 36483c1..a9362a2 100644 --- a/src/core/libs/lib-ui-interactive.sh +++ b/src/core/libs/lib-ui-interactive.sh @@ -897,7 +897,7 @@ interactive_install_bootloader () { } interactive_grub() { - get_grub_map + target_grub_devicemap [ ! -f $grubmenu ] && show_warning "No grub?" "Error: Couldn't find $grubmenu. Is GRUB installed?" && return 1 debug FS "starting interactive_grub" @@ -1139,14 +1139,10 @@ interactive_grub_install () { debug FS "bootdev: $bootdev" debug FS "boothd: $boothd" - chroot $var_TARGET_DIR grub --no-floppy --batch &>$TMP_GRUB_LOG <<EOF -device $bootdev $boothd -root $bootpart -setup $bootdev -quit -EOF - cat $var_TARGET_DIR/$TMP_GRUB_LOG >$LOG - if grep -q "Error [0-9]*: " $var_TARGET_DIR/$TMP_GRUB_LOG; then + target_grub_install "$bootpart" "$bootdev" "$boothd" + + cat $TMP_GRUB_LOG >$LOG + if grep -q "Error [0-9]*: " $TMP_GRUB_LOG; then notify "Error installing GRUB. (see $LOG for output)" return 1 fi -- 1.7.10.2

1 0

[arch-releng] [PATCH 2/2] dev_used_by_environment(): follow symlinks
by Thomas Hebb 20 May '12

20 May '12

Make dev_used_by_environment follow symbolic links before checking to see if a device should be excluded. This assumes that the paths in /run/aif/ignore_block_devices are fully resolved. Signed-off-by: Thomas Hebb <tommyhebb(a)gmail.com> --- src/core/libs/lib-blockdevices-filesystems.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/libs/lib-blockdevices-filesystems.sh b/src/core/libs/lib-blockdevices-filesystems.sh index 5ceb3e5..4312143 100644 --- a/src/core/libs/lib-blockdevices-filesystems.sh +++ b/src/core/libs/lib-blockdevices-filesystems.sh @@ -329,7 +329,8 @@ find_usable_blockdevices() { # most likely this is just some loop files, some /dev/mapper/arch_* files and maybe /dev/sr0 # but in theory, could be anything dev_used_by_environment () { - local dev=$1 + # first resolve any symlinks that may exist + local dev=$(readlink -f "$1") grep -q "^$dev$" /run/aif/ignore_block_devices 2>/dev/null } -- 1.7.10.2

1 0

[arch-releng] [PATCH 1/2] find_usable_blockdevices(): prevent duplicate entries
by Thomas Hebb 20 May '12

20 May '12

Fix a regression introduced in a8f3fa4329 which causes duplicate entries to be returned for a block device in certain cases and prevents manual mountpoint configuration (FS#29859). Signed-off-by: Thomas Hebb <tommyhebb(a)gmail.com> --- src/core/libs/lib-blockdevices-filesystems.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/core/libs/lib-blockdevices-filesystems.sh b/src/core/libs/lib-blockdevices-filesystems.sh index bd38da9..5ceb3e5 100644 --- a/src/core/libs/lib-blockdevices-filesystems.sh +++ b/src/core/libs/lib-blockdevices-filesystems.sh @@ -280,14 +280,18 @@ find_usable_blockdevices() { # /dev/sda -> /dev/sda1 # /dev/cciss/c0d1 -> /dev/cciss/c0d1p1 for dev in ${devpath}*[[:digit:]]*; do + dev_used_by_environment $dev && continue has_parts=1 + usable=0 if ((include_ext)) || ! dev_is_extended_partition $dev; then - dev_used_by_environment $dev && continue - echo -ne "$dev $1" + usable=1 fi if ((include_dm)) || ! dev_is_in_softraid_or_lvmpv $dev; then - dev_used_by_environment $dev && continue + usable=1 + fi + + if ((usable)); then echo -ne "$dev $1" fi done -- 1.7.10.2

1 0

[arch-releng] [archiso] keep name resolver settings
by Christian Hesse 19 May '12

19 May '12

Hello everybody, I am not shure if this is the correct place to report or if there is any better one... If so - please let me know. Ok, the initrd hooks from archiso support PXE booting. In this case the initrd is responsible for setting up the network. All these setting are persistent, so are still valid after changing to the real system. With one exception: name resolver settings (namely file /etc/resolv.conf) are lost, which ends up in a system with network connectivity that can not resolve a single host. Even worse: When launching a dhcp client you may get a new address and end up with something completely useless as nbd connection is lost. I would like to write the final /etc/resolv.conf from within initrd. For me this completely solves the problem. Patch is attached. -- Best regards, Chris O< ascii ribbon campaign stop html mail - www.asciiribbon.org

4 8

[arch-releng] [PATCH] [archiso] use new mkinitcpio API in hooks
by Gerardo Exequiel Pozzi 19 May '12

19 May '12

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- archiso/install/archiso | 7 +++++-- archiso/install/archiso_kms | 16 ++++++++++++++-- archiso/install/archiso_loop_mnt | 2 +- archiso/install/archiso_pxe_common | 8 ++------ archiso/install/archiso_pxe_http | 2 +- archiso/install/archiso_pxe_nbd | 5 +++-- archiso/install/archiso_pxe_nfs | 5 +++-- archiso/install/archiso_shutdown | 2 +- 8 files changed, 30 insertions(+), 17 deletions(-) diff --git a/archiso/install/archiso b/archiso/install/archiso index c36c001..8893667 100644 --- a/archiso/install/archiso +++ b/archiso/install/archiso @@ -1,8 +1,11 @@ #!/bin/bash build() { - MODULES="cdrom loop dm-snapshot" - SCRIPT="archiso" + add_module "cdrom" + add_module "loop" + add_module "dm-snapshot" + + add_runscript add_binary /usr/lib/udev/cdrom_id add_binary blockdev diff --git a/archiso/install/archiso_kms b/archiso/install/archiso_kms index 6566049..3ff31f3 100644 --- a/archiso/install/archiso_kms +++ b/archiso/install/archiso_kms @@ -1,9 +1,21 @@ #!/bin/bash build() { - MODULES="radeon nouveau i915 via-agp sis-agp intel-agp" + add_module "radeon" + add_module "nouveau" + add_module "i915" + add_module "via-agp" + add_module "sis-agp" + add_module "intel-agp" + if [[ $(uname -m) == i686 ]]; then - MODULES+=" amd64-agp ati-agp sworks-agp ali-agp amd-k7-agp nvidia-agp efficeon-agp" + add_module "amd64-agp" + add_module "ati-agp" + add_module "sworks-agp" + add_module "ali-agp" + add_module "amd-k7-agp" + add_module "nvidia-agp" + add_module "efficeon-agp" fi } diff --git a/archiso/install/archiso_loop_mnt b/archiso/install/archiso_loop_mnt index 4141043..59f1d94 100644 --- a/archiso/install/archiso_loop_mnt +++ b/archiso/install/archiso_loop_mnt @@ -1,7 +1,7 @@ #!/bin/bash build() { - SCRIPT="archiso_loop_mnt" + add_runscript } help() { diff --git a/archiso/install/archiso_pxe_common b/archiso/install/archiso_pxe_common index 2e3eec5..77d0bb6 100644 --- a/archiso/install/archiso_pxe_common +++ b/archiso/install/archiso_pxe_common @@ -1,13 +1,9 @@ #!/bin/bash build() { - MODULES="${MODULES} $(comm -2 -3 <(checked_modules "/drivers/net/" | sort) \ - <(find $MODULEDIR/kernel/drivers/net/{irda,phy,wimax,wireless} \ - -name '*.ko*' \ - -exec bash -c 'printf "%s\n" "${(a)%%.ko*}" | sed "s@.*/@@;s@-@_@" | sort' _ {} +) \ - | grep -v -e 'ppp_' -e 'plip' -e 'pppoe')" - SCRIPT="archiso_pxe_common" + add_checked_modules -f "(irda|phy|wimax|wireless|ppp_|plip|pppoe)" "/drivers/net/" + add_runscript add_binary /usr/lib/initcpio/ipconfig /bin/ipconfig diff --git a/archiso/install/archiso_pxe_http b/archiso/install/archiso_pxe_http index 9e2ff65..4e02f98 100644 --- a/archiso/install/archiso_pxe_http +++ b/archiso/install/archiso_pxe_http @@ -1,7 +1,7 @@ #!/bin/bash build() { - SCRIPT="archiso_pxe_http" + add_runscript add_binary curl } diff --git a/archiso/install/archiso_pxe_nbd b/archiso/install/archiso_pxe_nbd index 1ee3910..8d9552a 100644 --- a/archiso/install/archiso_pxe_nbd +++ b/archiso/install/archiso_pxe_nbd @@ -1,8 +1,9 @@ #!/bin/bash build() { - MODULES="nbd" - SCRIPT="archiso_pxe_nbd" + add_module "nbd" + + add_runscript add_binary nbd-client diff --git a/archiso/install/archiso_pxe_nfs b/archiso/install/archiso_pxe_nfs index f210cd3..f8226e5 100644 --- a/archiso/install/archiso_pxe_nfs +++ b/archiso/install/archiso_pxe_nfs @@ -1,8 +1,9 @@ #!/bin/bash build() { - MODULES="nfs" - SCRIPT="archiso_pxe_nfs" + add_module "nfs" + + add_runscript add_binary /usr/lib/initcpio/nfsmount /bin/nfsmount } diff --git a/archiso/install/archiso_shutdown b/archiso/install/archiso_shutdown index 87b8297..962be95 100644 --- a/archiso/install/archiso_shutdown +++ b/archiso/install/archiso_shutdown @@ -1,7 +1,7 @@ #!/bin/bash build() { - SCRIPT="archiso_shutdown" + add_runscript add_file /usr/lib/initcpio/archiso_shutdown /shutdown } -- 1.7.9.6

1 1

Re: [arch-releng] Pacman Conflicts
by Mr Green 19 May '12

19 May '12

Hi Chris, What conflicts are you having problems with? mkarchiso install packages without any interaction for the most part. MrG On 19/05/12 06:35, arch-releng-request(a)archlinux.org wrote: > Send arch-releng mailing list submissions to > arch-releng(a)archlinux.org > > To subscribe or unsubscribe via the World Wide Web, visit > http://mailman.archlinux.org/mailman/listinfo/arch-releng > or, via email, send a message with subject or body 'help' to > arch-releng-request(a)archlinux.org > > You can reach the person managing the list at > arch-releng-owner(a)archlinux.org > > When replying, please edit your Subject line so it is more specific > than "Re: Contents of arch-releng digest..." > > > Today's Topics: > > 1. Re: Removing packages from archiso (Christian Hesse) > 2. test isos please! (Dieter Plaetinck) > 3. Use pandoc instead of make-doc.sh (Dario Giovannetti) > 4. Re: Use pandoc instead of make-doc.sh (Dieter Plaetinck) > 5. Re: Use pandoc instead of make-doc.sh (Dario Giovannetti) > 6. [PATCH] [archiso] use new mkinitcpio API in hooks > (Gerardo Exequiel Pozzi) > > > ---------------------------------------------------------------------- > > Message: 1 > Date: Sun, 6 May 2012 13:10:55 +0200 > From: Christian Hesse<list(a)eworm.de> > To: Arch Linux Release Engineering<arch-releng(a)archlinux.org> > Cc: mrgreen(a)linuxmail.org > Subject: Re: [arch-releng] Removing packages from archiso > Message-ID:<20120506131055.182f1575@leda> > Content-Type: text/plain; charset=US-ASCII > > Mr Green<mrgreen(a)linuxmail.org> on Sun, 2012/05/06 11:48: >> Hi, >> >> I am trying to build an iso that includes LTS kernel at the moment I can >> add linux-lts to package list. Need a clean way to remove linux >> [kernel]. Thinking along the lines of adding a 'pacman -R' to mkarchiso, >> possibly adding something like _pacman () maybe _pacman_remove(). >> >> Not sure it will be a possible patch as it may be of any other use to >> anyone. >> >> Ideas are easy creating them is a different story > I had a similar problem... Just created an iso with systemd. I added this to > my build script: > > mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" \ > -r "pacman -R --noconfirm sysvinit initscripts" run > > However I would like to have a clean solution... > > Is there any way to make pacman install packages and remove conflicts in a > non interactive way in one run?

2 1

[arch-releng] test isos please!
by Dieter Plaetinck 07 May '12

07 May '12

we need new official images. new testbuilds are @ http://releng.archlinux.org/isos/ please test and report issues. http://www.archlinux.org/releng/feedback/ https://bugs.archlinux.org/ if they are working okay, will promote to official images. Dieter

1 0

[arch-releng] Removing packages from archiso
by Mr Green 06 May '12

06 May '12

Hi, I am trying to build an iso that includes LTS kernel at the moment I can add linux-lts to package list. Need a clean way to remove linux [kernel]. Thinking along the lines of adding a 'pacman -R' to mkarchiso, possibly adding something like _pacman () maybe _pacman_remove(). Not sure it will be a possible patch as it may be of any other use to anyone. Ideas are easy creating them is a different story Mr Green

2 1

[arch-releng] Missed LTS reply
by Mr Green 05 May '12

05 May '12

Hi, I am sorry I missed your reply to my LTS kernel problem, very aware that you do not want to have an lts installation version. I am going to take your advice and modify build.sh to suit my needs. Adding an option to install lts kernel to archiso would create more problems than it solves. I was going to create a metapackage [base-lts] this would drag in linux-lts as opposed to linux kernel. You would make my job a lot easier if you had an init-lts option [but that is not going to happen!] Thanks Mr Green ArchBang Developer

1 0