- Arch-projects - lists.archlinux.org

[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

[arch-projects] [mkinitcpio] [GIT] The official mkinitcpio repository branch master updated. 0.7.5-20-gb316053
by dreisner＠archlinux.org 16 Nov '11

16 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 b3160531f071ba7ed9861086398c5ffbcc456808 (commit) via 6ad8b6d7795a9701f2f5bcca3e1d685598f7102b (commit) via 4578e9394c9dda73da418928f9a4658364effa59 (commit) via 254c99b80f7f5269409b6af61cb90363bd9f66f5 (commit) via 00eefc36ae7c8f5f893b2c184fd8f32a3629031b (commit) via 5ee994c10029786947dc495e7078bbb30ab4a130 (commit) via fe5d6c51c4ace947060fe49914d8224c836a31e4 (commit) via a684ee7ccade5d996e23dd635efc0ec8886fd5f8 (commit) via 854b285e70b21321d8c29aa3548dca9de8e08b6a (commit) via c06a144a66ec24b9e2b4fd52c9abd655f352f685 (commit) via 0d46d5cdd93ad1086ceb023876d3d071f3148db7 (commit) via 09bbcaf175be235874cceee0f0e75781ed100d02 (commit) via f3fc3912c333e1e722b8120930cdfbecf642a284 (commit) via 8f6629fe9c4d9615f0265181f97d98c5d2457668 (commit) via b0d88762fc06a100904c4559e3da285e4c78b0a0 (commit) via 99b4dcfc9b63e9cb1026e4cd2051314697c3924f (commit) via 043ea8064223ebf0540ea1755694a3e905d70ed2 (commit) via 81725e6ff3bbde89fc10fb8f25e78ee67074ae25 (commit) from 7eb9355b98ffb5e47b0b1cdc524ff4679cd77327 (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 b3160531f071ba7ed9861086398c5ffbcc456808 Author: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Date: Tue Nov 15 22:10:39 2011 -0300 init: Remove sed cmd usage Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 6ad8b6d7795a9701f2f5bcca3e1d685598f7102b Author: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Date: Tue Nov 15 19:51:39 2011 -0300 init: Remove grep usage The only downside is on systems where devtmpfs is not enabled will see and error message, anyway /dev will be tmpfs as fallback like now. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 4578e9394c9dda73da418928f9a4658364effa59 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Nov 14 09:18:54 2011 -0500 use util-linux's switch_root binary This is a much better solution than busybox's, as it will move our API filesystems and /run for us. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 254c99b80f7f5269409b6af61cb90363bd9f66f5 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Nov 13 14:48:31 2011 -0500 init_functions: simplify parse_cmdline Do variable name validation via the case labels rather than via PEs. This frees up the fallthrough case to simply ignore things we don't understand (and not exist). Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 00eefc36ae7c8f5f893b2c184fd8f32a3629031b Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Nov 6 12:32:22 2011 -0500 install/fsck: new install hook to add fsck and helpers Provides /sbin/fsck and any helper binaries to the image. If processed after the autodetect hook, only the helper for the root FS is added. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 5ee994c10029786947dc495e7078bbb30ab4a130 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Nov 6 12:30:40 2011 -0500 fsck: implement basic fsck support This adds support for fsck'ing root at bootstrap if the fsck binary and necessary helpers are included. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit fe5d6c51c4ace947060fe49914d8224c836a31e4 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Nov 12 00:18:48 2011 -0500 init_functions: resolve M:m to device file Rather than immediately defaulting to /dev/root, attempt to resolve the major/minor pair back to a block device. If we can't do this properly, then fallback to /dev/root. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit a684ee7ccade5d996e23dd635efc0ec8886fd5f8 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Nov 5 22:18:08 2011 -0400 init_functions: generalize resolve_device This allows a caller to pass in a device by name and get a /dev node returned. Note that this is heavily limited in that only the root device can be identified by major:minor. This might break init's API, if such a thing exists. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 854b285e70b21321d8c29aa3548dca9de8e08b6a Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Nov 5 20:57:13 2011 -0400 init_functions: move root resolution to separate function Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit c06a144a66ec24b9e2b4fd52c9abd655f352f685 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Nov 5 20:05:16 2011 -0400 init: use util-linux's /bin/mount Providing this means we no longer need blkid for FS detection, as mount will do this for us. Adds a slight bloat to the image, in exchange for a huge convenience. Messaging is changed to assume that /bin/mount will provide useful feedback for us on failure. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 0d46d5cdd93ad1086ceb023876d3d071f3148db7 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Oct 26 10:01:53 2011 -0400 autodetect: store rootfstype for use by other hooks Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 09bbcaf175be235874cceee0f0e75781ed100d02 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Nov 5 21:26:53 2011 -0400 init_functions: refactor poll_device Beyond stylistic cleanup, add a conditional to ensure that we don't show the 'waiting for device' message if it already exists. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit f3fc3912c333e1e722b8120930cdfbecf642a284 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Oct 31 19:57:17 2011 -0400 init: create /run/initramfs after mounting /run We'll use this as a channel to communicate with later userspace. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 8f6629fe9c4d9615f0265181f97d98c5d2457668 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Oct 31 19:55:59 2011 -0400 init: don't tell the kernel about the path to modprobe Remove this ancient relic. It's not been needed in a very long time. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit b0d88762fc06a100904c4559e3da285e4c78b0a0 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Nov 5 14:40:07 2011 -0400 Makefile: install binaries to /usr/bin Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 99b4dcfc9b63e9cb1026e4cd2051314697c3924f Author: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Date: Mon Nov 14 20:46:24 2011 -0300 hooks/resume: Remove grep usage Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> commit 043ea8064223ebf0540ea1755694a3e905d70ed2 Author: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Date: Mon Nov 14 20:46:23 2011 -0300 hooks/resume: Remove unused function Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> commit 81725e6ff3bbde89fc10fb8f25e78ee67074ae25 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Nov 12 22:58:15 2011 -0500 update bash completion - change scavenging of /lib/modules to avoid grabbing extramodules dirs - add missing options for lsinitcpio and mkinitcpio - use _filedir for completing -b Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile | 9 +- bash-completion | 16 +++- hooks/resume | 6 +- init | 22 ++--- init_functions | 235 ++++++++++++++++++++++++++++++++++------------------ install/autodetect | 2 +- install/base | 4 + install/fsck | 32 +++++++ 8 files changed, 219 insertions(+), 107 deletions(-) create mode 100644 install/fsck hooks/post-receive -- The official mkinitcpio repository

1 0