- Arch-projects - lists.archlinux.org

[arch-projects] [INITSCRIPTS][PATCH] Load sysctl config files from sysctl.d
by Sebastien Luttringer 31 Aug '11

31 Aug '11

This patch implement loading of sysctl config files as described in http://0pointer.de/public/systemd-man/sysctl.d.html This is a very conveniant way of configuring sysctl option for sysadmin which can drop sysctl config files inside this directory to enable some feature. Dropping a file like disableipv6.conf inside this directory will disable ipv6 $ cat disableipv6.conf net.ipv6.conf.all.disable_ipv6 = 1 There is atm no package which use this functionnality NOTE: /etc/sysctl.d/ and /usr/lib/sysctl.d/ should be added in procps NOTE: maybe this feature should be added as a daemon for procps package allowing user to reload configs files by calling rc.d reload procps --- rc.multi | 22 +++++++++++++++++++++- tmpfiles.conf | 1 + 2 files changed, 22 insertions(+), 1 deletions(-) diff --git a/rc.multi b/rc.multi index 16fa83a..5974a35 100755 --- a/rc.multi +++ b/rc.multi @@ -6,11 +6,31 @@ . /etc/rc.conf . /etc/rc.d/functions +shopt -s nullglob + run_hook multi_start -# Load sysctl variables if sysctl.conf is present +# Load sysctl variables from sysctl.conf (backward compatibility) [[ -r /etc/sysctl.conf ]] && sysctl -q -p &>/dev/null +# Load sysctl variables (new style) +# http://0pointer.de/public/systemd-man/sysctl.d.html +declare -a sysctl_d=( + /usr/lib/sysctl.d + /etc/sysctl.d + /run/sysctl.d +) +declare -A sysctl_c +for _d in "${sysctl_d[@]}"; do + [[ -d "$_d" ]] || continue + for _f in "$_d"/*.conf; do + sysctl_c[${_f##*/}]="$_f" + done +done +for _f in "${sysctl_c[@]}"; do + sysctl -q -p "$_f" &>/dev/null +done + # Start daemons for daemon in "${DAEMONS[@]}"; do case ${daemon:0:1} in diff --git a/tmpfiles.conf b/tmpfiles.conf index 7dd1358..61081d0 100644 --- a/tmpfiles.conf +++ b/tmpfiles.conf @@ -4,6 +4,7 @@ D /tmp 1777 root root D /run/daemons 0755 root root +D /run/sysctl.d 0755 root root d /tmp/.X11-unix 1777 root root d /tmp/.ICE-unix 1777 root root -- Sebastien "Seblu" Luttringer

3 3

[arch-projects] [PATCH] initscripts: load of sysctl files at startup
by Earendil 31 Aug '11

31 Aug '11

Hi Just a little patch to correct the load of the sysctl configuration file at startup. I have also added the capability to stip th sysctl.conf files in many files in the sysctl.d directory. This idea was inspired by Debian architecture. Feel free -- keys.gnupg.net: 0xEBCBE59D "J'ai toujours rêvé d'un ordinateur qui soit aussi facile à utiliser qu'un téléphone. Mon rêve s'est réalisé : je ne sais plus comment utiliser mon téléphone." Bjarne Stroustrup ------------ PATCH ----------------------- --- rc.multi.orig 2011-07-28 14:21:07.000000000 +0200 +++ rc.multi 2011-08-12 23:48:23.914340475 +0200 @@ -9,7 +9,10 @@ run_hook multi_start # Load sysctl variables if sysctl.conf is present -[[ -r /etc/sysctl.conf ]] && sysctl -q -p &>/dev/null +for file in /etc/sysctl.conf /etc/sysctl.d/*.conf ; do + [[ -r "${file}" ]] && sysctl -q -p "${file}" &> /dev/null +done +stat_done # Start daemons for daemon in "${DAEMONS[@]}"; do ------------------------------------------

5 8

[arch-projects] [PATCH initscripts] add shutdown_preumount hook
by Devin J. Pohly 30 Aug '11

30 Aug '11

