- Arch-projects - lists.archlinux.org

[arch-projects] [mkinitcpio PATCH 1/3] /run/initramfs: copy the whole ramfs
by Tom Gundersen 26 Nov '11

26 Nov '11

This is useful for the future shutdown hook, and might make debugging easier, as well as potentially opening up for other usecases (that I cannot yet imagine ;-) ). Signed-off-by: Tom Gundersen <teg(a)jklm.no> --- init | 2 +- install/base | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/init b/init index 7cc2d47..3c6fb81 100644 --- a/init +++ b/init @@ -21,7 +21,7 @@ else mknod /dev/mem c 1 1 fi mount -t tmpfs run /run -o nosuid,nodev,mode=755,size=10M -mkdir /run/initramfs +cp -ax / /run/initramfs # parse the kernel command line parse_cmdline diff --git a/install/base b/install/base index 0726fa2..84e7f02 100644 --- a/install/base +++ b/install/base @@ -10,6 +10,7 @@ build() { add_binary /sbin/blkid add_binary /bin/mount add_binary /sbin/switch_root + add_binary /bin/cp add_symlink "/etc/mtab" "/proc/self/mounts" -- 1.7.7.3

4 21

[arch-projects] [mkinitcpio] release 0.8.0
by Dave Reisner 26 Nov '11

26 Nov '11

Hi all, I've tagged mkinitcpio 0.8.0, which came a little earlier than I would have liked, but there's still fun things to talk about. The major point of interest is the addition of fsck functionality. The logic in init is triggered by the addition of the 'fsck' install hook. If added after the autodetect hook, only the necessarily helper for the root FS will be added. Eventually, there may be reason to add fsck prior to this hook, but probably not yet. Operation is hands off until something blows up, at which point we follow similar logic to that of rc.sysinit. I'll explicitly call out that if you're using this hook, make sure you have a useful keyboard -- this probably means adding the usbinput hook. Other than fsck, there's were lot of cleanup efforts in the early userspace init to modularize the functionality, but it generally remains the same. Everything remains largely the same functionally, but I'll point out that if you pass a major/minor pair as your root device or don't use udev, you will likely no longer see root mounted as /dev/root, but as a more descriptive block device. As always, this has stood up to my army of VMs, but nothing's better for finding bugs than real world testing. Thanks for Gerardo and Tom for their contributions to this release. The full shortlog is below. Dave Reisner (15): mkinitcpio: dereference symlinks when resolving kernver update bash completion Makefile: install binaries to /usr/bin 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 init_functions: resolve M:m to device file fsck: implement basic fsck support install/fsck: new install hook to add fsck and helpers init_functions: simplify parse_cmdline use util-linux's switch_root binary Gerardo Exequiel Pozzi (5): hooks/resume: Remove unused function hooks/resume: Remove grep usage init: Remove grep usage init: Remove sed cmd usage init: Remove unneeded test Tom Gundersen (1): add_symlink: fix argument ordering and add_dir call

2 3

[arch-projects] [mkinitcpio] [GIT] The official mkinitcpio repository annotated tag 0.8.0 created. 0.8.0
by dreisner＠archlinux.org 26 Nov '11

26 Nov '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official mkinitcpio repository". The annotated tag, 0.8.0 has been created at 719efbacef5f649a0b625710cdcff8cfa850dae8 (tag) tagging 79d406e5d4bba7cd056cf34e39cdfeac6e75c5de (commit) replaces 0.7.5 tagged by Dave Reisner on Fri Nov 25 19:52:57 2011 -0500 - Log ----------------------------------------------------------------- Release 0.8.0 Dave Reisner (15): mkinitcpio: dereference symlinks when resolving kernver update bash completion Makefile: install binaries to /usr/bin 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 init_functions: resolve M:m to device file fsck: implement basic fsck support install/fsck: new install hook to add fsck and helpers init_functions: simplify parse_cmdline use util-linux's switch_root binary Gerardo Exequiel Pozzi (5): hooks/resume: Remove unused function hooks/resume: Remove grep usage init: Remove grep usage init: Remove sed cmd usage init: Remove unneeded test Tom Gundersen (1): add_symlink: fix argument ordering and add_dir call ----------------------------------------------------------------------- hooks/post-receive -- The official mkinitcpio repository

1 0

[arch-projects] [mkinitcpio] [GIT] The official mkinitcpio repository branch master updated. 0.7.5-21-g79d406e
by dreisner＠archlinux.org 25 Nov '11

25 Nov '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official mkinitcpio repository". The branch, master has been updated via 79d406e5d4bba7cd056cf34e39cdfeac6e75c5de (commit) from b3160531f071ba7ed9861086398c5ffbcc456808 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 79d406e5d4bba7cd056cf34e39cdfeac6e75c5de Author: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Date: Wed Nov 16 14:03:31 2011 -0300 init: Remove unneeded test Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: init | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) hooks/post-receive -- The official mkinitcpio repository

1 0

[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 18 Nov '11

18 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