- Arch-projects - lists.archlinux.org

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch master updated. 2011.05.2-8-g68c61ed
by tomegun＠archlinux.org 22 May '11

22 May '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 68c61ed4ce2eddf29c4f047133406d72162fd396 (commit) from e0e1420a3506a5988b8f76139788f0ffea298e0c (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 68c61ed4ce2eddf29c4f047133406d72162fd396 Author: Dave Reisner <d(a)falconindy.com> Date: Thu Apr 28 22:42:03 2011 -0400 network/rc.sysinit: remove dead code Signed-off-by: Tom Gundersen <teg(a)jklm.no> ----------------------------------------------------------------------- Summary of changes: network | 5 ----- rc.sysinit | 2 -- 2 files changed, 0 insertions(+), 7 deletions(-) hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [initscripts] simple rc.d bash completion script v2
by Auguste Pop 20 May '11

20 May '11

this is another version of the bash completion script. removed an unnecessary echo and allows auto completion for not well-adopted usage like rc.d status foo. here's the patch: commit 47c48b15047ae46dd2e3d56559dad17d57f78c91 Author: Auguste Pop <auguste(a)gmail.com> Date: Fri May 20 22:13:31 2011 +0800 basic rc.d bash completion diff --git a/Makefile b/Makefile index ad8a058..a7f3ad2 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ VER := $(shell git describe) -DIRS := /etc/rc.d /etc/conf.d /etc/rc.d/functions.d /etc/cron.hourly /sbin /etc/modprobe.d +DIRS := /etc/rc.d /etc/conf.d /etc/rc.d/functions.d /etc/cron.hourly /sbin /etc/modprobe.d /etc/bash_completion.d minilogd: minilogd.o @@ -13,6 +13,7 @@ install: minilogd installdirs install -m644 -t $(DESTDIR)/etc/rc.d functions install -m755 -t $(DESTDIR)/etc/rc.d hwclock network netfs install -m755 -t $(DESTDIR)/sbin minilogd rc.d modprobe-blacklist + install -m644 bash_completion $(DESTDIR)/etc/bash_completion.d/rc.d ln -s /run/initscripts/modprobe-blacklist.conf $(DESTDIR)/etc/modprobe.d/arch-blacklist.conf clean: diff --git a/bash_completion b/bash_completion new file mode 100644 index 0000000..9d766fe --- /dev/null +++ b/bash_completion @@ -0,0 +1,56 @@ +#!/bin/bash + +_rc_d_getdaemons () +{ + local -a files=("$1"/*) + echo "${files[@]##*/}" +} + +_rc_d_arraydiff () +{ + local -A arr + + for elem in "${!1}"; do + arr[$elem]=1 + done + for elem in "${!2}"; do + unset arr[$elem] + done + echo "${!arr[@]}" +} + +_rc_d () +{ + local command commands available started + local cur words cword + + commands="list help start stop restart" + available=($(_rc_d_getdaemons /etc/rc.d)) + started=($(_rc_d_getdaemons /run/daemons)) + + _get_comp_words_by_ref -n =: cur words cword + [[ $cword -gt 1 ]] && command=${words[1]} + + if [[ -z "$command" ]]; then + COMPREPLY=($(compgen -W "$commands" -- $cur)) + else + case "$command" in + start) + COMPREPLY=($(compgen -W "$(_rc_d_arraydiff \ + available[@] started[@])" -X "functions*" -- $cur)) + ;; + stop|restart) + COMPREPLY=($(compgen -W "${started[*]}" -- $cur)) + ;; + list|help) + COMPREPLY=() + ;; + *) + COMPREPLY=($(compgen -W "${available[*]}" \ + -X "functions*" --$cur)) + ;; + esac + fi +} + +complete -F _rc_d rc.d

1 0

[arch-projects] [initscripts][RFC] managing /tmp
by Tom Gundersen 20 May '11

20 May '11

