- Arch-projects - lists.archlinux.org

[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

[arch-projects] [initscripts][RFC] deprecating TIMEZONE from rc.conf
by Tom Gundersen 17 May '11

17 May '11

Hi guys, I think the TIMEZONE variable in rc.conf is unnecessary and it causes some problems with other (especially GUI) tools. I'd like to hear what you think about deprecating it. We will still keep the support for it in initscripts, but we will suggest (in the standard rc.conf) to not set it. It will then be up to the maintainer of our installer(s) and documentation to adopt (or not) this suggestion. I cc'ed the GNOME/KDE/XFCE maintainers as I would be interested to hear if their timezone tools work well with rc.conf (I think not, but I might have missed something). I also cc'ed aif and archboot maintainers. Please forward if you know of anyone who maintains relevant packages that I left out. Cheers, Tom >From fd5fd34f8a593710483a204d7a7984f89385e3fa Mon Sep 17 00:00:00 2001 From: Tom Gundersen <teg(a)jklm.no> Date: Mon, 16 May 2011 13:17:48 +0200 Subject: [PATCH] timezone: deprecate the TIMEZONE variable Setting the TIMEZONE in rc.conf is a bad idea for several reasons: * it requires a reboot before taking effect, for people changing timezone's frequently (this is common if you travel a lot, especially annoying if you have several stop overs in different timezones and want your laptop's clock to be correct) * it is non-standard, so advice/guides that apply to other distro's will not apply to arch * it is non-standard, so gui tools like the ones found in KDE/GNOME will not be aware of the setting in rc.conf, and whatever change they do will be overwritten on next boot. * it is one of the few remaining blockers for ro /etc support in initscripts For these reasons (and possibly more), we deprecate TIMEZONE from rc.conf, and advice users and developers to clear it and set /etc/localtime directly. However, we do not remove the implementation from the scripts, so the timezone is still set during boot/shutdown if the variable is set. Signed-off-by: Tom Gundersen <teg(a)jklm.no> --- rc.conf | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/rc.conf b/rc.conf index 89ea27e..0fb6472 100644 --- a/rc.conf +++ b/rc.conf @@ -8,11 +8,13 @@ # # LOCALE: available languages can be listed with the 'locale -a' command # DAEMON_LOCALE: If set to 'yes', use $LOCALE as the locale during daemon # startup and during the boot process. If set to 'no', the C locale is used. # HARDWARECLOCK: set to "UTC" or "localtime", any other value will result # in the hardware clock being left untouched (useful for virtualization) # Note: Using "localtime" is discouraged. -# TIMEZONE: timezones are found in /usr/share/zoneinfo +# TIMEZONE: (DEPRECATED) copy timezone from /usr/share/zoneinfo to +# /etc/localtime instead # KEYMAP: keymaps are found in /usr/share/kbd/keymaps # CONSOLEFONT: found in /usr/share/kbd/consolefonts (only needed for non-US) # CONSOLEMAP: found in /usr/share/kbd/consoletrans @@ -22,7 +24,6 @@ LOCALE="en_US.UTF-8" DAEMON_LOCALE="no" HARDWARECLOCK="UTC" -TIMEZONE="Canada/Pacific" KEYMAP="us" CONSOLEFONT= CONSOLEMAP= -- 1.7.5.1

7 17

[arch-projects] [devtools] [PATCH] commitpkg: add -a option to upload only one arch
by Florian Pritz 16 May '11

16 May '11

-a i686 uploads only i686 packages and ignore everything else Signed-off-by: Florian Pritz <bluewind(a)server-speed.net> --- commitpkg | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/commitpkg b/commitpkg index 916bdfc..ea9468a 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] [commit message]' + abort 'usage: commitpkg <reponame> [-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] [commit message]' + abort 'usage: commitpkg <reponame> [-l limit] [-a arch] [commit message]' ;; esac @@ -103,6 +103,11 @@ if [ "$1" = '-l' ]; then shift 2 fi +if [ "$1" = "-a" ]; then + commit_arch=$2 + shift 2 +fi + echo -n 'committing changes to trunk...' if [ -n "$1" ]; then svn commit -q -m "upgpkg: $pkgbase $pkgver-$pkgrel @@ -115,6 +120,11 @@ echo 'done' declare -a uploads for _arch in ${arch[@]}; do + if [ "${_arch}" != "$commit_arch" ]; then + echo "skipping ${_arch}" + continue + fi + for _pkgname in ${pkgname[@]}; do fullver=$(get_full_version ${epoch:-0} $pkgver $pkgrel) pkgfile=$(getpkgfile "$_pkgname-$fullver-${_arch}".pkg.tar.?z 2>/dev/null) -- 1.7.5.1

1 2

[arch-projects] [PATCH] Change pacman calls with -Sd flags to -Sdd
by Jakob Gruber 16 May '11

16 May '11

The old pacman -d flag is now -dd since commit 111e07d0be44b7. Signed-off-by: Jakob Gruber <jakob.gruber(a)gmail.com> --- checkpkg | 2 +- mkarchroot | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checkpkg b/checkpkg index e669718..01c921e 100755 --- a/checkpkg +++ b/checkpkg @@ -47,7 +47,7 @@ for _pkgname in ${pkgname[@]}; do exit 1 fi - tmp=`pacman -Spd --noconfirm $_pkgname` + tmp=`pacman -Spdd --noconfirm $_pkgname` if [ $? -ne 0 ]; then echo "Couldn't download previous package for $_pkgname." diff --git a/mkarchroot b/mkarchroot index f385731..5b6be88 100755 --- a/mkarchroot +++ b/mkarchroot @@ -73,7 +73,7 @@ if [ -z "$cache_dir" ]; then fi if [ -f /etc/pacman.d/mirrorlist ]; then - host_mirror=$(pacman -Sdp extra/devtools 2>/dev/null | sed -E 's#(.*/)extra/os/.*#\1$repo/os/$arch#') + host_mirror=$(pacman -Sddp extra/devtools 2>/dev/null | sed -E 's#(.*/)extra/os/.*#\1$repo/os/$arch#') fi if [ -z "${host_mirror}" ]; then host_mirror='http://mirrors.kernel.org/archlinux/$repo/os/$arch' -- 1.7.5.1

3 3

[arch-projects] [PATCH] [mkinitcpio] Don't print success/failure result on same line
by Dan McGee 15 May '11

15 May '11

Doing the `echo -n` call causes the shell to line-buffer the output anyway, meaning one doesn't see the first part until 'SUCCESS' or 'FAILURE' is printed. This means the last message on the screen is 'Generating module dependencies' when in fact we are actually generating the image, which can take a lot of time when XZ, etc. are used. Print the status on two lines, ensuring buffering is not causing problems with out output. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- mkinitcpio | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mkinitcpio b/mkinitcpio index 31145d0..0ebf7c9 100755 --- a/mkinitcpio +++ b/mkinitcpio @@ -282,14 +282,14 @@ fi status=0 if [ -n "${GENIMG}" ]; then - echo -n ":: Generating image '${GENIMG}'..." + echo ":: Generating image '${GENIMG}'" shopt -s -o pipefail [ ${COMPRESSION} = "xz" ] && COMPRESSION_OPTIONS="${COMPRESSION_OPTIONS} --check=crc32" if ! /sbin/gen_init_cpio ${FILELIST} | ${COMPRESSION} ${COMPRESSION_OPTIONS} > "${GENIMG}"; then - echo "FAILED" + echo ":: Image generation FAILED" status=1 else - echo "SUCCESS" + echo ":: Image generation successful" status=0 fi -- 1.7.5.1

1 0

Re: [arch-projects] [udev][RFC][2/5] moving static nodes to udev-compat
by Tom Gundersen 15 May '11

15 May '11

On Sun, May 15, 2011 at 12:31 AM, Aaron Griffin <aaronmgriffin(a)gmail.com> wrote: > I was under the impression that some of these nodes are needed for > udev to start working. At least, back in the day, I know that console, > null, and zero needed to be created before udev started. If this is no > longer true, then I see no issues with making them go away. Unless > they're needed in early userspace before udev starts... but mkinitcpio > could always create those nodes. They used to be needed. However, with devtmpfs they are not. The essential ones (for early userspace) exist by default and the rest are created when udev is started. A quick test: delete /lib/udev/devices from your machine and notice that everything still works. A more thorough test: move /lib/udev/devices to /lib/udev/devcise.old (say) and reboot with init=/bin/bash (it would be best to do this with a self-compiled kernel that can boot without a initramfs to make sure nothing touches /dev at all). Now compare the contents of /dev with /lib/udev/devices.old. Cheers, Tom

2 2