- Arch-projects - lists.archlinux.org

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch master updated. 2011.06.3-118-g97f84c2
by tomegun＠archlinux.org 24 Jul '11

24 Jul '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 97f84c28e969920cac8700fe6d12c51aca32d257 (commit) via e6c21e612838581c53c7742eb6071697f2d9e5a3 (commit) via a4a47cfb5b97ddbf771959f1744c81167bc6b6f7 (commit) from 1f358f911a0237f4224169c4d225a9ae306e0853 (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 97f84c28e969920cac8700fe6d12c51aca32d257 Merge: e6c21e6 a4a47cf Author: Tom Gundersen <teg(a)jklm.no> Date: Sun Jul 24 16:33:47 2011 +0200 Merge remote-tracking branch 'kujub/master' commit e6c21e612838581c53c7742eb6071697f2d9e5a3 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Jul 23 22:21:35 2011 -0400 arch-tmpfiles: add new script to handle volatile file control This is the same concept as systemd's tmpfiles handling, slightly simplified to avoid timed re-triggering of file cleaning. Most of our current file cleaning that takes place in rc.single and rc.sysinit is replaced by this, with the exception that we hold onto the /var/lock and /var/run for finer control, since we still check for the possibility of these directories being symlinks and adjust accordingly. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit a4a47cfb5b97ddbf771959f1744c81167bc6b6f7 Author: Kurt J. Bosch <kjb-temp-2009(a)alpenjodel.de> Date: Fri Jul 22 08:07:49 2011 +0200 rc.shutdown: Move 'run_hook shutdown_start' after "Initiating Shutdown..." Rationale Avoid printing any start hook status messages above the head line. ----------------------------------------------------------------------- Summary of changes: Makefile | 13 ++++- arch-tmpfiles | 156 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ functions | 7 +-- rc.shutdown | 4 +- tmpfiles.conf | 20 +++++++ 5 files changed, 192 insertions(+), 8 deletions(-) create mode 100755 arch-tmpfiles create mode 100644 tmpfiles.conf hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [initscripts][PATCH] arch-tmpfiles: add new script to handle volatile file control
by Dave Reisner 24 Jul '11

24 Jul '11