Hi guys, Thanks to all of you who answered my many previous RFC's, I will follow up on them with code soon :-) In the last initscripts release I inedvertently introduced a bug where /tmp is not cleared on boot if it is mounted on a non-tmpfs drive (it was only cleared if it lived on the root partition). This lead to a long discussion in the bug report about possible use-cases for /tmp. Among other things it was requested that we should stop clearing /tmp or make it configurable. As always, I'm opposed to adding configuration options just for the sake of it, so I propose something different. First of all, this is what I took away from the discussion: 1) /tmp should always be mounted as tmpfs (there are some really obscure scenarios when it should not be (if you have individual files larger than 256GB on it)) 2) if /tmp is not mounted as tmpfs it should always be cleared at boot That said, some users disagree, and want to /tmp to be preserved on reboot. Usually I would deny such a request, but I figured it would actually simplify things, so why not. This is my proposal: 1) We advice users to mount /tmp as tmpfs (possibly with the proviso that the partition they would normally have used for /tmp is turned into swap space, and the size option of /tmp is set to the size of the old partition), this could be added to the standard fstab if we wish. 2) We never touch /tmp at boot. This makes no difference if the users follow our advice. 3) If the user wants to mount /tmp as a different fs, we advice them to put "rm -rf /tmp/* /tmp/.*" in rc.local, or manage /tmp in any other way they want (e.g. by using the tmpwatch package). What do you think? Cheers, Tom

4 11

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch master updated. 2011.05.2-7-ge0e1420
by tomegun＠archlinux.org 19 May '11

19 May '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 e0e1420a3506a5988b8f76139788f0ffea298e0c (commit) via b6e17433c8838acdc48ccfe726325118792a171e (commit) via aacbe897cc822d1daaa44cb754d56666e4f07e84 (commit) via cc1b8a39309fef45d092140fa130d0e82c696a44 (commit) via 99d64f5789f01243903be4b32078ec38bdce75fa (commit) via 417ab8ce6c830042375da4ded4374a9f30a5387e (commit) from c6b3853de29e5bb42adda4a2f62a08d87ea15740 (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 e0e1420a3506a5988b8f76139788f0ffea298e0c Author: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Date: Wed May 18 23:32:36 2011 +0200 add killall5 omit pid functionality (me) Update the offsets so can be merged now without any issues and respect the indentation. Implements FS#10536 - [initscripts] internal: save a pid from killall5 All credits to: Kurt J. Bosch Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Signed-off-by: Tom Gundersen <teg(a)jklm.no> commit b6e17433c8838acdc48ccfe726325118792a171e Author: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Date: Wed May 18 23:24:38 2011 +0200 use mount -n for devpts and shm Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Signed-off-by: Tom Gundersen <teg(a)jklm.no> commit aacbe897cc822d1daaa44cb754d56666e4f07e84 Author: Thomas Bächler <thomas(a)archlinux.org> Date: Tue May 17 20:13:39 2011 +0200 Fix typo Signed-off-by: Tom Gundersen <teg(a)jklm.no> commit cc1b8a39309fef45d092140fa130d0e82c696a44 Author: Tom Gundersen <teg(a)jklm.no> Date: Wed May 18 23:08:13 2011 +0200 fixup: also clear /tmp if it is a mountpoint eda191cf78365cc3d1 inadvertently introduced a change so that /tmp was not cleared if it was a mountpoint. This restores the old behaviour. It is strongly adviced to not monut anything but a tmpfs on /tmp. This would avoid the issue. Signed-off-by: Tom Gundersen <teg(a)jklm.no> commit 99d64f5789f01243903be4b32078ec38bdce75fa Author: Tom Gundersen <teg(a)jklm.no> Date: Mon May 9 22:15:43 2011 +0200 udev: generate blacklist on boot udev will read /etc/modprobe.d/*.conf and blacklist all modules that are listed as blacklist <module> We parse rc.conf at boot and generate such a .conf file. It cannot be written to /etc this early, so we save it to /run. A symlink exists in /etc to get the desired functionality. With this patch (and an analogous one in mkinitcpio) load-modules.sh can be removed from the udev package without loss of significant functionality. Setting MOD_AUTOLOAD will then no longer take effect, nor will kernel parameters. Thouhgh, kernel parameters might still affect the initramfs as the implementation is independent. Original-idea-by: Benjamen Richer <br(a)waldteufel-online.net> Based-on-patch-by: David Reisner <d(a)falconindy.com> Signed-off-by: Tom Gundersen <teg(a)jklm.no> commit 417ab8ce6c830042375da4ded4374a9f30a5387e Author: Tom Gundersen <teg(a)jklm.no> Date: Mon May 16 13:36:18 2011 +0200 makefile: do not make functions executable This was a bug in the original conversion to makefile (installing functions twice, the last time with wrong permissions). Signed-off-by: Tom Gundersen <teg(a)jklm.no> ----------------------------------------------------------------------- Summary of changes: Makefile | 9 +++++---- functions | 16 ++++++++++++++-- modprobe-blacklist | 25 +++++++++++++++++++++++++ rc.conf | 2 +- rc.sysinit | 11 +++++++---- 5 files changed, 52 insertions(+), 11 deletions(-) create mode 100755 modprobe-blacklist hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [initscripts] rc.d zsh completion
by Tom Gundersen 18 May '11

