November 2011 - Arch-projects - lists.archlinux.org

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

16 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

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

16 Nov '11

https://gist.github.com/1370099 (this patch) --- /lib/initcpio/hooks/lvm2 2011-08-19 21:38:09.000000000 -0300 +++ hooks/lvm2 2011-11-16 10:35:34.474256727 -0300 @@ -4,14 +4,16 @@ /sbin/modprobe -q dm-mod >/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 # If the lvmwait= parameter has been specified on the command line # wait for the device(s) before trying to activate the volume group(s) if [ -n "${lvmwait}" ]; then - for pvdev in $(echo ${lvmwait} | sed 's|,| |g'); do + for pvdev in ${lvmwait/,/ }; do poll_device ${pvdev} ${rootdelay} done fi -- Gerardo Exequiel Pozzi \cos^2\alpha + \sin^2\alpha = 1

1 1

[arch-projects] [PATCH] [mkinitcpio] init: Remove sed cmd usage
by Gerardo Exequiel Pozzi 16 Nov '11

16 Nov '11

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- init | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/init b/init index 25a51eb..943fa9a 100644 --- a/init +++ b/init @@ -38,7 +38,7 @@ else fi if [ -n "${disablehooks}" ]; then - for d in $(echo "${disablehooks}" | sed 's|,| |g'); do + for d in ${disablehooks//,/ }; do eval "hook_${d}=disabled" done fi -- 1.7.7.3

2 2

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

16 Nov '11

https://gist.github.com/1370102 (this patch) There is no <<< in ash for doing "read a b c <<< $var" like in bash :( --- /lib/initcpio/hooks/encrypt 2011-11-03 15:40:08.000000000 -0300 +++ hooks/encrypt 2011-11-16 10:41:44.724256727 -0300 @@ -6,17 +6,19 @@ /sbin/modprobe -a -q dm-crypt >/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 [ "${quiet}" = "y" ] && CSQUIET=">/dev/null" # Get keyfile if specified ckeyfile="/crypto_keyfile.bin" - if [ "x${cryptkey}" != "x" ]; then - ckdev="$(echo "${cryptkey}" | cut -d: -f1)" - ckarg1="$(echo "${cryptkey}" | cut -d: -f2)" - ckarg2="$(echo "${cryptkey}" | cut -d: -f3)" + if [ -n "${cryptkey}" ]; then + IFS=: read ckdev ckarg1 ckarg2 << EOF +${cryptkey} +EOF if poll_device "${ckdev}" ${rootdelay}; then case ${ckarg1} in *[!0-9]*) @@ -39,9 +41,9 @@ if [ -n "${cryptdevice}" ]; then DEPRECATED_CRYPT=0 - cryptdev="$(echo "${cryptdevice}" | cut -d: -f1)" - cryptname="$(echo "${cryptdevice}" | cut -d: -f2)" - cryptoptions="$(echo "${cryptdevice}" | cut -d: -f3)" + IFS=: read cryptdev cryptname cryptoptions << EOF +${cryptdevice} +EOF else DEPRECATED_CRYPT=1 cryptdev="${root}" @@ -107,16 +109,14 @@ return 1 fi exe="/sbin/cryptsetup create ${cryptname} ${cryptdev} ${cryptargs}" - tmp=$(echo "${crypto}" | cut -d: -f1) - [ -n "${tmp}" ] && exe="${exe} --hash \"${tmp}\"" - tmp=$(echo "${crypto}" | cut -d: -f2) - [ -n "${tmp}" ] && exe="${exe} --cipher \"${tmp}\"" - tmp=$(echo "${crypto}" | cut -d: -f3) - [ -n "${tmp}" ] && exe="${exe} --key-size \"${tmp}\"" - tmp=$(echo "${crypto}" | cut -d: -f4) - [ -n "${tmp}" ] && exe="${exe} --offset \"${tmp}\"" - tmp=$(echo "${crypto}" | cut -d: -f5) - [ -n "${tmp}" ] && exe="${exe} --skip \"${tmp}\"" + IFS=: read c_hash c_cipher c_keysize c_offset c_skip << EOF +${crypto} +EOF + [ -n "${c_hash}" ] && exe="${exe} --hash '${c_hash}'" + [ -n "${c_cipher}" ] && exe="${exe} --cipher '${c_cipher}'" + [ -n "${c_keysize}" ] && exe="${exe} --key-size '${c_keysize}'" + [ -n "${c_offset}" ] && exe="${exe} --offset '${c_offset}'" + [ -n "${c_skip}" ] && exe="${exe} --skip '${c_skip}'" if [ -f ${ckeyfile} ]; then exe="${exe} --key-file ${ckeyfile}" else -- Gerardo Exequiel Pozzi \cos^2\alpha + \sin^2\alpha = 1

1 0

[arch-projects] [PATCH] [mkinitcpio] hooks/resume: Remove cut cmd usage
by Gerardo Exequiel Pozzi 16 Nov '11

16 Nov '11

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- hooks/resume | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/hooks/resume b/hooks/resume index e216f42..bff0f87 100644 --- a/hooks/resume +++ b/hooks/resume @@ -4,7 +4,8 @@ run_hook () if [ -n "${resume}" ]; then if [ "${resume}" != "${resume/:}" ]; then # Tux-on-ice syntax: swap:/dev/sda2 or file:/dev/sda2:0xdeadbeef - resumedev="$(echo ${resume} | cut -d: -f2)" + resumedev=${resume#*:} + resumedev=${resumedev%:*} else # Classical syntax: just a device resumedev="${resume}" -- 1.7.7.3

1 0

[arch-projects] [RFC] Refactor hooks/net, remove last sed cmd usage.
by Gerardo Exequiel Pozzi 16 Nov '11

16 Nov '11

I just sent this as RFC since I not tested this change using this hook, instead I tested the same logic on recently changed hooks/archiso_pxe_nbd and works fine. The code looks much simple now.

1 2