- Arch-projects - lists.archlinux.org

[arch-projects] [mkinitcpio][PATCH] implement --moduleroot option
by Dave Reisner 28 Jul '12

28 Jul '12

This might be useful for creating an initramfs image as part of a kernel package. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- bash-completion | 6 +++--- functions | 4 ++-- install/autodetect | 2 +- mkinitcpio | 10 +++++++--- mkinitcpio.8.txt | 3 +++ 5 files changed, 16 insertions(+), 9 deletions(-) diff --git a/bash-completion b/bash-completion index c37484c..6d21fd8 100644 --- a/bash-completion +++ b/bash-completion @@ -55,15 +55,15 @@ _files_from_dirs() { _mkinitcpio() { local action cur prev opts opts=(-A --add -c --config -g --generate -H --hookhelp -h --help -k --kernel - -L --listhooks -M --automods -n --nocolor -p --preset -S --skiphooks - -s --save -t --builddir -v --verbose -z --compress) + -L --listhooks -M --automods -n --nocolor -p --preset -r --moduleroot + -S --skiphooks -s --save -t --builddir -v --verbose -z --compress) _get_comp_words_by_ref cur prev case $prev in -[cg]|--config|--generate) _filedir ;; - -t|--builddir) + -r|--moduleroot|-t|--builddir) _filedir -d ;; -k|--kernel) _find_kernel_versions ;; diff --git a/functions b/functions index 9c577f0..b42daf7 100644 --- a/functions +++ b/functions @@ -212,7 +212,7 @@ auto_modules() { IFS=$'\n' read -rd '' -a mods < \ <(find /sys/devices -name modalias -exec sort -u {} + | # delimit each input by a newline, expanded in place - xargs -d $'\n' modprobe -qaRS "$KERNELVERSION" | + xargs -d $'\n' modprobe -d "$MODULEROOT" -qaRS "$KERNELVERSION" | sort -u) printf "%s\n" "${mods[@]//-/_}" @@ -332,7 +332,7 @@ add_module() { fi ;; esac - done < <(modinfo -k "$KERNELVERSION" -0 "$module" 2>/dev/null) + done < <(modinfo -b "$MODULEROOT" -k "$KERNELVERSION" -0 "$module" 2>/dev/null) if [[ -z $path ]]; then (( ign_errors )) && return 0 diff --git a/install/autodetect b/install/autodetect index b2d3687..20648e4 100644 --- a/install/autodetect +++ b/install/autodetect @@ -10,7 +10,7 @@ build() { # treat this as an alias, since ext3 might be aliased to ext4. IFS=$'\n' read -rd '' -a resolved < \ - <(modprobe -S "$KERNELVERSION" -R "$1" 2>/dev/null) + <(modprobe -M "$MODULEROOT" -S "$KERNELVERSION" -R "$1" 2>/dev/null) if (( ${#resolved[*]} )); then printf '%s\n' "${resolved[@]}" >>"$MODULE_FILE" diff --git a/mkinitcpio b/mkinitcpio index 5202e7f..b64fb67 100755 --- a/mkinitcpio +++ b/mkinitcpio @@ -45,6 +45,7 @@ usage: ${0##*/} [options] -M, --automods Display modules found via autodetection -n, --nocolor Disable colorized output messages -p, --preset <file> Build specified preset from /etc/mkinitcpio.d + -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, --builddir <dir> Use DIR as the temporary build directory @@ -99,7 +100,7 @@ resolve_kernver() { find_moduledir() { local d - for d in {/usr,}/lib/modules; do + for d in "$MODULEROOT"{/usr,}/lib/modules; do if [[ -d $d/$1/ ]]; then printf '%s' "$d/$1/" return 0 @@ -123,9 +124,9 @@ compute_hookset() { trap 'cleanup 130' INT trap 'cleanup 143' TERM -OPT_SHORT='A:c:g:H:hk:mnLMp:S:st:vz:' +OPT_SHORT='A:c:g:H:hk:mnLMp:r:S:st:vz:' OPT_LONG=('add:' 'config:' 'generate:' 'hookhelp:' 'help' 'kernel:' 'listhooks' 'automods' - 'nocolor' 'preset:' 'skiphooks:' 'save' 'builddir:' 'verbose' 'compress:') + 'moduleroot' 'nocolor' 'preset:' 'skiphooks:' 'save' 'builddir:' 'verbose' 'compress:') if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then exit 1 @@ -199,6 +200,9 @@ while :; do -z|--compress) shift optcompress=$1 ;; + -r|--moduleroot) + shift + MODULEROOT=$1 ;; --) shift break 2 ;; diff --git a/mkinitcpio.8.txt b/mkinitcpio.8.txt index 06957ac..fa30b30 100644 --- a/mkinitcpio.8.txt +++ b/mkinitcpio.8.txt @@ -62,6 +62,9 @@ Options /etc/mkinitcpio.d (without the .preset extension) or a full, absolute path to a file. +*-r, \--moduleroot* 'root':: + Specifies the root directory to find modules in, defaulting to '/'. + *-S, \--skiphooks* 'hooks':: Skip 'hooks' when generating the image. Multiple hooks should be comma-separated. This option can be specified multiple times. -- 1.7.11.3

1 0

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch master updated. 2012.07.5-3-gf670511
by tomegun＠archlinux.org 28 Jul '12

28 Jul '12

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 "Arch Linux initscripts repository". The branch, master has been updated via f670511763a05ac5ef688d335187ac1ccabf0487 (commit) from b0b1d8fb0f933b37e5878541e18034614eed47fb (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 f670511763a05ac5ef688d335187ac1ccabf0487 Author: Tom Gundersen <teg(a)jklm.no> Date: Sat Jul 28 02:54:42 2012 +0200 arch-daemons: add some sanity checking Don't create wrapper services, for things that are not exectuable files. Signed-off-by: Tom Gundersen <teg(a)jklm.no> ----------------------------------------------------------------------- Summary of changes: arch-daemons | 9 +++++++++ 1 file changed, 9 insertions(+) hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch master updated. 2012.07.5-2-gb0b1d8f
by tomegun＠archlinux.org 28 Jul '12

28 Jul '12

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 "Arch Linux initscripts repository". The branch, master has been updated via b0b1d8fb0f933b37e5878541e18034614eed47fb (commit) from 22c3b22688f451fb24f9075712fce732e9057a10 (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 b0b1d8fb0f933b37e5878541e18034614eed47fb Author: Tom Gundersen <teg(a)jklm.no> Date: Sat Jul 28 01:32:35 2012 +0200 merge initscripts-systemd This makes sure that systemd supports some initscripts API's. With this patch, systemd will: * Parse and use DAEMONS and MODULES from rc.conf * Run rc.local and rc.local.shutdown on boot and shutdown respectively Signed-off-by: Tom Gundersen <teg(a)jklm.no> ----------------------------------------------------------------------- Summary of changes: Makefile | 10 ++++++++ PKGBUILD | 1 + arch-daemons | 57 +++++++++++++++++++++++++++++++++++++++++++++ arch-modules-load | 15 ++++++++++++ arch-modules-load.service | 10 ++++++++ rc-local-shutdown.service | 10 ++++++++ rc-local.service | 10 ++++++++ 7 files changed, 113 insertions(+) create mode 100755 arch-daemons create mode 100755 arch-modules-load create mode 100644 arch-modules-load.service create mode 100644 rc-local-shutdown.service create mode 100644 rc-local.service hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [initscripts][PATCH] archlinux man page: fix typos
by Eric Bélanger 27 Jul '12

27 Jul '12

Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- archlinux.7.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/archlinux.7.txt b/archlinux.7.txt index ba2652f..0c6dd8e 100644 --- a/archlinux.7.txt +++ b/archlinux.7.txt @@ -10,7 +10,7 @@ archlinux - basic configuration SYNOPSIS -------- -Overview of the basic configuartion of Arch Linux. +Overview of the basic configuration of Arch Linux. DESCRIPTION ----------- @@ -66,7 +66,7 @@ GRUB's configuration is generated from /etc/default/grub by grub-mkconfig. Sysli MODULES[[M]] ------------ -Most modules should be loaded on-demand. Modules to be unconditioanlly loaded at boot can be specified in /etc/modules-load.d/, +Most modules should be loaded on-demand. Modules to be unconditionally loaded at boot can be specified in /etc/modules-load.d/, and modules to be blacklisted from auto-loading can be configured in /etc/modprobe.d/. SEE ALSO -- 1.7.11.3

2 1

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch master updated. 2012.07.5-1-g22c3b22
by tomegun＠archlinux.org 27 Jul '12

27 Jul '12

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 "Arch Linux initscripts repository". The branch, master has been updated via 22c3b22688f451fb24f9075712fce732e9057a10 (commit) from 3b64ac2a9236c081368dbb91f41f48b432d95b7d (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 22c3b22688f451fb24f9075712fce732e9057a10 Author: Eric Bélanger <snowmaniscool(a)gmail.com> Date: Thu Jul 26 20:27:34 2012 -0400 archlinux man page: fix typos Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> ----------------------------------------------------------------------- Summary of changes: archlinux.7.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository annotated tag 2012.07.5 created. 2012.07.5
by tomegun＠archlinux.org 26 Jul '12

26 Jul '12

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 "Arch Linux initscripts repository". The annotated tag, 2012.07.5 has been created at ea1055a65d0c151b163a7927f9cc12831e8c8a5e (tag) tagging 3b64ac2a9236c081368dbb91f41f48b432d95b7d (commit) replaces 2012.07.4 tagged by Tom Gundersen on Fri Jul 27 01:24:12 2012 +0200 - Log ----------------------------------------------------------------- add archlinux(7) man page minor cosmetic fixes to cryptsetup handling remove USEBTRFS as this is dealt with by an udev rule Matthew Monaco (1): do_unlock_systemd: use mkswap -f as before Tom Gundersen (8): make: upload in a different order btrfs: remove USEBTRFS Merge remote-tracking branch 'mmonaco/master' systemd: shut all the tools up a bit systemd: also increase to LOG_NOTICE on shutdown man: add ArchLinux(7) rc.conf: typo in comment man: change ArchLinux(7) into archlinux(7) ----------------------------------------------------------------------- hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch master updated. 2012.07.4-9-g3b64ac2
by tomegun＠archlinux.org 26 Jul '12

26 Jul '12

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 "Arch Linux initscripts repository". The branch, master has been updated via 3b64ac2a9236c081368dbb91f41f48b432d95b7d (commit) from 4fb392468f2be2bcf5bf147fbf7723ca50f868e9 (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 3b64ac2a9236c081368dbb91f41f48b432d95b7d Author: Tom Gundersen <teg(a)jklm.no> Date: Fri Jul 27 01:19:28 2012 +0200 man: change ArchLinux(7) into archlinux(7) Suggested-by: Pierre Schmitz <pierre(a)archlinux.org> Suggested-by: Karol Blazewicz <karol.blazewicz(a)gmail.com> Signed-off-by: Tom Gundersen <teg(a)jklm.no> ----------------------------------------------------------------------- Summary of changes: Makefile | 6 +++--- ArchLinux.7.txt => archlinux.7.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename ArchLinux.7.txt => archlinux.7.txt (98%) hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch master updated. 2012.07.4-8-g4fb3924
by tomegun＠archlinux.org 26 Jul '12

26 Jul '12

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 "Arch Linux initscripts repository". The branch, master has been updated via 4fb392468f2be2bcf5bf147fbf7723ca50f868e9 (commit) from 4a84b51830467ee192cd6bddc0857ad08f6e7ae4 (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 4fb392468f2be2bcf5bf147fbf7723ca50f868e9 Author: Tom Gundersen <teg(a)jklm.no> Date: Fri Jul 27 00:32:41 2012 +0200 rc.conf: typo in comment [00:31] <dgbaley27> tomegun: typo rc.conf:5 [00:31] <tomegun> dgbaley27: thanks Signed-off-by: Tom Gundersen <teg(a)jklm.no> ----------------------------------------------------------------------- Summary of changes: rc.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch master updated. 2012.07.4-7-g4a84b51
by tomegun＠archlinux.org 26 Jul '12

26 Jul '12

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 "Arch Linux initscripts repository". The branch, master has been updated via 4a84b51830467ee192cd6bddc0857ad08f6e7ae4 (commit) from 98baa63c2008aa70c9e95f5fe46a79cec87aad31 (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 4a84b51830467ee192cd6bddc0857ad08f6e7ae4 Author: Tom Gundersen <teg(a)jklm.no> Date: Fri Jul 27 00:00:14 2012 +0200 man: add ArchLinux(7) This outlines what files needs to be configured to get a well-behaved system. For now it is extremely terse, but the main point is to work as a check-list, and to point people to the correct manpages to learn more. I'll be happy to take patches to extend this in the future. One might argue that this sholud not be part of initscripts, and we might indeed move it to 'filesystem' or something like that in the future. For the time being I'll keep it here for convenience. Suggested-by: Thomas Bächler <thomas(a)archlinux.org> Signed-off-by: Tom Gundersen <teg(a)jklm.no> ----------------------------------------------------------------------- Summary of changes: ArchLinux.7.txt | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile | 9 +++++-- rc.conf | 9 +++---- 3 files changed, 91 insertions(+), 7 deletions(-) create mode 100644 ArchLinux.7.txt hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [netcfg] [GIT] netcfg network scripts repository branch master updated. 2.8.8-1-gfd096b4
by jouke＠archlinux.org 26 Jul '12

26 Jul '12

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 "netcfg network scripts repository". The branch, master has been updated via fd096b445062eea02c20595ed863ce891b313779 (commit) from 018fd30fdefd349fde7fdbd355900f3f8bda0b92 (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 fd096b445062eea02c20595ed863ce891b313779 Author: Braden <archbugs(a)dabrado.net> Date: Thu Jul 26 15:43:17 2012 +0200 Add a priority option to wpa config (FS#30737) Pass a priority parameter to wpa_supplicant (if specified). This is useful for net-auto-wireless. ----------------------------------------------------------------------- Summary of changes: docs/netcfg-profiles.5.txt | 3 +++ src/8021x | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) hooks/post-receive -- netcfg network scripts repository

1 0