- Arch-projects - lists.archlinux.org

[arch-projects] [mkinitcpio] [GIT] The official mkinitcpio repository branch master updated. 0.15.0-26-gfe786a6
by dreisner＠archlinux.org 11 Dec '13

11 Dec '13

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 fe786a6b8d6cb82d972fd47b0033d5f42e00acdd (commit) via 4d0d81aacf6ea5aaa3a7dd1d538203460b216963 (commit) via 0ccd0bcf04496867c74f68ddb2de403c7d09c0bf (commit) via b8f596eee60bfec4efced5b2a448f1e4ca7ee189 (commit) via e7b20bb79e72b311e7dce76d1b9f67eb8dcaa641 (commit) via cf9be93525fb393b0db85a341dfca6fafdd9fab7 (commit) via 9e2c16294bd6281ecbf7ab96e9b14a10154c4f01 (commit) via a1e50f04b89ff042baf91a403a6df0cbd1e3cec2 (commit) from 2fa0eb25d47c920c18e7d2498c647a801d836596 (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 fe786a6b8d6cb82d972fd47b0033d5f42e00acdd Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Dec 5 20:31:42 2013 -0500 prevent calling a preset from a preset This is surely a configuration error as it's an infinite loop. commit 4d0d81aacf6ea5aaa3a7dd1d538203460b216963 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Dec 1 11:43:31 2013 -0500 remove legacy search paths in /lib/initcpio commit 0ccd0bcf04496867c74f68ddb2de403c7d09c0bf Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Dec 1 11:21:47 2013 -0500 Load build and run hooks from /etc/initcpio This lets users shoot themselves in the foot more easily, as they can put their own modified hooks into /etc/initcpio/{hooks,install} to override those shipped by the distro in /usr/lib/initcpio. To make debugging easier, include the full path of the hook being used when mkinitcpio runs in verbose mode. Implements FS#37796. commit b8f596eee60bfec4efced5b2a448f1e4ca7ee189 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Nov 27 15:24:27 2013 -0500 sd-shutdown: don't fail after kernel updates When the module directory matching $(uname -r) cannot be found, generation of the shutdown ramfs aborted: systemd[1]: Starting Generate shutdown-ramfs... mkinitcpio[1944]: ==> ERROR: '/lib/modules/3.12.1-1-ARCH' is not a valid kernel module directory systemd[1]: mkinitcpio-generate-shutdown-ramfs.service: main process exited, code=exited, status=1/FAILURE systemd[1]: Failed to start Generate shutdown-ramfs. systemd[1]: Unit mkinitcpio-generate-shutdown-ramfs.service entered failed state. Tell mkinitcpio that we do not wish to add any kernel modules. commit e7b20bb79e72b311e7dce76d1b9f67eb8dcaa641 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Nov 27 15:23:23 2013 -0500 merge optkver into KERNELVERSION Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit cf9be93525fb393b0db85a341dfca6fafdd9fab7 Author: Thomas Bächler <thomas(a)archlinux.org> Date: Wed Nov 27 19:30:04 2013 +0100 mkinitcpio: Allow building an image without modules The '-k none' switch prevents mkinitcpio from adding modules to the image and keeps it from bailing out when it cannot find any. commit 9e2c16294bd6281ecbf7ab96e9b14a10154c4f01 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Nov 16 12:46:59 2013 -0500 init_functions: escape slashes in tag values This allows booting from devices which have labels like LABEL=/. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit a1e50f04b89ff042baf91a403a6df0cbd1e3cec2 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Nov 26 11:09:49 2013 -0500 move a bunch of stuff to subdirs Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile | 15 +++++++++------ functions | 12 ++++++++++-- init_functions | 13 +++++++++++-- install/autodetect | 2 ++ man/mkinitcpio.8.txt | 7 ++++--- mkinitcpio | 21 ++++++++++++++------- bash-completion => shell/bash-completion | 0 zsh-completion => shell/zsh-completion | 0 .../mkinitcpio-generate-shutdown-ramfs.service | 2 +- 01-memdisk.rules => udev/01-memdisk.rules | 0 10 files changed, 51 insertions(+), 21 deletions(-) rename bash-completion => shell/bash-completion (100%) rename zsh-completion => shell/zsh-completion (100%) rename mkinitcpio-generate-shutdown-ramfs.service => systemd/mkinitcpio-generate-shutdown-ramfs.service (77%) rename 01-memdisk.rules => udev/01-memdisk.rules (100%) hooks/post-receive -- The official mkinitcpio repository

1 0

[arch-projects] [netctl][HEADSUP] systemd-networkd
by Tom Gundersen 01 Dec '13

01 Dec '13

Hi guys, and Jouke in particular, In case any netctl developers have not yet seen/heard about networkd, I thought I'd give you a heads-up about it. networkd is an (at the moment) very basic network solution for statically configured networks, and probably shares some usecases with netctl. It will ship with systemd v209. I wrote a bit about the background/status on G+: https://plus.google.com/+TomGundersen/posts/bDQCP5ZyQ3h (there are a few more posts with more details). If any of you have any feedback, or would like to contribute, let me know. Cheers, Tom

3 4

[arch-projects] [mkinitcpio] [PATCH] Load build and run hooks from /etc/initcpio
by Dave Reisner 01 Dec '13

01 Dec '13

This lets users shoot themselves in the foot more easily, as they can put their own modified hooks into /etc/initcpio/{hooks,install} to override those shipped by the distro in /usr/lib/initcpio. To make debugging easier, include the full path of the hook being used when mkinitcpio runs in verbose mode. Implements FS#37796. --- Makefile | 6 ++++-- functions | 6 +++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 66b1960..801d4c7 100644 --- a/Makefile +++ b/Makefile @@ -7,6 +7,8 @@ DIRS = \ /usr/share/bash-completion/completions \ /usr/share/zsh/site-functions \ /etc/mkinitcpio.d \ + /etc/initcpio/hooks \ + /etc/initcpio/install \ /usr/lib/initcpio/hooks \ /usr/lib/initcpio/install \ /usr/lib/initcpio/udev \ @@ -30,8 +32,8 @@ install: all sed -e 's|^_f_config=.*|_f_config=/etc/mkinitcpio.conf|' \ -e 's|^_f_functions=.*|_f_functions=/usr/lib/initcpio/functions|' \ - -e 's|^_d_hooks=.*|_d_hooks=/usr/lib/initcpio/hooks:/lib/initcpio/hooks|' \ - -e 's|^_d_install=.*|_d_install=/usr/lib/initcpio/install:/lib/initcpio/install|' \ + -e 's|^_d_hooks=.*|_d_hooks=/etc/initcpio/hooks:/usr/lib/initcpio/hooks:/lib/initcpio/hooks|' \ + -e 's|^_d_install=.*|_d_install=/etc/initcpio/install:/usr/lib/initcpio/install:/lib/initcpio/install|' \ -e 's|^_d_presets=.*|_d_presets=/etc/mkinitcpio.d|' \ -e 's|%VERSION%|$(VERSION)|g' \ < mkinitcpio > $(DESTDIR)/usr/bin/mkinitcpio diff --git a/functions b/functions index 2b89c88..33bd28d 100644 --- a/functions +++ b/functions @@ -709,7 +709,11 @@ run_build_hook() { fi # run - msg2 "Running build hook: [%s]" "${script##*/}" + if (( _optquiet )); then + msg2 "Running build hook: [%s]" "${script##*/}" + else + msg2 "Running build hook: [%s]" "$script" + fi build # if we made it this far, return successfully. Hooks can -- 1.8.4.2

1 0

[arch-projects] [mkinitcpio] [RFC] Install mkinitcpio-generate-shutdown-ramfs.service as a static service
by Thomas Bächler 27 Nov '13

27 Nov '13

Pretty much everyone benefits from this service, as it is always better than having no shutdown-ramfs. If someone puts their own shutdown-ramfs in place, it will likely be done by initramfs and this service will be skipped automatically. In more obscure situations, it can still be masked. --- Makefile | 3 ++- mkinitcpio-generate-shutdown-ramfs.service | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 38a7111..ea785c0 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ DIRS = \ /usr/share/man/man5 \ /usr/share/man/man1 \ /usr/share/mkinitcpio \ - /usr/lib/systemd/system + /usr/lib/systemd/system/shutdown.target.wants all: doc @@ -50,6 +50,7 @@ install: all cp -at $(DESTDIR)/usr/lib/initcpio hooks install install -m644 -t $(DESTDIR)/usr/share/mkinitcpio mkinitcpio.d/* install -m644 mkinitcpio-generate-shutdown-ramfs.service $(DESTDIR)/usr/lib/systemd/system/mkinitcpio-generate-shutdown-ramfs.service + ln -s ../mkinitcpio-generate-shutdown-ramfs.service $(DESTDIR)/usr/lib/systemd/system/shutdown.target.wants/mkinitcpio-generate-shutdown-ramfs.service install -m755 50-mkinitcpio.install $(DESTDIR)/usr/lib/kernel/install.d/50-mkinitcpio.install diff --git a/mkinitcpio-generate-shutdown-ramfs.service b/mkinitcpio-generate-shutdown-ramfs.service index d5876df..923dd59 100644 --- a/mkinitcpio-generate-shutdown-ramfs.service +++ b/mkinitcpio-generate-shutdown-ramfs.service @@ -10,6 +10,3 @@ Type=oneshot # use /run as temporary directory Environment=TMPDIR=/run ExecStart=/usr/bin/mkinitcpio -A sd-shutdown -k none -c /dev/null -d /run/initramfs - -[Install] -WantedBy=shutdown.target -- 1.8.4.2

1 0

[arch-projects] [mkinitcpio] [PATCH 1/2] init_functions: escape slashes in tag values
by Dave Reisner 26 Nov '13

26 Nov '13

This allows booting from devices which have labels like LABEL=/. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- init_functions | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/init_functions b/init_functions index 474d6fa..11ce3ca 100644 --- a/init_functions +++ b/init_functions @@ -252,6 +252,16 @@ fsck_root() { fi } +# TODO: this really needs to follow the logic of systemd's encode_devnode_name +# function more closely. +tag_to_udev_path() { + awk -v "tag=$1" -v "value=$2" ' + BEGIN { + gsub(/\//, "\\x2f", value) + printf "/dev/disk/by-%s/%s\n", tolower(tag), value + }' +} + resolve_device() { local major minor dev tag device=$1 @@ -264,8 +274,7 @@ resolve_device() { UUID=*|LABEL=*|PARTUUID=*|PARTLABEL=*) dev=$(blkid -lt "$device" -o device) if [ -z "$dev" -a "$udevd_running" -eq 1 ]; then - tag=$(awk -v t="${device%%=*}" 'BEGIN { print tolower(t) }') - dev=/dev/disk/by-$tag/${device#*=} + dev=$(tag_to_udev_path "${device%%=*}" "${device#*=}") fi esac -- 1.8.4.2

4 8

[arch-projects] [mkinitcpio] [GIT] The official mkinitcpio repository branch master updated. 0.15.0-18-g2fa0eb2
by dreisner＠archlinux.org 24 Nov '13

24 Nov '13

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 2fa0eb25d47c920c18e7d2498c647a801d836596 (commit) via 88129397a4f4c714195d2a100b851ecf7d0b0e85 (commit) via a15e5658875dd53856a59da64aa214b96871efa6 (commit) via caf145fd4a6269b747c0f6134868b9b748dd73f3 (commit) via 1bf318f11d42522973633aa1c837693476c3a9e0 (commit) from 95b2c16f44f02ac264686651cf1aa207c65cb93a (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 2fa0eb25d47c920c18e7d2498c647a801d836596 Author: Thomas Bächler <thomas(a)archlinux.org> Date: Tue Nov 19 23:10:28 2013 +0100 Add mkinitcpio-generate-shutdown-ramfs.service When enabled, this service generates an "initramfs" that systemd pivots to on shutdown to ensure clean umounting and shutdown of loop and dm devices. The actual work is done by systemd-shutdown. commit 88129397a4f4c714195d2a100b851ecf7d0b0e85 Author: Thomas Bächler <thomas(a)archlinux.org> Date: Tue Nov 19 23:10:27 2013 +0100 mkinitcpio: Improve output when -d option is used. commit a15e5658875dd53856a59da64aa214b96871efa6 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Nov 23 18:46:20 2013 -0500 mkinitcpio.8: document -d, --generatedir Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit caf145fd4a6269b747c0f6134868b9b748dd73f3 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Nov 23 16:47:13 2013 -0500 functions: error out when buildroot isn't writeable Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 1bf318f11d42522973633aa1c837693476c3a9e0 Author: Thomas Bächler <thomas(a)archlinux.org> Date: Tue Nov 19 23:10:26 2013 +0100 mkinitcpio: add -d option The -d (--generatedir) option writes the root of the generated image directly to the specified directory. Useful for generating a shutdown-ramfs with mkinitcpio -d /run/initramfs/. ----------------------------------------------------------------------- Summary of changes: Makefile | 4 ++- functions | 40 +++++++++++++++++------------- install/sd-shutdown | 14 +++++++++++ man/mkinitcpio.8.txt | 5 ++++ mkinitcpio | 25 +++++++++++++------ mkinitcpio-generate-shutdown-ramfs.service | 15 +++++++++++ 6 files changed, 77 insertions(+), 26 deletions(-) create mode 100644 install/sd-shutdown create mode 100644 mkinitcpio-generate-shutdown-ramfs.service hooks/post-receive -- The official mkinitcpio repository

1 0

[arch-projects] [mkinitcpio] [PATCHv2 1/3] mkinitcpio: add -d option
by Thomas Bächler 19 Nov '13

19 Nov '13

The -d (--generatedir) option writes the root of the generated image directly to the specified directory. Useful for generating a shutdown-ramfs with mkinitcpio -d /run/initramfs/. --- functions | 35 ++++++++++++++++++----------------- mkinitcpio | 15 ++++++++++----- 2 files changed, 28 insertions(+), 22 deletions(-) diff --git a/functions b/functions index f0dce80..81a6072 100644 --- a/functions +++ b/functions @@ -627,45 +627,46 @@ initialize_buildroot() { # creates a temporary directory for the buildroot and initialize it with a # basic set of necessary directories and symlinks - local workdir= kernver=$1 arch=$(uname -m) + local workdir= kernver=$1 arch=$(uname -m) buildroot if ! workdir=$(mktemp -d --tmpdir mkinitcpio.XXXXXX); then error 'Failed to create temporary working directory in %s' "${TMPDIR:-/tmp}" return 1 fi + buildroot=${2:-$workdir/root} # base directory structure - install -dm755 "$workdir/root"/{new_root,proc,sys,dev,run,tmp,etc,usr/{local,lib,bin}} - ln -s "usr/lib" "$workdir/root/lib" - ln -s "../lib" "$workdir/root/usr/local/lib" - ln -s "bin" "$workdir/root/usr/sbin" - ln -s "usr/bin" "$workdir/root/bin" - ln -s "usr/bin" "$workdir/root/sbin" - ln -s "../bin" "$workdir/root/usr/local/bin" - ln -s "../bin" "$workdir/root/usr/local/sbin" + install -dm755 "$buildroot"/{new_root,proc,sys,dev,run,tmp,etc,usr/{local,lib,bin}} + ln -s "usr/lib" "$buildroot/lib" + ln -s "../lib" "$buildroot/usr/local/lib" + ln -s "bin" "$buildroot/usr/sbin" + ln -s "usr/bin" "$buildroot/bin" + ln -s "usr/bin" "$buildroot/sbin" + ln -s "../bin" "$buildroot/usr/local/bin" + ln -s "../bin" "$buildroot/usr/local/sbin" case $arch in x86_64) - ln -s "lib" "$workdir/root/usr/lib64" - ln -s "usr/lib" "$workdir/root/lib64" + ln -s "lib" "$buildroot/usr/lib64" + ln -s "usr/lib" "$buildroot/lib64" ;; esac # mkinitcpio version stamp - printf '%s' "$version" >"$workdir/root/VERSION" + printf '%s' "$version" >"$buildroot/VERSION" # kernel module dir - install -dm755 "$workdir/root/usr/lib/modules/$kernver/kernel" + install -dm755 "$buildroot/usr/lib/modules/$kernver/kernel" # mount tables - ln -s /proc/self/mounts "$workdir/root/etc/mtab" - >"$workdir/root/etc/fstab" + ln -s /proc/self/mounts "$buildroot/etc/mtab" + >"$buildroot/etc/fstab" # indicate that this is an initramfs - >"$workdir/root/etc/initrd-release" + >"$buildroot/etc/initrd-release" # add a blank ld.so.conf to keep ldconfig happy - >"$workdir/root/etc/ld.so.conf" + >"$buildroot/etc/ld.so.conf" printf '%s' "$workdir" } diff --git a/mkinitcpio b/mkinitcpio index 7ce6c5c..30cff6a 100755 --- a/mkinitcpio +++ b/mkinitcpio @@ -19,7 +19,7 @@ _d_presets=mkinitcpio.d # options and runtime data _optmoduleroot= _optkver= _optgenimg= -_optcompress= +_optcompress= _opttargetdir= _optshowautomods=0 _optsavetree=0 _optshowmods=0 _optquiet=1 _optcolor=1 _optskiphooks=() _optaddhooks=() _hooks=() _optpreset=() @@ -53,6 +53,7 @@ usage: ${0##*/} [options] -r, --moduleroot <dir> Root directory for modules (default: /) -S, --skiphooks <hooks> Skip specified hooks, comma-separated, during build -s, --save Save build directory. (default: no) + -d, --generatedir <dir> Write generated image into <dir> -t, --builddir <dir> Use DIR as the temporary build directory -V, --version Display version information and exit -v, --verbose Verbose output (default: no) @@ -298,10 +299,10 @@ process_preset() ( trap 'cleanup 130' INT trap 'cleanup 143' TERM -_opt_short='A:c:g:H:hk:nLMPp:r:S:st:Vvz:' +_opt_short='A:c:g:H:hk:nLMPp:r:S:sd:t:Vvz:' _opt_long=('add:' 'addhooks:' 'config:' 'generate:' 'hookhelp:' 'help' 'kernel:' 'listhooks' 'automods' 'moduleroot:' 'nocolor' 'allpresets' - 'preset:' 'skiphooks:' 'save' 'builddir:' 'version' 'verbose' 'compress:') + 'preset:' 'skiphooks:' 'save' 'generatedir:' 'builddir:' 'version' 'verbose' 'compress:') parseopts "$_opt_short" "${_opt_long[@]}" -- "$@" || exit 1 set -- "${OPTRET[@]}" @@ -327,6 +328,10 @@ while :; do -s|--save) _optsavetree=1 ;; + -d|--generatedir) + shift + _opttargetdir=$1 + ;; -g|--generate) shift [[ -d $1 ]] && die "Invalid image path -- must not be a directory" @@ -414,8 +419,8 @@ KERNELVERSION=$(resolve_kernver "$_optkver") || cleanup 1 _d_kmoduledir=$_optmoduleroot/lib/modules/$KERNELVERSION [[ -d $_d_kmoduledir ]] || die "'$_d_kmoduledir' is not a valid kernel module directory" -_d_workdir=$(initialize_buildroot "$KERNELVERSION") || cleanup 1 -BUILDROOT=$_d_workdir/root +_d_workdir=$(initialize_buildroot "$KERNELVERSION" $_opttargetdir) || cleanup 1 +BUILDROOT=${_opttargetdir:-$_d_workdir/root} . "$_f_config" || die "Failed to read configuration \`%s'" "$_f_config" -- 1.8.4.2