18 May '11

Hi, Clément submitted the attached zsh completion file for review. (Anyone should be able to post to the mailinglist, don't know what the problem might have been). Cheers, Tom ---------- Forwarded message ---------- From: Clément Démoulins <clement(a)archivel.fr> Date: 2011/5/18 Subject: Re: [arch-general] rc.d bash completion To: Cc: General Discussion about Arch Linux <arch-general(a)archlinux.org> Le 18/05/2011 22:31, Tom Gundersen a écrit : > 2011/5/18 Clément Démoulins <clement(a)archivel.fr>: >> Le 18/05/2011 18:24, Grigorios Bouzakis a écrit : >>> Auguste Pop wrote: >>>> i wrote a very simple rc.d bash completion script. is there any chance >>>> it can be used upstream? >>> >>> I noticed earlier theres one for zsh in the AUR as well. I was about to >>> suggest to the author to send it upstream but negelcted to. >>> https://aur.archlinux.org/packages.php?ID=49136 >>> >>> Greg >>> >> Hello, >> I'm the author of the complection script for zsh and ok i can make a git >> patch. > > Thanks! I'll route all this through Seblu (just write to > arch-projects(a)archlinux.org) as he is the one working on rc.d (and he > has some outstanding patches, so better let him coordinate it). > > Cheers, > > Tom I tried to send the patch to arch-projects(a)archlinux.org but i'm not allowed to post in this mailing list. I join the patch if you can send it. Clément -- Clef GPG : 0xDD51E028

2 1

[arch-projects] [INITSCRIPTS][PATCH 1/6] Improve coloring on light and transparent term
by Sebastien Luttringer 18 May '11

18 May '11

This patch improve coloring in light and transparent term. It uses tput if available \033 are remplaced by \e Signed-off-by: Sebastien Luttringer <seblu(a)seblu.net> --- functions | 49 +++++++++++++++++++++++++++++-------------------- rc.sysinit | 4 ++-- 2 files changed, 31 insertions(+), 22 deletions(-) diff --git a/functions b/functions index fd0928e..500ec7c 100644 --- a/functions +++ b/functions @@ -49,28 +49,37 @@ else export LANG=C fi -# colors: -if [[ $USECOLOR = YES || $USECOLOR = yes ]]; then - C_MAIN="\033[1;37;40m" # main text - - C_OTHER="\033[1;34;40m" # prefix & brackets - C_SEPARATOR="\033[1;30;40m" # separator - - C_BUSY="\033[0;36;40m" # busy - C_FAIL="\033[1;31;40m" # failed - C_DONE="\033[1;37;40m" # completed - C_BKGD="\033[1;35;40m" # backgrounded - - C_H1="\033[1;37;40m" # highlight text 1 - C_H2="\033[1;36;40m" # highlight text 2 - - C_CLEAR="\033[1;0m" +# set colors +if [[ $USECOLOR =~ yes|YES ]]; then + if /bin/tput setaf 0 &>/dev/null; then + C_CLEAR="$(tput sgr0)" # clear text + C_MAIN="${C_CLEAR}$(/bin/tput bold)" # main text + C_OTHER="${C_MAIN}$(/bin/tput setaf 4)" # prefix & brackets + C_SEPARATOR="${C_MAIN}$(/bin/tput setaf 0)" # separator + C_BUSY="${C_CLEAR}$(/bin/tput setaf 6)" # busy + C_FAIL="${C_MAIN}$(/bin/tput setaf 1)" # failed + C_DONE="${C_MAIN}" # completed + C_BKGD="${C_MAIN}$(/bin/tput setaf 5)" # backgrounded + C_H1="${C_MAIN}" # highlight text 1 + C_H2="${C_MAIN}$(/bin/tput setaf 6)" # highlight text 2 + else + C_CLEAR="\e[m" # clear text + C_MAIN="\e[;1m" # main text + C_OTHER="\e[1;34m" # prefix & brackets + C_SEPARATOR="\e[1;30m" # separator + C_BUSY="\e[;36m" # busy + C_FAIL="\e[1;31m" # failed + C_DONE="${C_MAIN}" # completed + C_BKGD="\e[1;35m" # backgrounded + C_H1="${$C_MAIN}" # highlight text 1 + C_H2="\e[1;36m" # highlight text 2 + fi fi if [[ -t 1 ]]; then - SAVE_POSITION="\033[s" - RESTORE_POSITION="\033[u" - DEL_TEXT="\033[$(($STAT_COL+4))G" + SAVE_POSITION="\e[s" + RESTORE_POSITION="\e[u" + DEL_TEXT="\e[$(($STAT_COL+4))G" else SAVE_POSITION="" RESTORE_POSITION="" @@ -360,7 +369,7 @@ set_consolefont() { stat_fail elif [[ $CONSOLEMAP ]]; then cat <<"EOF" >>/etc/profile.d/locale.sh -if [ "$CONSOLE" = "" -a "$TERM" = "linux" -a -t 1 ]; then printf "\033(K"; fi +if [ "$CONSOLE" = "" -a "$TERM" = "linux" -a -t 1 ]; then printf "\e(K"; fi EOF stat_done else diff --git a/rc.sysinit b/rc.sysinit index dc4be58..7b2cdfe 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -352,7 +352,7 @@ if [[ ${LOCALE,,} =~ utf ]]; then # but also when user has set vt.default_utf8=0 but LOCALE is *.UTF-8. for i in /dev/tty[0-9]*; do /usr/bin/kbd_mode -u < ${i} - printf "\033%%G" > ${i} + printf "\e%%G" > ${i} done echo 1 > /sys/module/vt/parameters/default_utf8 stat_done @@ -362,7 +362,7 @@ else # make non-UTF-8 consoles work on 2.6.24 and newer kernels for i in /dev/tty[0-9]*; do /usr/bin/kbd_mode -a < ${i} - printf "\033%%@" > ${i} + printf "\e%%@" > ${i} done echo 0 > /sys/module/vt/parameters/default_utf8 stat_done -- Sebastien "Seblu" Luttringer

3 8

[arch-projects] [initscripts] simple rc.d bash completion script
by Auguste Pop 18 May '11

18 May '11

i have made a small patch to initscripts to allow for a simple bash completion function. i am not familiar with git, i made the patch by git clone, git branch, git commit, and git show. the patch is at http://paste.pocoo.org/show/391299/ and also copy-pasted as follows: commit a430fcfb8fcd1e268609473c9a722e1cae1a66f0 Author: Auguste Pop <auguste(a)gmail.com> Date: Thu May 19 00:36:44 2011 +0800 add a simple bash completion file diff --git a/Makefile b/Makefile index 6923840..15df4cf 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ VER := $(shell git describe) -DIRS := /etc/rc.d /etc/conf.d /etc/rc.d/functions.d /etc/cron.hourly /sbin +DIRS := /etc/rc.d /etc/conf.d /etc/rc.d/functions.d /etc/cron.hourly /sbin /etc/bash_completion.d minilogd: minilogd.o @@ -13,6 +13,7 @@ install: minilogd installdirs install -m755 -t $(DESTDIR)/etc/cron.hourly adjtime install -m755 -t $(DESTDIR)/etc/rc.d functions hwclock network netfs install -m755 -t $(DESTDIR)/sbin minilogd rc.d + install -m644 bash_completion $(DESTDIR)/etc/bash_completion.d/rc.d clean: rm -f minilogd minilogd.o diff --git a/bash_completion b/bash_completion new file mode 100644 index 0000000..a3bd8ed --- /dev/null +++ b/bash_completion @@ -0,0 +1,55 @@ +#!/bin/bash + +_rc.d_getdaemons () +{ + /usr/bin/find "$1" -mindepth 1 -maxdepth 1 -type f -printf '%f\n' +} + +_rc.d_arraydiff () +{ + local arr + declare -A arr + + for elem in "${!1}" + do + arr[$elem]=1 + done + for elem in "${!2}" + do + unset arr[$elem] + done + echo "${!arr[@]}" +} + +_rc.d () +{ + local command commands available started + local cur words cword + + commands="list help start stop restart" + available=($(_rc.d_getdaemons /etc/rc.d)) + started=($(_rc.d_getdaemons /run/daemons)) + + _get_comp_words_by_ref -n =: cur words cword + [ $cword -gt 1 ] && command=${words[1]} + + if [ -z "$command" ] + then + COMPREPLY=($(compgen -W "$commands" -- $cur)) + else + case "$command" in + start) + COMPREPLY=($(compgen -W "$(_rc.d_arraydiff \ + available[@] started[@])" -- $cur)) + ;; + stop|restart) + COMPREPLY=($(compgen -W "$(echo ${started[@]})" -- $cur)) + ;; + list|help|*) + COMPREPLY=() + ;; + esac + fi +} + +complete -F _rc.d rc.d

2 2

[arch-projects] [initscripts] [PATCH] Fix typo
by Thomas Bächler 17 May '11

17 May '11

--- rc.sysinit | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rc.sysinit b/rc.sysinit index d0003ab..70644e4 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -13,7 +13,7 @@ printsep run_hook sysinit_start -# export standard PATH (will be overridden later when /etc/profile is sourced, but is usefull for UDev) +# export standard PATH (will be overridden later when /etc/profile is sourced, but is useful for UDev) export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" # mount /proc, /sys, /run, /dev, /run/lock, /dev/pts, /dev/shm (the api filesystems) -- 1.7.5.1

1 0

[arch-projects] [RFC] [PATCH] [initscripts] Add killall5 omit pid functionality.
by Gerardo Exequiel Pozzi 17 May '11

17 May '11

(me) Update the offsets so can be merged now without any issues and respect the indentation. Implements FS#10536 - [initscripts] internal: save a pid from killall5 All credits to: Kurt J. Bosch Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- functions | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/functions b/functions index fd0928e..6d279cc 100644 --- a/functions +++ b/functions @@ -222,6 +222,14 @@ ck_status() { fi } +# PIDs to be omitted by killall5 +declare -a omit_pids + +add_omit_pids() { + omit_pids+=( $@ ) +} + + kill_everything() { # $1 = where we are being called from. # This is used to determine which hooks to run. @@ -241,12 +249,16 @@ kill_everything() { # Terminate all processes stat_busy "Sending SIGTERM To Processes" run_hook "$1_prekillall" - /sbin/killall5 -15 &> /dev/null + local pid k5args="" + for pid in ${omit_pids[@]}; do + k5args+=" -o $pid" + done + /sbin/killall5 -15 $k5args &> /dev/null /bin/sleep 5 stat_done stat_busy "Sending SIGKILL To Processes" - /sbin/killall5 -9 &> /dev/null + /sbin/killall5 -9 $k5args &> /dev/null /bin/sleep 1 stat_done -- 1.7.5.1

3 3

[arch-projects] [PATCH] [initscripts] Use mount -n for devpts and shm
by Gerardo Exequiel Pozzi 17 May '11

17 May '11

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- rc.sysinit | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rc.sysinit b/rc.sysinit index 733149c..6a01029 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -29,9 +29,9 @@ if ! /bin/mountpoint -q /dev; then fi /bin/mkdir -p /run/lock /dev/{pts,shm} /bin/chmod 1777 /run/lock -/bin/mountpoint -q /dev/pts || /bin/mount /dev/pts &> /dev/null \ +/bin/mountpoint -q /dev/pts || /bin/mount -n /dev/pts &> /dev/null \ || /bin/mount -n -t devpts devpts /dev/pts -o mode=620,gid=5,nosuid,noexec -/bin/mountpoint -q /dev/shm || /bin/mount /dev/shm &> /dev/null \ +/bin/mountpoint -q /dev/shm || /bin/mount -n /dev/shm &> /dev/null \ || /bin/mount -n -t tmpfs shm /dev/shm -o mode=1777,nosuid,nodev # remount root ro to allow for fsck later on, we remount now to -- 1.7.5.1

5 10