- Arch-projects - lists.archlinux.org

[arch-projects] [RFCv2] [PATCH] Fix add_binary() when -b BASEDIR is used.
by Gerardo Exequiel Pozzi 21 Nov '11

21 Nov '11

RFC: Use chroot command to execute ldd. (needs root) RFCv2: Use LD_LIBRARY_PATH= enviroment variable to execute ldd (not needs root). NOTE1: this still has at least one issue (I guess), when a binary has RPATH set, in that case LD_LIBRARY_PATH is secondary in case that RPATH fails. There is a way to ignore-rpath but needs to execute ld-linux directly, ldd script does not support passing --inhibit-rpath, but this option is ignored if non-root user use it on set-uid binary. NOTE2: LD_LIBRARY_PATH is ignored if binary is set-uid, non-root user will see different behaviour than root. mkinitcpio fails silently when a binary is installed on $BASEDIR (for example $BASEDIR/usr/bin/curl with all sodeps) but outside $BASEDIR curl and deps is not installed. ---- A simple hook build() { add_binary "/usr/bin/curl" } ---- Before the fix: -> Parsing hook: [curl] adding file: /usr/bin/curl adding symlink: /lib/librt.so.1 -> /lib/librt-2.14.1.so adding file: /lib/librt-2.14.1.so adding dir: /usr/lib adding symlink: /usr/lib/libz.so.1 -> /usr/lib/libz.so.1.2.5 adding file: /usr/lib/libz.so.1.2.5 adding symlink: /lib/libpthread.so.0 -> /lib/libpthread-2.14.1.so adding file: /lib/libpthread-2.14.1.so With this fix applied: -> Parsing hook: [curl] adding file: /usr/bin/curl adding dir: /usr/lib adding symlink: /usr/lib/libcurl.so.4 -> /usr/lib/libcurl.so.4.2.0 adding file: /usr/lib/libcurl.so.4.2.0 adding symlink: /lib/librt.so.1 -> /lib/librt-2.14.1.so adding file: /lib/librt-2.14.1.so adding symlink: /usr/lib/libz.so.1 -> /usr/lib/libz.so.1.2.5 adding file: /usr/lib/libz.so.1.2.5 adding symlink: /lib/libpthread.so.0 -> /lib/libpthread-2.14.1.so adding file: /lib/libpthread-2.14.1.so adding symlink: /usr/lib/libssh2.so.1 -> /usr/lib/libssh2.so.1.0.1 adding file: /usr/lib/libssh2.so.1.0.1 adding file: /usr/lib/libssl.so.1.0.0 adding file: /usr/lib/libcrypto.so.1.0.0 adding symlink: /lib/libdl.so.2 -> /lib/libdl-2.14.1.so adding file: /lib/libdl-2.14.1.so --- functions | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/functions b/functions index ef4463e..8a14485 100644 --- a/functions +++ b/functions @@ -300,7 +300,11 @@ add_binary() { # always add the binary itself _add_file "${dest#$BASEDIR}" "$binary" "$mode" - lddout=$(ldd "$binary" 2>/dev/null) || return 1 # not a binary! + if [[ -z $BASEDIR ]]; then + lddout=$(ldd "$binary" 2>/dev/null) || return 1 # not a binary! + else + lddout=$(LD_LIBRARY_PATH=$BASEDIR/lib:$BASEDIR/usr/lib ldd "$binary" 2>/dev/null) || return 1 # not a binary! + fi # resolve sodeps regex='(/.+) $0x[a-fA-F0-9]+$' @@ -309,12 +313,12 @@ add_binary() { if [[ -f "$sodep" ]]; then # -f follows symlinks, don't believe it! if [[ ! -L $sodep ]]; then - _add_file "$sodep" "$BASEDIR$sodep" "$(stat -c %a "$sodep")" + _add_file "${sodep#$BASEDIR}" "$sodep" "$(stat -c %a "$sodep")" else - resolved=$(readlink -e "$BASEDIR$sodep") + resolved=$(readlink -e "$sodep") dirname=${resolved%/*} _add_dir "${dirname#$BASEDIR}" 755 - _add_symlink "$sodep" "${resolved#$BASEDIR}" + _add_symlink "${sodep#$BASEDIR}" "${resolved#$BASEDIR}" _add_file "${resolved#$BASEDIR}" "$resolved" 755 fi fi -- 1.7.7.3

1 0

[arch-projects] [RFC] [PATCH] [mkinitcpio] Fix add_binary() when -b BASEDIR is used.
by Gerardo Exequiel Pozzi 21 Nov '11

21 Nov '11

Maybe the fix is wrong because the usage of chroot? Please review. mkinitcpio fails silently when a binary is installed on $BASEDIR (for example $BASEDIR/usr/bin/curl with all sodeps) but outside $BASEDIR curl and deps is not installed. ---- A simple hook build() { add_binary "/usr/bin/curl" } ---- Before the fix: -> Parsing hook: [curl] adding file: /usr/bin/curl adding symlink: /lib/librt.so.1 -> /lib/librt-2.14.1.so adding file: /lib/librt-2.14.1.so adding dir: /usr/lib adding symlink: /usr/lib/libz.so.1 -> /usr/lib/libz.so.1.2.5 adding file: /usr/lib/libz.so.1.2.5 adding symlink: /lib/libpthread.so.0 -> /lib/libpthread-2.14.1.so adding file: /lib/libpthread-2.14.1.so With this fix applied: -> Parsing hook: [curl] adding file: /usr/bin/curl adding dir: /usr/lib adding symlink: /usr/lib/libcurl.so.4 -> /usr/lib/libcurl.so.4.2.0 adding file: /usr/lib/libcurl.so.4.2.0 adding symlink: /lib/librt.so.1 -> /lib/librt-2.14.1.so adding file: /lib/librt-2.14.1.so adding symlink: /usr/lib/libz.so.1 -> /usr/lib/libz.so.1.2.5 adding file: /usr/lib/libz.so.1.2.5 adding symlink: /lib/libpthread.so.0 -> /lib/libpthread-2.14.1.so adding file: /lib/libpthread-2.14.1.so adding symlink: /usr/lib/libssh2.so.1 -> /usr/lib/libssh2.so.1.0.1 adding file: /usr/lib/libssh2.so.1.0.1 adding file: /usr/lib/libssl.so.1.0.0 adding file: /usr/lib/libcrypto.so.1.0.0 adding symlink: /lib/libdl.so.2 -> /lib/libdl-2.14.1.so adding file: /lib/libdl-2.14.1.so --- functions | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/functions b/functions index ef4463e..78d62d5 100644 --- a/functions +++ b/functions @@ -300,16 +300,20 @@ add_binary() { # always add the binary itself _add_file "${dest#$BASEDIR}" "$binary" "$mode" - lddout=$(ldd "$binary" 2>/dev/null) || return 1 # not a binary! + if [[ -z $BASEDIR ]]; then + lddout=$(ldd "$binary" 2>/dev/null) || return 1 # not a binary! + else + lddout=$(chroot $BASEDIR ldd "${binary#$BASEDIR}" 2>/dev/null) || return 1 # not a binary! + fi # resolve sodeps regex='(/.+) $0x[a-fA-F0-9]+$' while read line; do [[ "$line" =~ $regex ]] && sodep=${BASH_REMATCH[1]} || continue - if [[ -f "$sodep" ]]; then # -f follows symlinks, don't believe it! - if [[ ! -L $sodep ]]; then - _add_file "$sodep" "$BASEDIR$sodep" "$(stat -c %a "$sodep")" + if [[ -f "$BASEDIR$sodep" ]]; then # -f follows symlinks, don't believe it! + if [[ ! -L $BASEDIR$sodep ]]; then + _add_file "$sodep" "$BASEDIR$sodep" "$(stat -c %a "$BASEDIR$sodep")" else resolved=$(readlink -e "$BASEDIR$sodep") dirname=${resolved%/*} -- 1.7.7.3

2 2

[arch-projects] [mkinitcpio][PATCH 00/11] init cleanup and fsck impl
by Dave Reisner 19 Nov '11

19 Nov '11

Hey all, I've been working on implementing fsck support for mkinitcpio, and I'm at the point where I think I need some feedback. There's a lot of cleanup that leads up to the fsck, and you're welcome to disagree with any of that as well, but what I'm looking at the moment is a few questions regarding the actual fsck work: 1) How much do we want to try to repair automatically? Currently I'm passing similar flags to what we pass in the initscripts, but maybe there's a reason to do things differently here. 2) What return codes should we be bailing to a rescue shell on and forcing user intervention? Give it a whirl. I've probably broken something, but my VMs seem happy with it so far. d Dave Reisner (11): Makefile: install binaries to /usr/bin install/ide: remove install hook init: don't tell the kernel about the path to modprobe init: create /run/initramfs after mounting /run init_functions: refactor poll_device autodetect: store rootfstype for use by other hooks init: use util-linux's /bin/mount init_functions: move root resolution to separate function init_functions: generalize resolve_device fsck: implement basic fsck support install/fsck: new install hook to add fsck and helpers Makefile | 9 ++-- init | 18 ++++++- init_functions | 142 +++++++++++++++++++++++++++++----------------------- install/autodetect | 2 +- install/base | 3 + install/fsck | 28 ++++++++++ install/ide | 17 ------ 7 files changed, 131 insertions(+), 88 deletions(-) create mode 100644 install/fsck delete mode 100644 install/ide -- 1.7.7.2

5 22

[arch-projects] [RFC] [PATCH] [mkinitcpio] install/base: Add an empty fstab
by Gerardo Exequiel Pozzi 18 Nov '11

18 Nov '11

This is mainly for avoid this: [ramfs /]# mount /dev/md0 /mnt/a [ramfs /]# mount -o bind /mnt/a /mnt/b [ramfs /]# mount -o bind,remount,ro /mnt/b warning: can't open /etc/fstab: No such file or directory [ramfs /]# Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- install/base | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/install/base b/install/base index db9752e..8e75160 100644 --- a/install/base +++ b/install/base @@ -12,6 +12,8 @@ build() { add_binary /sbin/switch_root add_symlink "/etc/mtab" "/proc/self/mounts" + # Add an empty fstab to avoid mount warning when -o remount is used + : > "$BUILDROOT/etc/fstab" add_file "/lib/initcpio/init_functions" "/init_functions" add_file "/lib/initcpio/init" "/init" -- 1.7.7.3

1 0

[arch-projects] [RFC] Remove cut, grep and sed from mdadm initcpio hook
by Gerardo Exequiel Pozzi 18 Nov '11

18 Nov '11

https://gist.github.com/1369428 (this patch) https://gist.github.com/1369424 (standalone test script) --- /lib/initcpio/hooks/mdadm 2011-09-14 04:10:48.000000000 -0300 +++ hooks/mdadm 2011-11-16 03:32:30.064535002 -0300 @@ -6,7 +6,7 @@ # for partitionable raid, we need to load md_mod first! modprobe md_mod 2>/dev/null # If md is specified on commandline, create config file from those parameters. - if [ "$(echo $input | grep "md=")" ]; then + if [ -n "${md}" ]; then #Create initial mdadm.conf # scan all devices in /proc/partitions echo DEVICE partitions > $mdconfig @@ -14,26 +14,30 @@ case $i in # raid md=[0-9]*,/*) - device="$(echo "$i" | sed -e 's|,/.*||g' -e 's|=||g')" - array="$(echo $i | cut -d, -f2-)" + device="${i%%,*}" + device="${device/=/}" + array="${i#*,}" echo "ARRAY /dev/$device devices=$array" >> $mdconfig ;; # partitionable raid md=d[0-9]*,/*) - device="$(echo "$i" | sed -e 's|,/.*||g' -e 's|=|_|g')" - array="$(echo $i | cut -d, -f2-)" + device="${i%%,*}" + device="${device/=/_}" + array="${i#*,}" echo "ARRAY /dev/$device devices=$array" >> $mdconfig ;; # raid UUID - md=[0-9]*,[0-9,a-z]*) - device="$(echo "$i" | sed -e 's|,.*||g' -e 's|=||g')" - array="$(echo $i | cut -d, -f2-)" + md=[0-9]*,[0-9,a-f]*) + device="${i%%,*}" + device="${device/=/}" + array="${i#*,}" echo "ARRAY /dev/$device UUID=$array" >> $mdconfig ;; # partitionable raid UUID - md=d[0-9]*,[0-9,a-z]*) - device="$(echo "$i" | sed -e 's|,.*||g' -e 's|=|_|g')" - array="$(echo $i | cut -d, -f2-)" + md=d[0-9]*,[0-9,a-f]*) + device="${i%%,*}" + device="${device/=/_}" + array="${i#*,}" echo "ARRAY /dev/$device UUID=$array" >> $mdconfig ;; esac -- Gerardo Exequiel Pozzi \cos^2\alpha + \sin^2\alpha = 1

1 1

[arch-projects] [PATCH] init_functions: rework `default_mount_handler` -- assume less/succeed more
by C Anthony Risinger 18 Nov '11

18 Nov '11

mostly shuffling, save: 1) immediate mount attempt: assume hooks have allowed for this $root is opaque, attempts to dechiper it's meaning are out of scope. 2) first mount fail: print details, offer to mount(0) or boot(1) 3) second mount fail: print details, offer to reboot(0) or boot(1) this work allows the default handler to be used in nearly all cases mount itself could handle -- work prompted by needless failing of a virtio/9p2000.L based passthru "device" as $root. Signed-off-by: C Anthony Risinger <anthony(a)xtfx.me> --- init_functions | 37 ++++++++++++++++++++++++++----------- 1 files changed, 26 insertions(+), 11 deletions(-) diff --git a/init_functions b/init_functions index 42e6249..d0bd042 100644 --- a/init_functions +++ b/init_functions @@ -197,18 +197,33 @@ resolve_device() { } default_mount_handler() { - if [ ! -b "$root" ]; then - err "Unable to determine major/minor number of root device '$root'." - echo "You are being dropped to a recovery shell" - echo " Type 'exit' to try and continue booting" - launch_interactive_shell - msg "Trying to continue (this will most likely fail) ..." - fi + local opts="${rootfstype:+-t $rootfstype} -o ${rwopt:-ro}${rootflags:+,$rootflags}" - if ! mount ${fstype:+-t $fstype} -o ${rwopt:-ro}${rootflags:+,$rootflags} "$root" "$1"; then - echo "You are now being dropped into an emergency shell." - launch_interactive_shell - msg "Trying to continue (this will most likely fail) ..." + if ! mount ${opts} "$root" "$1"; then + if [ ! -b "$root" ]; then + err "Unable to determine major/minor number of root device '$root'." + fi + echo $'\n'"Unable to mount root device '$root'! (1 of 2)"$'\n' + echo "mount ${opts} '$root' '$1'"$'\n' + echo "You are being dropped to an recovery shell, typing ..." + echo " 'exit 0' attempts to boot after first retrying the failed mount." + echo " 'exit 1' attempts to boot immediately -- '$1' MUST be mounted." + if launch_interactive_shell; then + echo "Attempting to mount '$root' ..." + if ! mount ${opts} "$root" "$1"; then + echo $'\n'"Unable to mount root device '$root'! (2 of 2)"$'\n' + echo "mount ${opts} '$root' '$1'"$'\n' + echo "You are being dropped to an emergency shell, typing ..." + echo " 'exit 0' abruptly ends our adventure and reboots the machine." + echo " 'exit 1' attempts to boot immediately -- '$1' MUST be mounted." + if launch_interactive_shell; then + echo $'\n'":: Boot aborted, reboot in progress" + sleep 2 + reboot -f + fi + fi + fi + echo "Trying to continue (will fail unless '$root' is mounted) ..." fi } -- 1.7.7.3

3 6

[arch-projects] [mkinitcpio PATCH] add_{file, symlink}: overwrite existing file
by Tom Gundersen 18 Nov '11

18 Nov '11

Now we fail silently if the file exists, which means there is no easy way to overwrite binaries. I think it makes the most sense to do the following: 1) add all the busybox stuff as a basic system; 2) overwrite some of the links with any binaries we add to base hook; 3) allow users to write their own hooks to overwrite even more stuff. This can now be done by this hook. [this should have been part of the previous patch serios, it got lost on the way, sorry about that.] Signed-off-by: Tom Gundersen <teg(a)jklm.no> --- functions | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/functions b/functions index ef4463e..54c1034 100644 --- a/functions +++ b/functions @@ -82,7 +82,6 @@ _add_file() { # $3: mode (( $# == 3 )) || return $EINVAL - [[ -e "$BUILDROOT$1" ]] && return $EEXIST (( QUIET )) || plain "adding file: %s" "$1" command install -Dm$3 "$2" "$BUILDROOT$1" @@ -106,10 +105,9 @@ _add_symlink() { # $2: target of $1 (( $# == 2 )) || return $EINVAL - [[ -L "$BUILDROOT$1" ]] && return $EEXIST (( QUIET )) || plain "adding symlink: %s -> %s" "$1" "$2" - ln -s "$2" "$BUILDROOT$1" + ln -sf "$2" "$BUILDROOT$1" } auto_modules() { -- 1.7.7.3

2 3

Re: [arch-projects] [mkinitcpio][PATCH 06/11] autodetect: store rootfstype for use by other hooks
by C Anthony Risinger 17 Nov '11

17 Nov '11

On Wed, Nov 16, 2011 at 5:06 PM, Dave Reisner <d(a)falconindy.com> wrote: > On Wed, Nov 16, 2011 at 04:54:52PM -0600, C Anthony Risinger wrote: >> On Fri, Nov 11, 2011 at 8:55 PM, Dave Reisner <d(a)falconindy.com> wrote: >> > Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> >> > --- >> > install/autodetect | 2 +- >> > 1 files changed, 1 insertions(+), 1 deletions(-) >> > >> > diff --git a/install/autodetect b/install/autodetect >> > index 35f1cb2..5537f7c 100644 >> > --- a/install/autodetect >> > +++ b/install/autodetect >> > @@ -10,7 +10,7 @@ build() { >> > >> > auto_modules | grep -xEv '(ata|ide)_generic' >"$MODULE_FILE" >> > >> > - if ! findmnt -uno fstype "${BASEDIR:-/}" >>"$MODULE_FILE"; then >> > + if ! rootfstype=$(findmnt -uno fstype "${BASEDIR:-/}" | tee -a "$MODULE_FILE"); then >> > error "failed to detect root filesystem" >> > fs_autodetect_failed=1 >> > fi >> > -- >> > 1.7.7.3 >> > >> > >> >> This patch along with associated changed to `init_functions` appears >> to be causing `rootfstype=xyz` on kernel boot to be ignored (since >> it's never checked) ... are we to use `fstype` in it's place? >> > > Do you have a use case where specifying rootfstype is actually > necessary? yes 9pnet_virtio, which i am preparing a patch for to work out of the box (ill send that shortly) -- C Anthony

1 0

[arch-projects] [PATCH] [mkinitcpio] init: Remove unneeded test
by Gerardo Exequiel Pozzi 16 Nov '11

16 Nov '11

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- init | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/init b/init index 7cc2d47..53c64d5 100644 --- a/init +++ b/init @@ -36,11 +36,9 @@ else udevd_running=0 fi -if [ -n "${disablehooks}" ]; then - for d in ${disablehooks//,/ }; do - eval "hook_${d}=disabled" - done -fi +for d in ${disablehooks//,/ }; do + eval "hook_${d}=disabled" +done earlymodules=${earlymodules//,/ } if [ -n "${earlymodules## }" ]; then -- 1.7.7.3

2 3

[arch-projects] [RFC] Remove sed from dmraid initcpio hook
by Gerardo Exequiel Pozzi 16 Nov '11

16 Nov '11

https://gist.github.com/1370184 (this patch) --- /lib/initcpio/hooks/dmraid 2011-06-30 15:02:36.000000000 -0300 +++ hooks/dmraid 2011-11-16 11:31:43.275256727 -0300 @@ -5,11 +5,13 @@ /sbin/modprobe -q dm-mirror >/dev/null 2>&1 if [ -e "/sys/class/misc/device-mapper" ]; then if [ ! -e "/dev/mapper/control" ]; then + local major minor + IFS=: read major minor < /sys/class/misc/device-mapper/dev mkdir /dev/mapper - mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') + mknod /dev/mapper/control c ${major} ${minor} fi msg ":: Activating dmraid arrays..." - # prevent any event monitoring calls with -I + # prevent any event monitoring calls with -I if [ "${quiet}" = "y" ]; then /sbin/dmraid -ay -I -Z >/dev/null else -- Gerardo Exequiel Pozzi \cos^2\alpha + \sin^2\alpha = 1

1 0