This is the same concept as systemd's tmpfiles handling, slightly simplified to avoid timed re-triggering of file cleaning. Most of our current file cleaning that takes place in rc.single and rc.sysinit is replaced by this, with the exception that we hold onto the /var/lock and /var/run for finer control, since we still check for the possibility of these directories being symlinks and adjust accordingly. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- Tom and I talked about this tonight and I volunteered to hack it up. It's a simple but fairly substantial framework for handling temporary files and directories which is compatible with systemd. For more detail, see the man page[1], but I've taken most of the relevant bits and added them to the main tmpfiles script as documentation. It should be fairly self explanatory. [1] http://0pointer.de/public/systemd-man/tmpfiles.d.html Makefile | 13 ++++- arch-tmpfiles | 156 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ functions | 6 +-- tmpfiles.conf | 20 +++++++ 4 files changed, 190 insertions(+), 5 deletions(-) create mode 100755 arch-tmpfiles create mode 100644 tmpfiles.conf diff --git a/Makefile b/Makefile index c568b13..9fd2347 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,14 @@ VER := $(shell git describe) -DIRS := /etc/rc.d /etc/conf.d /etc/rc.d/functions.d /etc/logrotate.d /sbin /etc/bash_completion.d /usr/share/zsh/site-functions +DIRS := \ + /etc/rc.d \ + /etc/conf.d \ + /etc/rc.d/functions.d \ + /etc/logrotate.d \ + /sbin \ + /usr/lib/tmpfiles.d \ + /usr/lib/initscripts \ + /etc/bash_completion.d \ + /usr/share/zsh/site-functions minilogd: minilogd.o @@ -13,6 +22,8 @@ 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 + install -m755 -t $(DESTDIR)/usr/lib/initscripts arch-tmpfiles + install -m644 tmpfiles.conf $(DESTDIR)/usr/lib/tmpfiles.d/arch.conf install -m644 -T bash-completion $(DESTDIR)/etc/bash_completion.d/rc.d install -m644 -T zsh-completion $(DESTDIR)/usr/share/zsh/site-functions/_rc.d diff --git a/arch-tmpfiles b/arch-tmpfiles new file mode 100755 index 0000000..194a44b --- /dev/null +++ b/arch-tmpfiles @@ -0,0 +1,156 @@ +#!/bin/bash +# +# /usr/lib/initscripts/tmpfiles +# +# Control of creation, deletion, and cleaning of volatile and temporary files +# + +_f() { + # Create a file if it doesn't exist yet + local path=$1 mode=$2 uid=$3 gid=$4 + + if [[ ! -e $path ]]; then + install -m"$mode" -o"$uid" -g"$gid" <(:) "$path" + fi +} + +_F() { + # Create or truncate a file + local path=$1 mode=$2 uid=$3 gid=$4 + + install -m"$mode" -o"$uid" -g"$gid" <(:) "$path" +} + +_d() { + # Create a directory if it doesn't exist yet + local path=$1 mode=$2 uid=$3 gid=$4 + + if [[ ! -d "$path" ]]; then + install -d -m"$mode" -o"$uid" -g"$gid" "$path" + fi +} + +_D() { + # Create or empty a directory + local path=$1 mode=$2 uid=$3 gid=$4 + + if [[ -d $path ]]; then + ( + shopt -s dotglob + rm --one-file-system -rf "$path"/* + ) + fi + install -d -m"$mode" -o"$uid" -g"$gid" "$path" +} + +_p() { + # Create a named pipe (FIFO) if it doesn't exist yet + local path=$1 mode=$2 uid=$3 gid=$4 + + if [[ ! -p "$path" ]]; then + mkfifo -m$mode "$path" + chown "$uid:$gid" "$path" + fi +} + +_x() { + # Ignore a path during cleaning. Use this type to exclude paths from clean-up as + # controlled with the Age parameter. Note that lines of this type do not + # influence the effect of r or R lines. Lines of this type accept shell-style + # globs in place of of normal path names. + : + # XXX: we don't implement this +} + +_r() { + # Remove a file or directory if it exists. This may not be used to remove + # non-empty directories, use R for that. Lines of this type accept shell-style + # globs in place of normal path names. + local -a paths=($1) + + for path in "${paths[@]}"; do + if [[ -f $path ]]; then + rm -f "$path" + elif [[ -d $path ]]; then + rmdir "$path" + fi + done +} + +_R() { + # Recursively remove a path and all its subdirectories (if it is a directory). + # Lines of this type accept shell-style globs in place of normal path names. + local -a paths=($1) + + for path in "${paths[@]}"; do + [[ -d $path ]] && rm -rf --one-file-system "$path" + done +} + +shopt -s nullglob + +# catch errors in functions so we can exit with something meaningfully +set -E +trap '(( ++error ))' ERR + +declare -i error=0 +declare -A fragments +declare -a tmpfiles_d=( + /usr/lib/tmpfiles.d/*.conf + /etc/tmpfiles.d/*.conf + /run/tmpfiles.d/*.conf +) + +# directories declared later in the tmpfiles_d array will override earlier +# directories, on a per file basis. +# Example: `/etc/tmpfiles.d/foo.conf' supersedes `/usr/lib/tmpfiles.d/foo.conf'. +for path in "${tmpfiles_d[@]}"; do + fragments[${path##*/}]=${path%/*} +done + +# loop through the gathered fragments, sorted globally by filename +while read -d '' fragment; do + declare -i i=0 + + printf -v file '%s/%s' "${fragments[$fragment]}" "$fragment" + + ### FILE FORMAT ### + # XXX: We ignore the final 'Age' parameter + # 0 1 2 3 4 5 + # Type Path Mode UID GID Age + # d /run/user 0755 root root 10d + + # omit read's -r flag to honor escapes here, so that whitespace can be + # escaped for paths. We will _not_ honor quoted paths. + while read -a line; do + (( ++i )) + + # skip over comments and empty lines + if (( ! ${#line[*]} )) || [[ ${line[0]:0:1} = '#' ]]; then + continue + fi + + # whine about invalid entries + if ! type -t _${line[0]} >/dev/null; then + printf "arch-tmpfiles: skipping malformed entry on line %d of \`%s'\n" "$i" "$file" + (( ++error )) + continue + fi + + # fall back on defaults when parameters are passed as '-' + if [[ ${line[2]} = '-' ]]; then + case ${line[0]} in + p|f|F) line[2]=0644 ;; + d|D) line[2]=0755 ;; + esac + fi + [[ ${line[3]} = '-' ]] && line[3]=0 + [[ ${line[4]} = '-' ]] && line[4]=0 + + _${line[0]} "${line[@]:1}" + done <"$file" +done < <(printf '%s\0' "${!fragments[@]}" | sort -z) + +exit $error + +# vim: set ts=2 sw=2 noet: diff --git a/functions b/functions index 1cfcf28..a894a46 100644 --- a/functions +++ b/functions @@ -420,15 +420,13 @@ mount_all() { remove_leftover() { stat_busy "Removing Leftover Files" - rm -rf /etc/{nologin,shutdownpid} /forcefsck /tmp/* /tmp/.[^.]* /tmp/..?* /var/run/daemons + # handle this separately until we declare the non-symlinks obsoleted [[ ! -L /var/lock ]] && rm -rf /var/lock/* if [[ ! -L /var/run && -d /var/run ]]; then find /var/run/ \! -type d -delete ln -s /run/daemons /var/run/daemons fi - install -Tm 0664 -o root -g utmp <(:) /var/run/utmp - # Keep {x,k,g}dm happy with xorg - mkdir -m 1777 /tmp/.{X11,ICE}-unix + /usr/lib/initscripts/arch-tmpfiles || stat_fail stat_done } diff --git a/tmpfiles.conf b/tmpfiles.conf new file mode 100644 index 0000000..d47a028 --- /dev/null +++ b/tmpfiles.conf @@ -0,0 +1,20 @@ +# +# /usr/lib/tmpfiles.d/arch.conf +# + +d /tmp/.X11-unix 1777 root root 10d +d /tmp/.ICE-unix 1777 root root 10d +d /tmp/.XIM-unix 1777 root root 10d +d /tmp/.font-unix 1777 root root 10d +d /tmp/.Test-unix 1777 root root 10d + +f /var/run/tmp 0664 - utmp + +r /tmp/.X[0-9]-lock +r /etc/nologin +r /etc/shutdownpid +r /forcefsck + +D /tmp/ +D /var/run/daemons + -- 1.7.6

2 2

[arch-projects] [PATCH] shutdown: add a shutdown hook
by Tom Gundersen 23 Jul '11

23 Jul '11

Enabling the shutdown hook and using systemd v31 (which is yet to be released), means that on shutdown the root will be pivoted to /run/initramfs, from where the rootfs and all its submonuts (such as /usr) are unmounted cleanly. The same functionality will be supported in a future release of initscript. A natural next step is to add an "/usr"-hook, which mounts the /usr partition (if it exists) in the initramfs, so initscripts (and systemd) can always rely on it being mounted, and we no longer need to move some binaries/libraries to /bin, /sbin and /lib (as this does not work well at the moment). One might argue that this functionality does not beling in mkinitrd. The reason I propose it for inclusion here is: - it is independent of initscripts, so does not really belong there either. - in the future one might imagine extending this to integrate more tightly with the rest of the initramfs (e.g. store state/logs in /run/initramfs to ease debugging, or add shutdown-hooks, to go with the boot-hooks, to gracefully tear down things such as dm or nfs mounts at shutdown). - by behaving like dracut, integrating with systemd became trivial, and IMHO there is no point in systemd/initscripts/dracut/mkinitrd differing at the interface level. v2: copy the needed libraries to the new ramfs Signed-off-by: Tom Gundersen <teg(a)jklm.no> --- Makefile | 1 + hooks/shutdown | 16 ++++++++++++++++ install/shutdown | 19 +++++++++++++++++++ shutdown | 10 ++++++++++ 4 files changed, 46 insertions(+), 0 deletions(-) create mode 100644 hooks/shutdown create mode 100644 install/shutdown create mode 100644 shutdown diff --git a/Makefile b/Makefile index 18df47f..d4bb4e1 100644 --- a/Makefile +++ b/Makefile @@ -35,6 +35,7 @@ install: all chmod 755 ${DESTDIR}/bin/lsinitcpio ${DESTDIR}/sbin/mkinitcpio install -m644 mkinitcpio.conf ${DESTDIR}/etc/mkinitcpio.conf + install -m755 -t ${DESTDIR}/lib/initcpio/shutdown shutdown install -m755 -t ${DESTDIR}/lib/initcpio init install -m644 -t ${DESTDIR}/lib/initcpio init_functions functions install -m644 01-memdisk.rules ${DESTDIR}/lib/initcpio/udev/01-memdisk.rules diff --git a/hooks/shutdown b/hooks/shutdown new file mode 100644 index 0000000..6291a30 --- /dev/null +++ b/hooks/shutdown @@ -0,0 +1,16 @@ +# vim: set ft=sh: +run_hook () +{ + msg -n ":: Creating shutdown ramfs..." + mkdir -p /run/initramfs/usr/bin + mkdir -p /run/initramfs/usr/sbin + mkdir -p /run/initramfs/bin + mkdir -p /run/initramfs/sbin + mkdir -p /run/initramfs/lib + cp /bin/busybox /run/initramfs/bin/ + cp /lib/ld-linux-x86-64.so.2 /run/initramfs/lib/ + cp /lib/libc.so.6 /run/initramfs/lib/ + + chroot /run/initramfs /bin/busybox --install + cp /shutdown /run/initramfs/ +} diff --git a/install/shutdown b/install/shutdown new file mode 100644 index 0000000..9f8076b --- /dev/null +++ b/install/shutdown @@ -0,0 +1,19 @@ +# vim:set ft=sh: + +build() +{ + MODULES="" + BINARIES="" + FILES="" + SCRIPT="shutdown" + add_binary /lib/initcpio/shutdown /shutdown +} + +help () +{ +cat <<HELPEOF + This hook will create a shutdown initrd in /run/mkinitramfs + that we can pivot to on shutdown in order to unmount / + (and any submounts such as /usr) cleanly. +HELPEOF +} diff --git a/shutdown b/shutdown new file mode 100644 index 0000000..a55975f --- /dev/null +++ b/shutdown @@ -0,0 +1,10 @@ +#!/bin/sh +# shutdown + +# unmount everything that was mounted on the old root +umount `mount | awk '{ print $3 }' | grep "^/oldroot" | sort -r` + +# reboot / poweroff / halt, depending on the argument passed by init +[ "$1" = "reboot" ] && reboot -f +[ "$1" = "poweroff" ] && poweroff -f +[ "$1" = "halt" ] && halt -f -- 1.7.6

3 5

[arch-projects] [PATCH 00/13] minor features and bugfixes
by Dave Reisner 23 Jul '11

23 Jul '11

This is a bunch of nitpicks, but there are a few new features thrown in. Annotations along the way... Dave Reisner (13): install/consolefont: cleanup and refactor keymap/consolefont: source rc.conf properly from $BASEDIR keymap: simplify unicode detection cleanup and bashify install hooks functions: allow ignoring errors on module addition ensure local scoping of variables base: remove superfluous leading / functions: refactor get_{base,dir}name init: support breaks before and after mounting root mkinitcpio: simplify setting of SKIPHOOKS mkinitcpio: remove extra newline in errmsg init: allow /run to be mounted with exec perms add -A option for adding hooks during build functions | 47 +++++++++---- hooks/keymap | 11 +-- init | 11 ++- install/base | 4 +- install/btrfs | 15 ++-- install/consolefont | 56 ++++++++------- install/dsdt | 21 ++---- install/filesystems | 2 +- install/fw | 29 +++----- install/ide | 30 +++----- install/keymap | 24 ++++--- install/memdisk | 19 +++--- install/net | 195 +++++++++++++++++++++++++-------------------------- install/pata | 4 +- install/pcmcia | 29 ++++---- install/resume | 19 ++--- install/sata | 4 +- install/scsi | 4 +- install/sleep | 27 +++---- install/udev | 33 ++++----- install/usb | 32 ++++----- install/usbinput | 30 +++----- mkinitcpio | 21 +++--- mkinitcpio.5.txt | 5 ++ 24 files changed, 327 insertions(+), 345 deletions(-) -- 1.7.6

2 15

[arch-projects] [mkinitcpio] [PATCH 0/6] Bashify and simplify install/consolefont
by Kurt J. Bosch 23 Jul '11

23 Jul '11

I stumbled over this today and as always couldn't resist to fix it regardless the fact it was only slightly broken. ;-) https://github.com/kujub/mkinitcpio Kurt J. Bosch (6): install/consolefont: Correct whitespace install/consolefont: Bashify install script install/consolefont: Get rid of grep and eval install/consolefont: Fix quoting install/consolefont: Refactor for simplification install/consolefont: Use error() instead of echo install/consolefont | 42 +++++++++++++++++++----------------------- 1 files changed, 19 insertions(+), 23 deletions(-)

1 7

[arch-projects] [devtools] Install a package in the chroot without confirm
by Andrea Scarpino 22 Jul '11

22 Jul '11

Currently `makechrootpkg -r $chroot -I $pkg` calls pacman in the chroot without --noconfirm, I guess there is no need to ask for a confirm because you are explicitly calling makechrootpkg with the install option. Patch add the --noconfirm option to `pacman -U` -- Andrea

1 0

[arch-projects] [mkinitramfs] add a shutdown hook
by Tom Gundersen 22 Jul '11

22 Jul '11

The following patch adds a shutdown hook, which allows us to unmount root and all its submounts cleanly.

3 9

[arch-projects] [initscripts] [PATCH] rc.shutdown: Move 'run_hook shutdown_start' after "Initiating Shutdown..."
by Kurt J. Bosch 22 Jul '11

22 Jul '11

Rationale Avoid printing any start hook status messages above the head line. --- rc.shutdown | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rc.shutdown b/rc.shutdown index ed87eec..ebfc22c 100755 --- a/rc.shutdown +++ b/rc.shutdown @@ -6,8 +6,6 @@ . /etc/rc.conf . /etc/rc.d/functions -run_hook shutdown_start - # avoid staircase effect stty onlcr @@ -15,6 +13,8 @@ echo " " printhl "Initiating Shutdown..." echo " " +run_hook shutdown_start + [[ -x /etc/rc.local.shutdown ]] && /etc/rc.local.shutdown stop_all_daemons -- 1.7.1

1 0

[arch-projects] [PATCH] Error on unknown daemon in DAEMONS array
by Dan McGee 18 Jul '11

18 Jul '11

We silently skip the starting of unknown entries in DAEMONS rather than give any sort of feedback to the user. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- functions | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/functions b/functions index 1cfcf28..56d1689 100644 --- a/functions +++ b/functions @@ -204,7 +204,11 @@ ck_autostart() { } start_daemon() { - have_daemon "$1" && /etc/rc.d/"$1" start + if [ have_daemon "$1" ]; then + /etc/rc.d/"$1" start + else + printf "${C_FAIL}Warning:${C_CLEAR} Daemon named \'$1\' was not found.\n" + fi } # Never use this function, it causes daemons to be stoped in the wrong order. @@ -218,7 +222,11 @@ ck_depends() { start_daemon_bkgd() { stat_bkgd "Starting $1" - have_daemon "$1" && (start_daemon "$1") &>/dev/null & + if [ have_daemon "$1" ]; then + (/etc/rc.d/"$1" start) &>/dev/null & + else + printf "${C_FAIL}Warning:${C_CLEAR} Daemon named \'$1\' was not found.\n" + fi } stop_daemon() { -- 1.7.6

3 2

[arch-projects] [initscripts] next release
by Tom Gundersen 17 Jul '11

17 Jul '11

Hi guys, Just a heads up that I intend to release a new version of initscripts in the not too distant future. I'll wait for udev 173 to have been in [core] for a bit just to make any bug hunting simpler. If you have any bug bug fixes, please speak up. I'll not merge any cleanups or features until after the release. Cheers, Tom

1 0