From: "Devin J. Pohly" <djpohly+arch(a)gmail.com> This would be useful for filesystem monitoring software which needs to capture all changes to the filesystem - including the final writes to the random seed and wtmp. Signed-off-by: Devin J. Pohly <djpohly+arch(a)gmail.com> --- functions | 1 + rc.shutdown | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/functions b/functions index f68c088..e9c7711 100644 --- a/functions +++ b/functions @@ -469,6 +469,7 @@ bootlogd_stop() { # single_prekillall: before all processes are being killed in rc.single # shutdown_postkillall: after all processes have been killed in rc.shutdown # single_postkillall: after all processes have been killed in rc.single +# shutdown_preumount: after last filesystem write, but before filesystems are unmounted # shutdown_postumount: after filesystems are unmounted # shutdown_poweroff: directly before powering off in rc.shutdown # diff --git a/rc.shutdown b/rc.shutdown index db8f50b..909fe06 100755 --- a/rc.shutdown +++ b/rc.shutdown @@ -51,6 +51,8 @@ status "Deactivating Swap" swapoff -a status "Deactivating monitoring of LVM2 groups" \ vgchange --monitor n &>/dev/null +run_hook shutdown_preumount + # if we don't have devtmpfs support, /dev is mounted as tmpfs, so don't unmount it status "Unmounting Filesystems" \ umount -a -r -t nodevtmpfs,notmpfs,nosysfs,noproc,nodevpts -O no_netdev -- 1.7.6.1

1 0

[arch-projects] [PATCH] [mkinitcpio] Remove early redirection 2>/dev/null such node does not exists.
by Gerardo Exequiel Pozzi 30 Aug '11

30 Aug '11

An empty file will be created in any case, does not cause any harm, but for correctness. 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 8c8709c..11773b1 100644 --- a/init +++ b/init @@ -9,7 +9,7 @@ busybox --install -s mkdir -p /new_root mount -t proc proc /proc -o nosuid,noexec,nodev mount -t sysfs sys /sys -o nosuid,noexec,nodev -if grep -q devtmpfs /proc/filesystems 2>/dev/null; then +if grep -q devtmpfs /proc/filesystems ; then mount -n -t devtmpfs udev /dev -o mode=0755,size=10M,nosuid devtmpfs_mounted=1 else -- 1.7.6

1 0

[arch-projects] [devtools] [PATCH] zsh_completion: Fix package completion
by Lukas Fleischer 29 Aug '11

29 Aug '11

Make use of _devtools_completions_all_packages() instead of using _devtools_completions_installed_packages(). The latter was removed during an earlier review of the patch adding ZSH completion (now 6350ec04 in master) but we forgot to change two references. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- zsh_completion | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zsh_completion b/zsh_completion index b1d7d05..d87850a 100644 --- a/zsh_completion +++ b/zsh_completion @@ -38,7 +38,7 @@ _commitpkg_args=( ) _finddeps_args=( - '1:packages:_devtools_completions_installed_packages' + '1:packages:_devtools_completions_all_packages' ) _makechrootpkg_args=( @@ -64,7 +64,7 @@ _mkarchroot_args=( _rebuildpkgs_args=( '1:chroot_dir:_files -/' - '*:packages:_devtools_completions_installed_packages' + '*:packages:_devtools_completions_all_packages' ) _devtools_completions_all_packages() { -- 1.7.6.1

1 0

[arch-projects] [INITSCRIPTS][PATCH] rc.d: handle a set of options
by Sebastien Luttringer 29 Aug '11

29 Aug '11

rc.d can now take --started, --stopped, --auto, --noauto as option which help user to filter list of daemon for all actions As a corollary list command can now take a list of dameon to display All kind of arguments can be mixed to obtain the proper output. zsh and bash completion are updated Note: Output of help command exit 0 and is no more printed on stderr Signed-off-by: Sebastien Luttringer <seblu(a)seblu.net> --- bash-completion | 20 ++++---- rc.d | 124 +++++++++++++++++++++++++++++++++++++++--------------- zsh-completion | 8 +--- 3 files changed, 101 insertions(+), 51 deletions(-) diff --git a/bash-completion b/bash-completion index d78484e..4b4593b 100644 --- a/bash-completion +++ b/bash-completion @@ -3,20 +3,20 @@ _rc_d() { local action cur prev - action="help list start stop reload restart" + actions='help list start stop reload restart' + options='-s --started -S --stopped -a --auto -A --noauto' _get_comp_words_by_ref cur prev - if ((COMP_CWORD == 1)); then - COMPREPLY=($(compgen -W "${action}" -- "$cur")) - elif [[ "$prev" == help ]]; then + _get_first_arg + if [[ -z "$arg" ]]; then + COMPREPLY=($(compgen -W "${actions} ${options}" -- "$cur")) + elif [[ "$arg" == help ]]; then COMPREPLY=() - elif [[ "$prev" == list ]]; then - ((COMP_CWORD == 2)) && COMPREPLY=($(compgen -W "started stopped" -- "$cur")) || COMPREPLY=() - elif [[ "$prev" == start ]]; then + elif [[ "$arg" == start ]]; then COMPREPLY=($(comm -23 <(cd /etc/rc.d && compgen -f -X 'functions*' "$cur"|sort) <(cd /run/daemons/ && compgen -f "$cur"|sort))) - elif [[ "$prev" =~ stop|restart|reload ]]; then + elif [[ "$arg" =~ stop|restart|reload ]]; then COMPREPLY=($(cd /run/daemons/ && compgen -f "$cur"|sort)) - elif ((COMP_CWORD > 1)); then - COMPREPLY=($(cd /etc/rc.d && compgen -f -X 'functions*' "$cur"|sort)) + else + COMPREPLY=($(compgen -W "${options} $(cd /etc/rc.d && compgen -f -X 'functions*')" -- "$cur")) fi } complete -F _rc_d rc.d diff --git a/rc.d b/rc.d index 9b0f092..3f2835e 100755 --- a/rc.d +++ b/rc.d @@ -4,74 +4,128 @@ NEED_ROOT=0 # this script can be run without be root . /etc/rc.conf . /etc/rc.d/functions +# print usage and exit usage() { local name=${0##*/} cat >&2 << EOF -usage: $name <action> <daemon> [daemon] ... - $name list [started|stopped] - $name help +usage: $name <action> [options] [daemons] -<daemon> is the name of a script in /etc/rc.d +options: + -s, --started Filter started daemons + -S, --stopped Filter stopped daemons + -a, --auto Filter auto started daemons + -A, --noauto Filter manually started daemons + +<daemons> is a space separated list of script in /etc/rc.d <action> can be a start, stop, restart, reload, status, ... WARNING: initscripts are free to implement or not the above actions. e.g: $name list - $name list started - $name help + $name list sshd gpm + $name list --started gpm $name start sshd gpm + $name stop --noauto + $name help EOF - exit 1 + exit ${1:-1} +} + +# filter list of daemons +filter_daemons() { + local -a new_daemons=() + for daemon in "${daemons[@]}"; do + # check if daemons is valid + if ! have_daemon "$daemon"; then + printf "${C_FAIL}:: ${C_DONE}Dameon script ${C_FAIL}${daemon}${C_DONE} does \ +not exist or is not executable.${C_CLEAR}\n" >&2 + exit 2 + fi + # check filter + ((${filter[started]} == 1)) && ck_daemon "$daemon" && continue + ((${filter[stopped]} == 1)) && ! ck_daemon "$daemon" && continue + ((${filter[auto]} == 1)) && ck_autostart "$daemon" && continue + ((${filter[noauto]} == 1)) && ! ck_autostart "$daemon" && continue + new_daemons+=("$daemon") + done + daemons=("${new_daemons[@]}") } (( $# < 1 )) && usage +# ret store the return code of rc.d declare -i ret=0 -case $1 in +# daemons store daemons on which action will be executed +declare -a daemons=() +# filter store current filter mode +declare -A filter=([started]=0 [stopped]=0 [auto]=0 [noauto]=0) + +# parse options +argv=$(getopt -l 'started,stopped,auto,noauto' -- 'sSaA' "$@") || usage +eval set -- "$argv" + +# create an initial daemon list +while [[ "$1" != -- ]]; do + case "$1" in + -s|--started) filter[started]=1 ;; + -S|--stopped) filter[stopped]=1 ;; + -a|--auto) filter[auto]=1 ;; + -A|--noauto) filter[noauto]=1 ;; + esac + shift +done + +# remove -- +shift +# get action +action=$1 +shift + +# get initial daemons list +for daemon; do + daemons+=("$daemon") +done + +# going into script directory +cd /etc/rc.d + +case $action in help) - usage - ;; + usage 0 2>&1 + ;; list) - shift - cd /etc/rc.d/ - for d in *; do - have_daemon "$d" || continue + # list take all daemons by default + [[ -z $daemons ]] && for d in *; do have_daemon "$d" && daemons+=("$d"); done + filter_daemons + for daemon in "${daemons[@]}"; do # print running / stopped satus - if ! ck_daemon "$d"; then - [[ "$1" == stopped ]] && continue - printf "${C_OTHER}[${C_DONE}STARTED${C_OTHER}]" + if ! ck_daemon "$daemon"; then + s_status="${C_OTHER}[${C_DONE}STARTED${C_OTHER}]" else - [[ "$1" == started ]] && continue - printf "${C_OTHER}[${C_FAIL}STOPPED${C_OTHER}]" + s_status="${C_OTHER}[${C_FAIL}STOPPED${C_OTHER}]" fi # print auto / manual status - if ! ck_autostart "$d"; then - printf "${C_OTHER}[${C_DONE}AUTO${C_OTHER}]" + if ! ck_autostart "$daemon"; then + s_auto="${C_OTHER}[${C_DONE}AUTO${C_OTHER}]" else - printf "${C_OTHER}[${C_FAIL} ${C_OTHER}]" + s_auto="${C_OTHER}[${C_FAIL} ${C_OTHER}]" fi - printf " ${C_CLEAR}$d\n" + printf "$s_status$s_auto${C_CLEAR} $daemon\n" done ;; *) - # check min args count - (( $# < 2 )) && usage - action=$1 - shift + # other actions need an explicit daemons list + [[ -z $daemons ]] && usage + filter_daemons # set same environment variables as init runlevel=$(/sbin/runlevel) - ENV=("PATH=/bin:/usr/bin:/sbin:/usr/sbin" + ENV=('PATH=/bin:/usr/bin:/sbin:/usr/sbin' "PREVLEVEL=${runlevel%% *}" "RUNLEVEL=${runlevel##* }" "CONSOLE=${CONSOLE:-/dev/console}" "TERM=$TERM") cd / - for i; do - if [[ -x "/etc/rc.d/$i" ]]; then - env -i "${ENV[@]}" "/etc/rc.d/$i" "$action" - else - printf "${C_FAIL}:: ${C_DONE}Daemon ${C_FAIL}$i${C_DONE} does not exist \ -or is not executable${C_CLEAR}\n" - fi + for daemon in "${daemons[@]}"; do + env -i "${ENV[@]}" "/etc/rc.d/$daemon" "$action" (( ret += !! $? )) # clamp exit value to 0/1 done ;; diff --git a/zsh-completion b/zsh-completion index e5c2850..58fdfab 100644 --- a/zsh-completion +++ b/zsh-completion @@ -4,11 +4,10 @@ _rc.d () { local curcontext="$curcontext" state line typeset -A opt_args - _arguments "1: :->action" "*: :->service" - + _arguments "1: :->action" "*: :->service" {-s,--started} {-S,--stopped} {-a,--auto} {-A,--noauto} case $state in action) - _arguments "1:action:(list help start stop restart)" + _arguments "*:action:(list help start stop restart)" ;; service) local action="$words[2]" @@ -18,9 +17,6 @@ _rc.d () { help) _arguments "*: :" ;; - list) - _arguments "2: :(started stopped)" - ;; start) _arguments "*: :($(comm -23 <(echo /etc/rc.d/*(N-*:t)|tr ' ' '\n') <(echo /run/daemons/*(N:t)|tr ' ' '\n')))" ;; -- Sebastien "Seblu" Luttringer

2 1

[arch-projects] [devtools] [PATCH 1/4] archbuild: Use array for base packages
by Lukas Fleischer 28 Aug '11

28 Aug '11

Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- archbuild | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/archbuild b/archbuild index 19b734b..fa16914 100755 --- a/archbuild +++ b/archbuild @@ -1,12 +1,12 @@ #!/bin/bash -base_packages='base base-devel sudo' +base_packages=(base base-devel sudo) cmd="$(basename "${0%-build}")" if [ "${cmd%-*}" == 'multilib' ]; then repo="${cmd}" arch='x86_64' - base_packages+=' multilib-devel' + base_packages+=(multilib-devel) else repo=${cmd%-*} arch=${cmd##*-} @@ -56,7 +56,7 @@ if ${clean_first} || [ ! -d "${chroots}/${repo}-${arch}" ]; then -C /usr/share/devtools/pacman-${repo}.conf \ -M /usr/share/devtools/makepkg-${arch}.conf \ ${chroots}/${repo}-${arch}/root \ - ${base_packages} + "${base_packages[@]}" else setarch ${arch} mkarchroot \ -u \ -- 1.7.6.1

1 3

[arch-projects] [mkinitcpio] shutdown magic
by Tom Gundersen 25 Aug '11

25 Aug '11

Hi guys, Thanks to Thomas implementing "cp -x" in busybox, I have now been able to get back to implementing the shutdown hook. Thomas' patch only applies to busybox git, and annoyingly they introduced a bug (imho) which causes some issues with busybox --install. To try this out you'll need: busybox from git: git://git.busybox.net/busybox revert 5c942713b7369d239b1303c0cfc7049d898564d revert 4a2a86d5e7e7bf284a31af604a738dfa1f1a2240 thoma's patch: curl http://paste.xinu.at/F5a | git am .config from mkinitcpio-busybox: http://projects.archlinux.org/svntogit/packages.git/plain/mkinitcpio-busybo… "make menuconfig" and enable init initscripts from git: git://projects.archlinux.org/initscripts.git mkinitcpio from my git: git://github.com/teg/mkinitcpio.git Finally, you enable the shutdown hook in mkinitcpio.conf, regenerate and reboot. Assuming your machine came back up again you can now "chroot /run/initramfs /bin/sh" and have a look around in the init/shutdown ramfs. Cheers, Tom

1 0

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch master updated. 2011.07.3-15-g7cccf54
by tomegun＠archlinux.org 25 Aug '11

25 Aug '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 "Arch Linux initscripts repository". The branch, master has been updated via 7cccf54fcb9fab459590b8b6fd5c51f2088e3b2e (commit) via 8271087636e09ff40c10a8911250fd37af467bc0 (commit) from abd2fa8211a58761782c0b396f8e9c9d8a516abc (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 7cccf54fcb9fab459590b8b6fd5c51f2088e3b2e Author: Tom Gundersen <teg(a)jklm.no> Date: Wed Aug 24 20:45:15 2011 +0200 shutdown: rely on init being installed by the initrd init is now included in mkinitcpio's busybox, so we don't need to copy it. This might break compat with dracut, but it can be worked around very simply in case anyone wants to use dracut with Arch, so we don't care. Signed-off-by: Tom Gundersen <teg(a)jklm.no> commit 8271087636e09ff40c10a8911250fd37af467bc0 Author: Tom Gundersen <teg(a)jklm.no> Date: Tue Aug 23 19:45:16 2011 +0200 sutdown: support both poweroff and reboot Tell the /run/initramfs/shutdown what action to preform. Still no kexec support though. Signed-off-by: Tom Gundersen <teg(a)jklm.no> ----------------------------------------------------------------------- Summary of changes: rc.shutdown | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [devtools] [PATCH 1/3] commitpkg: Fix usage message
by Lukas Fleischer 25 Aug '11

25 Aug '11

Remove the no longer used "reponame" argument from the usage message. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- commitpkg | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/commitpkg b/commitpkg index 1275615..244581f 100755 --- a/commitpkg +++ b/commitpkg @@ -54,7 +54,7 @@ pkgbase=${pkgbase:-$pkgname} case "$cmd" in commitpkg) if [ $# -eq 0 ]; then - abort 'usage: commitpkg <reponame> [-l limit] [-a arch] [commit message]' + abort 'usage: commitpkg [-l limit] [-a arch] [commit message]' fi repo="$1" shift @@ -63,7 +63,7 @@ case "$cmd" in repo="${cmd%pkg}" ;; *) - abort 'usage: commitpkg <reponame> [-l limit] [-a arch] [commit message]' + abort 'usage: commitpkg [-l limit] [-a arch] [commit message]' ;; esac -- 1.7.6

3 6