1 2

[arch-projects] [mkinitcpio] [PATCH 1/3] mkinitcpio: add -T option
by Thomas Bächler 19 Nov '13

19 Nov '13

The -T (--targetdirectory) option writes the root of the generated image directly to the specified directory. Useful for generating a shutdown-ramfs with mkinitcpio -T /run/initramfs/. --- functions | 35 ++++++++++++++++++----------------- mkinitcpio | 19 ++++++++++++++----- 2 files changed, 32 insertions(+), 22 deletions(-) diff --git a/functions b/functions index f0dce80..acec621 100644 --- a/functions +++ b/functions @@ -627,45 +627,46 @@ initialize_buildroot() { # creates a temporary directory for the buildroot and initialize it with a # basic set of necessary directories and symlinks - local workdir= kernver=$1 arch=$(uname -m) + local workdir= kernver=$1 arch=$(uname -m) buildroot=$2 if ! workdir=$(mktemp -d --tmpdir mkinitcpio.XXXXXX); then error 'Failed to create temporary working directory in %s' "${TMPDIR:-/tmp}" return 1 fi + [[ -z $buildroot ]] && buildroot=$workdir/root # base directory structure - install -dm755 "$workdir/root"/{new_root,proc,sys,dev,run,tmp,etc,usr/{local,lib,bin}} - ln -s "usr/lib" "$workdir/root/lib" - ln -s "../lib" "$workdir/root/usr/local/lib" - ln -s "bin" "$workdir/root/usr/sbin" - ln -s "usr/bin" "$workdir/root/bin" - ln -s "usr/bin" "$workdir/root/sbin" - ln -s "../bin" "$workdir/root/usr/local/bin" - ln -s "../bin" "$workdir/root/usr/local/sbin" + install -dm755 "$buildroot"/{new_root,proc,sys,dev,run,tmp,etc,usr/{local,lib,bin}} + ln -s "usr/lib" "$buildroot/lib" + ln -s "../lib" "$buildroot/usr/local/lib" + ln -s "bin" "$buildroot/usr/sbin" + ln -s "usr/bin" "$buildroot/bin" + ln -s "usr/bin" "$buildroot/sbin" + ln -s "../bin" "$buildroot/usr/local/bin" + ln -s "../bin" "$buildroot/usr/local/sbin" case $arch in x86_64) - ln -s "lib" "$workdir/root/usr/lib64" - ln -s "usr/lib" "$workdir/root/lib64" + ln -s "lib" "$buildroot/usr/lib64" + ln -s "usr/lib" "$buildroot/lib64" ;; esac # mkinitcpio version stamp - printf '%s' "$version" >"$workdir/root/VERSION" + printf '%s' "$version" >"$buildroot/VERSION" # kernel module dir - install -dm755 "$workdir/root/usr/lib/modules/$kernver/kernel" + install -dm755 "$buildroot/usr/lib/modules/$kernver/kernel" # mount tables - ln -s /proc/self/mounts "$workdir/root/etc/mtab" - >"$workdir/root/etc/fstab" + ln -s /proc/self/mounts "$buildroot/etc/mtab" + >"$buildroot/etc/fstab" # indicate that this is an initramfs - >"$workdir/root/etc/initrd-release" + >"$buildroot/etc/initrd-release" # add a blank ld.so.conf to keep ldconfig happy - >"$workdir/root/etc/ld.so.conf" + >"$buildroot/etc/ld.so.conf" printf '%s' "$workdir" } diff --git a/mkinitcpio b/mkinitcpio index 7ce6c5c..489e199 100755 --- a/mkinitcpio +++ b/mkinitcpio @@ -19,7 +19,7 @@ _d_presets=mkinitcpio.d # options and runtime data _optmoduleroot= _optkver= _optgenimg= -_optcompress= +_optcompress= _opttargetdir= _optshowautomods=0 _optsavetree=0 _optshowmods=0 _optquiet=1 _optcolor=1 _optskiphooks=() _optaddhooks=() _hooks=() _optpreset=() @@ -53,6 +53,7 @@ usage: ${0##*/} [options] -r, --moduleroot <dir> Root directory for modules (default: /) -S, --skiphooks <hooks> Skip specified hooks, comma-separated, during build -s, --save Save build directory. (default: no) + -T, --targetdirectory <dir> Write generated image into <dir> -t, --builddir <dir> Use DIR as the temporary build directory -V, --version Display version information and exit -v, --verbose Verbose output (default: no) @@ -298,10 +299,10 @@ process_preset() ( trap 'cleanup 130' INT trap 'cleanup 143' TERM -_opt_short='A:c:g:H:hk:nLMPp:r:S:st:Vvz:' +_opt_short='A:c:g:H:hk:nLMPp:r:S:sT:t:Vvz:' _opt_long=('add:' 'addhooks:' 'config:' 'generate:' 'hookhelp:' 'help' 'kernel:' 'listhooks' 'automods' 'moduleroot:' 'nocolor' 'allpresets' - 'preset:' 'skiphooks:' 'save' 'builddir:' 'version' 'verbose' 'compress:') + 'preset:' 'skiphooks:' 'save' 'targetdirectory:' 'builddir:' 'version' 'verbose' 'compress:') parseopts "$_opt_short" "${_opt_long[@]}" -- "$@" || exit 1 set -- "${OPTRET[@]}" @@ -327,6 +328,10 @@ while :; do -s|--save) _optsavetree=1 ;; + -T|--targetdirectory) + shift + _opttargetdir=$1 + ;; -g|--generate) shift [[ -d $1 ]] && die "Invalid image path -- must not be a directory" @@ -414,8 +419,12 @@ KERNELVERSION=$(resolve_kernver "$_optkver") || cleanup 1 _d_kmoduledir=$_optmoduleroot/lib/modules/$KERNELVERSION [[ -d $_d_kmoduledir ]] || die "'$_d_kmoduledir' is not a valid kernel module directory" -_d_workdir=$(initialize_buildroot "$KERNELVERSION") || cleanup 1 -BUILDROOT=$_d_workdir/root +_d_workdir=$(initialize_buildroot "$KERNELVERSION" $_opttargetdir) || cleanup 1 +if [[ -z $_opttargetdir ]]; then + BUILDROOT=$_d_workdir/root +else + BUILDROOT=$_opttargetdir +fi . "$_f_config" || die "Failed to read configuration \`%s'" "$_f_config" -- 1.8.4.2

2 7

[arch-projects] [netctl] hotfix for wifi-menu -o generated wpa profiles
by Jouke Witteveen 18 Nov '13

18 Nov '13

Although it slipped through review on the list and made it past [testing], there is a bug in netctl 1.4 that can prevent automatically generated wireless profiles from working. The bad commit was f5065. I propose adding commit 3dc6d, which fixes the issue, directly as a patch to the package in [core]. WPA profiles generated with `wifi-menu -o` will stop working in 1.4 because the detection of hex keys looks at $key instead of at $Key (capital K). The commit referenced above fixes this issue. If we apply it quickly, we might have it in before the majority of users has upgraded to netctl 1.4. Sorry, - Jouke

2 3

[arch-projects] [netctl] [GIT] Network control utility based on systemd branch master updated. 1.4-1-g3dc6d75
by jouke＠archlinux.org 16 Nov '13

16 Nov '13

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 "Network control utility based on systemd". The branch, master has been updated via 3dc6d75f5fa4813fe5c998b13582912fffd88159 (commit) from d378bb8d684c62593a4d5cbac9d0ebe4f81fac4b (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 3dc6d75f5fa4813fe5c998b13582912fffd88159 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Sat Nov 16 23:12:11 2013 +0100 Fix typo in detection of hex keys Errata to f5065. $Key has a capital. ----------------------------------------------------------------------- Summary of changes: src/lib/wpa | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- Network control utility based on systemd

1 0