July 2011 - Arch-projects - lists.archlinux.org

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository annotated tag 2011.07.1 created. 2011.07.1
by tomegun＠archlinux.org 25 Jul '11

25 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 annotated tag, 2011.07.1 has been created at 5004e3def1dc5116a4a5fea624ea5ce50caa3a07 (tag) tagging 895d0944e622aac9a9446e6f727dadd07370677c (commit) replaces 2011.06.3 tagged by Tom Gundersen on Mon Jul 25 21:32:01 2011 +0200 - Log ----------------------------------------------------------------- Changes to rc.conf ------------------ The VERBOSE parameter no longer has an effect, use the kernel's loglevel= parameter instead. Most people probably wants to pass 'quiet' to the kernel. If HARDWARECLOCK is empty we will read the value of UTC/LOCAL from hwclock's adjfile instead. To avoid interacting with the hardwareclock set HARDWARECLOCK="IGNORE". We now support (optionally) setting the broadcast address in the new network config. Behavioral changes ------------------ We no longer silence errors thrown by udev. In particular, if udevadm --settle times out, we get an error message. We no longer adjust the rtc on boot, as it is unreliable, we only make corrections for the timezone. We no longer mount /run as noexec. Misc changes ------------ Cleaning up of /tmp and friends is now done by an external tool. This tool is intended to allow pac kages to maintain {/var,}/run{/lock,} in the absense of rc scripts. General refactoring which should make maintenance and writing custom hooks easier. Andrwe Lord Weber (1): added get_pid() and ck_pidfile() (FS#18654) Dave Reisner (16): rc.sysinit: kill off VERBOSE= parameter rc.sysinit: allow exec in /run rc.d/rc.sysinit: whitespace cleanup use $() instead of `` for command substitutions add PATH, strip absolute path from binaries remove absolute paths from daemons and rc.d rc.sysinit: honor blacklist, not load_modules network: support gateway-less network setup rc.sysinit: avoid use of regex match for USE* vars network: don't enforce check for netmask or gateway rc.shutdown: continuation of fe48fab2c2c35c network: always warn about deprecation for old funcs network: don't warn for deprecation with no settings arch-tmpfiles: add new script to handle volatile file control arch-tmpfiles: check args, warn on invalid entries arch-tmpfiles: add cmdline parameters Eric Bélanger (3): Clean up ANSI codes from /var/log/boot Removed superfluous dollar sign Add logrotate config file to rotate /var/log/boot Gerardo Exequiel Pozzi (4): [initscripts] Avoid error message when switch runlevels. [initscripts] chmod dmesg.log based on value from dmesg_restrict Be consistent (with mkinitcpio) source naming of /run [initscripts] network: Add missing broadcast address Jacob Okamoto (1): rc.d: clear text formatting after error Kurt J. Bosch (68): Move fsck stuff into functions to allow custom overrides (FS#18736) Simplify fsck functions Allow custom fsck on shutdown via hook (FS#18736) Move mount -a into functions to allow custom override (fsck on loop) Fix hwclock comments Simplify timezone copying Simplify creating files by using /bin/install Simplify keyboard map loading by using loadkeys autodetection Simplify API filesystems mounting Some cosmetics Simplify rc.single udevadm stuff as in rc.sysinit Simplify unmounting filesystems rc.single: Avoid rc.multi syslog start error - use minilogd as in rc.sysinit Fix bootlogd not stopped when booting into runlevel '1' Simplify random seed file creation Some more cosmetics Simplify in_array function rc.sysinit/rc.single: Merge UDev stuff into a function rc.multi/rc.single: Merge duplicated bootlogd stop code into a function Get rid of simple if-constucts by using '&&' Simplify /etc/profile.d/locale.sh creation Fix whitespace functions: Fix indentation rc.sysinit: Fix writing to /dev/urandom rc.sysinit: Fix setting locale Fix '>|' not used allways when redirecting to files Fix local statements missing in ck_depends, ck_pidfile, do_unlock, kill_everything functions: Define $fsckret read-only because exposed to hook Add some comments functions: Simplify ck_depends() for statement functions: Simplify kill_everything() omit_pid handling Refactor to get rid of simple if-constucts rc.sysinit: Get rid of eval Move fsck executable check into fsck_all() for consistency Move activate_vgs and crypt stat_busy to the top for consistency functions: Make activate_vgs return 0 if noop for consistency Move export PATH into functions rc.sysinit: Refactor /etc/mtab symlink detection to avoid empty if clause rc.sysinit: Add status output for mtab and dmesg.log creation functions/rc.single: Clean up whitespace rc.sysinit: Fix stat_busy block indentation functions: Get rid of superfluous braces in udevd_modprobe() functions: Add missing quotes in mount_all() functions/rc.multi: Strip paths from binaries Refactor kill_everything, fsck_all and mount_all code rc.sysinit: Declare $FORCEFSCK read-only functions/rc.sysinit: Refactor fsck-redirection to prevent breakage rc.sysinit: Remove unneeded variables initializations functions: Make status() return the actual exit code functions: Speed up reboot/shutdown by recognizing killall5 exit code 2 netfs: cleanup whitespace netfs: Strip paths from binaries netfs: Refactor to provide meaningful exit code functions/netfs: Refactor filesystem type lists and $NETFS rc.sysinit: Simplify /var/run/daemons workaround rc.single: Remove $PATH assignment rc.sysinit: fixup fsck refactoring functions: Use ck_autostart in stop_all_daemons() functions: Make in_array() non DAEMONS specific rc.sysinit: Fix /tmp/.* pattern functions/rc.sysinit: Refactor 'Removing Leftover Files' code rc.single: Call remove_leftover() when going single-user functions: Remove useless '$' within '(( ))' functions: Unify whitespace inside '(( ))' Fix/unify quoting functions: Cosmetics: Refactor usage of local daemon variables rc.sysinit: Move 'run_hook sysinit_start' after mount root read-only rc.shutdown: Move 'run_hook shutdown_start' after "Initiating Shutdown..." Sebastien Luttringer (6): rc.d: Update usage rc.d: Add started/stopped option to list rc.d: Update bash and zsh completion scripts Ensure rc.d scripts are run as root Use _get_comp_words_by_ref in bash completion Remove usage of head in PKGBUILD Tom Gundersen (20): Merge remote-tracking branch 'falconindy/working' udev: don't silence settle + trivial hwclock: allow TZ to be set in adjtime, only adjust for TZ during boot hwclock: refactor daemon udev: remove rule generation Merge remote-tracking branch 'djgera/djgera' Merge branch 'snowman' hostname: echo to kernel directly Merge remote-tracking branch 'djgera/djgera' Merge remote-tracking branch 'seblu/master' status: adjust number of columns after loading modules Merge remote-tracking branch 'falconindy/working' functions: warn if daemons are started recursively trivial: silence errors hwclock: use correct timezone hwclock: show status Merge remote-tracking branch 'seblu/master' Merge remote-tracking branch 'seblu/master' Merge remote-tracking branch 'kujub/master' network: reword depracation message derhoch (1): changing _rd.d to _rc_d to avoid: jofko (1): Adding hook sysinit_postmount ----------------------------------------------------------------------- hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch master updated. 2011.07.1
by tomegun＠archlinux.org 25 Jul '11

25 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 895d0944e622aac9a9446e6f727dadd07370677c (commit) via 370dd6573143fb9b9a7d368badbd3f2bb40ad6cf (commit) via 7e39dc717edd4690772059ad4d5a7550dbf65019 (commit) from 97f84c28e969920cac8700fe6d12c51aca32d257 (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 895d0944e622aac9a9446e6f727dadd07370677c Author: Tom Gundersen <teg(a)jklm.no> Date: Mon Jul 25 21:31:19 2011 +0200 network: reword depracation message Make it clear that the message refers to network settings, as some users found this confusing. Signed-off-by: Tom Gundersen <teg(a)jklm.no> commit 370dd6573143fb9b9a7d368badbd3f2bb40ad6cf Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Jul 24 15:04:36 2011 -0400 arch-tmpfiles: add cmdline parameters Categorize actions as 'create' or 'remove', for finer control. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 7e39dc717edd4690772059ad4d5a7550dbf65019 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Jul 24 11:05:36 2011 -0400 arch-tmpfiles: check args, warn on invalid entries Introduces the checkparams functions, which thoroughly checks arguments for presence, length, and some amount of data validation. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: arch-tmpfiles | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++------ functions | 2 +- network | 2 +- tmpfiles.conf | 18 ++++---- 4 files changed, 117 insertions(+), 23 deletions(-) hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [dbscripts] [PATCH 1/2] Make tests much more portable and usable
by Dan McGee 25 Jul '11

25 Jul '11

Using 'sudo' in a test? Not on my machine, I don't care how secure it should be, it is totally unnecessary, not to mention the annoyance of password prompts, needing the chroot setups, etc. Instead, use makepkg directly along with some very vanilla makepkg.conf config files to do the work. This makes for a more reproducable environment as far as makepkg settings goes. Also adjust the package building code in common.inc to be a bit more straightforward. Remove the need for three seperate loops, and only ever copy packages in one direction (from the local test directory to the /dev/shm/ staging area). With these changes, I didn't have too many problems running the test suite locally on my box after cloning the repository. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- test/lib/common.inc | 54 ++++++++++++++++++++------------------- test/lib/makepkg.i686.conf | 10 +++++++ test/lib/makepkg.x86_64.conf | 10 +++++++ test/test.d/db-update.sh | 6 +++- test/test.d/pool-transition.sh | 3 +- test/test.d/testing2x.sh | 3 +- 6 files changed, 56 insertions(+), 30 deletions(-) create mode 100644 test/lib/makepkg.i686.conf create mode 100644 test/lib/makepkg.x86_64.conf diff --git a/test/lib/common.inc b/test/lib/common.inc index eb46508..a2ba1e0 100644 --- a/test/lib/common.inc +++ b/test/lib/common.inc @@ -10,39 +10,39 @@ oneTimeSetUp() { local pkgname local pkgarch local pkgversion - local build + origindir="$(dirname ${BASH_SOURCE[0]})/../packages" pkgdir="$(mktemp -d /dev/shm/$(basename $0).XXXXXXXXXX)" - cp -Lr $(dirname ${BASH_SOURCE[0]})/../packages/* "${pkgdir}" - msg 'Building packages...' - for d in "${pkgdir}"/*; do - pushd $d >/dev/null - pkgname=($(. PKGBUILD; echo ${pkgname[@]})) - pkgarch=($(. PKGBUILD; echo ${arch[@]})) - pkgversion=$(. PKGBUILD; echo $(get_full_version ${epoch:-0} ${pkgver} ${pkgrel})) - - build=true - for a in ${pkgarch[@]}; do - for p in ${pkgname[@]}; do - [ ! -f ${p}-${pkgversion}-${a}${PKGEXT} ] && build=false - done - done - if ! ${build}; then + if [ -f ${origindir}/packages-built ]; then + msg 'Using existing packages.' + else + msg 'Building packages...' + for d in "${origindir}"/*; do + pushd $d >/dev/null + pkgname=($(. PKGBUILD; echo ${pkgname[@]})) + pkgarch=($(. PKGBUILD; echo ${arch[@]})) + pkgversion=$(. PKGBUILD; echo $(get_full_version ${epoch:-0} ${pkgver} ${pkgrel})) + + PKGDEST=$(pwd) + export PKGDEST + echo $PKGDEST if [ "${pkgarch[0]}" == 'any' ]; then - sudo extra-x86_64-build || die 'extra-x86_64-build failed' + MAKEPKG_CONF="$(dirname ${BASH_SOURCE[0]})/makepkg.i686.conf" + makepkg --force --config "$MAKEPKG_CONF" else for a in ${pkgarch[@]}; do - sudo extra-${a}-build || die "extra-${a}-build failed" + MAKEPKG_CONF="$(dirname ${BASH_SOURCE[0]})/makepkg.$a.conf" + makepkg --force --config "$MAKEPKG_CONF" done fi - for a in ${pkgarch[@]}; do - for p in ${pkgname[@]}; do - cp ${p}-${pkgversion}-${a}${PKGEXT} $(dirname ${BASH_SOURCE[0]})/../packages/$(basename ${d}) - done - done - fi - popd >/dev/null - done + popd >/dev/null + done + + touch ${origindir}/packages-built + fi + + cp -Lr "${origindir}"/* "${pkgdir}" + rm "${pkgdir}"/packages-built } oneTimeTearDown() { @@ -229,3 +229,5 @@ checkRemovedAnyPackage() { [ -d "${TMP}/svn-packages-copy/${pkgbase}/repos/${repo}-any" ] \ && fail "svn-packages-copy/${pkgbase}/repos/${repo}-any should not exist" } + +# vim: syntax=sh: diff --git a/test/lib/makepkg.i686.conf b/test/lib/makepkg.i686.conf new file mode 100644 index 0000000..6fae31e --- /dev/null +++ b/test/lib/makepkg.i686.conf @@ -0,0 +1,10 @@ +# /etc/makepkg.conf + +CARCH="i686" + +BUILDENV=(fakeroot !distcc color !ccache check !sign) +OPTIONS=(strip docs libtool emptydirs zipman purge) + +INTEGRITY_CHECK=(md5) +PKGEXT='.pkg.tar.xz' +SRCEXT='.src.tar.gz' diff --git a/test/lib/makepkg.x86_64.conf b/test/lib/makepkg.x86_64.conf new file mode 100644 index 0000000..cdee1d7 --- /dev/null +++ b/test/lib/makepkg.x86_64.conf @@ -0,0 +1,10 @@ +# /etc/makepkg.conf + +CARCH="x86_64" + +BUILDENV=(fakeroot !distcc color !ccache check !sign) +OPTIONS=(strip docs libtool emptydirs zipman purge) + +INTEGRITY_CHECK=(md5) +PKGEXT='.pkg.tar.xz' +SRCEXT='.src.tar.gz' diff --git a/test/test.d/db-update.sh b/test/test.d/db-update.sh index e38c328..5db276b 100755 --- a/test/test.d/db-update.sh +++ b/test/test.d/db-update.sh @@ -82,7 +82,8 @@ testUpdateAnyPackage() { pushd "${TMP}/svn-packages-copy/pkg-any-a/trunk/" >/dev/null sed 's/pkgrel=1/pkgrel=2/g' -i PKGBUILD svn commit -q -m"update pkg to pkgrel=2" >/dev/null - sudo extra-i686-build >/dev/null 2>&1 + MAKEPKG_CONF="${curdir}/../lib/makepkg.i686.conf" + makepkg --force --config "$MAKEPKG_CONF" mv pkg-any-a-1-2-any.pkg.tar.xz "${pkgdir}/pkg-any-a/" popd >/dev/null @@ -100,7 +101,8 @@ testUpdateAnyPackageToDifferentRepositoriesAtOnce() { pushd "${TMP}/svn-packages-copy/pkg-any-a/trunk/" >/dev/null sed 's/pkgrel=1/pkgrel=2/g' -i PKGBUILD svn commit -q -m"update pkg to pkgrel=2" >/dev/null - sudo extra-i686-build >/dev/null 2>&1 + MAKEPKG_CONF="${curdir}/../lib/makepkg.i686.conf" + makepkg --force --config "$MAKEPKG_CONF" mv pkg-any-a-1-2-any.pkg.tar.xz "${pkgdir}/pkg-any-a/" popd >/dev/null diff --git a/test/test.d/pool-transition.sh b/test/test.d/pool-transition.sh index 5873f00..545c2a5 100755 --- a/test/test.d/pool-transition.sh +++ b/test/test.d/pool-transition.sh @@ -63,7 +63,8 @@ testUpdateAnyPackageWithoutPool() { pushd "${TMP}/svn-packages-copy/${pkgname}/trunk/" >/dev/null sed 's/pkgrel=1/pkgrel=2/g' -i PKGBUILD svn commit -q -m"update pkg to pkgrel=2" >/dev/null - sudo extra-i686-build >/dev/null 2>&1 + MAKEPKG_CONF="${curdir}/../lib/makepkg.i686.conf" + makepkg --force --config "$MAKEPKG_CONF" mv "${pkg2}" "${pkgdir}/${pkgname}/" popd >/dev/null diff --git a/test/test.d/testing2x.sh b/test/test.d/testing2x.sh index eda6cd6..bcc1b9d 100755 --- a/test/test.d/testing2x.sh +++ b/test/test.d/testing2x.sh @@ -10,7 +10,8 @@ testTesting2xAnyPackage() { pushd "${TMP}/svn-packages-copy/pkg-any-a/trunk/" >/dev/null sed 's/pkgrel=1/pkgrel=2/g' -i PKGBUILD svn commit -q -m"update pkg to pkgrel=2" >/dev/null - sudo extra-i686-build >/dev/null 2>&1 + MAKEPKG_CONF="${curdir}/../lib/makepkg.i686.conf" + makepkg --force --config "$MAKEPKG_CONF" mv pkg-any-a-1-2-any.pkg.tar.xz "${pkgdir}/pkg-any-a/" popd >/dev/null -- 1.7.6

3 3

[arch-projects] [devtools] [PATCH] makechrootpkg: support absolute paths for chroot copy
by Florian Pritz 25 Jul '11

25 Jul '11

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- makechrootpkg | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/makechrootpkg b/makechrootpkg index 90c60c5..52071c2 100755 --- a/makechrootpkg +++ b/makechrootpkg @@ -74,8 +74,12 @@ done # Canonicalize chrootdir, getting rid of trailing / chrootdir=$(readlink -e "$chrootdir") -[[ -z $copy ]] && copy=$default_copy -copydir="$chrootdir/$copy" +if [[ ${copy:0:1} = "/" ]]; then + copydir=$copy +else + [[ -z $copy ]] && copy=$default_copy + copydir="$chrootdir/$copy" +fi # Pass all arguments after -- right to makepkg MAKEPKG_ARGS="$MAKEPKG_ARGS ${*:$OPTIND}" -- 1.7.6

1 0

[arch-projects] [devtools] [PATCH 1/2] archrelease: add repos/ directory if it doesn't exist
by Dan McGee 25 Jul '11

25 Jul '11

Very easy thing to forget when creating a new package, but easy enough to check for and add automatically. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- archrelease | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/archrelease b/archrelease index 8ea718c..baaf6cf 100755 --- a/archrelease +++ b/archrelease @@ -29,6 +29,10 @@ if [ -d "repos/${1}" ]; then svn rm --force -q "repos/${1}" svn commit -q -m "archrelease: remove ${1}" || abort fi +if [ ! -d repos ]; then + mkdir repos + svn add repos +fi svn copy -q -r HEAD "${trunk}" "repos/${1}" svn commit -q -m "archrelease: copy ${trunk} to ${1}" || abort popd >/dev/null -- 1.7.6

3 4

[arch-projects] [PATCH] [devtools] Edit /etc/locale.gen instead of overwrite.
by Gerardo Exequiel Pozzi 25 Jul '11

25 Jul '11

I need this for archiso, instead of maintaining a private copy. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- mkarchroot | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/mkarchroot b/mkarchroot index f385731..7a7fbbe 100755 --- a/mkarchroot +++ b/mkarchroot @@ -220,7 +220,7 @@ else fi if [ -e "${working_dir}/etc/locale.gen" ]; then - echo -e 'en_US.UTF-8 UTF-8\nde_DE.UTF-8 UTF-8' > "${working_dir}/etc/locale.gen" + sed -i 's@^#$en_US\|de_DE$$\.UTF-8$@\1\2@' "${working_dir}/etc/locale.gen" chroot "${working_dir}" locale-gen fi -- 1.7.5.2

3 2

[arch-projects] [devtools][PATCH] add -n option to community/archco to create new packages
by Florian Pritz 24 Jul '11

24 Jul '11

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- Makefile | 2 +- archco | 41 +++++++++++++++++++++++++++++++++++++++-- communityco | 10 ---------- 3 files changed, 40 insertions(+), 13 deletions(-) delete mode 100755 communityco diff --git a/Makefile b/Makefile index 8772bc0..27cefba 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,6 @@ BINPROGS = \ checkpkg \ commitpkg \ archco \ - communityco \ archrelease \ archrm \ archbuild \ @@ -57,6 +56,7 @@ install: install -m0644 ${CONFIGFILES} $(DESTDIR)/usr/share/devtools for l in ${COMMITPKG_LINKS}; do ln -sf commitpkg $(DESTDIR)/usr/bin/$$l; done for l in ${ARCHBUILD_LINKS}; do ln -sf archbuild $(DESTDIR)/usr/bin/$$l; done + ln -sf archco $(DESTDIR)/usr/bin/communityco install -Dm0644 bash_completion $(DESTDIR)/etc/bash_completion.d/devtools uninstall: diff --git a/archco b/archco index 5fc9ebe..098cf31 100755 --- a/archco +++ b/archco @@ -1,10 +1,47 @@ #!/bin/bash +scriptname=${0##*/} +CREATE= +STARTDIR=$PWD + if [ "$1" = '' ]; then - echo 'Usage: archco <package name> [<package name>]' + echo 'Usage: '$scriptname' [options] <package name> [<package name>]' + echo "Options:" + echo " -n create new packages and check them out" exit 1 fi +case $scriptname in + archco) + SVNURL="svn+ssh://gerolde.archlinux.org/srv/svn-packages";; + communityco) + SVNURL="svn+ssh://aur.archlinux.org/srv/svn-packages";; + *) + echo "error: couldn't find svn url for $scriptname" + exit 1 + ;; +esac + +if [[ $1 = "-n" ]]; then + CREATE=1 + shift + + TMPDIR=$(mktemp -d /tmp/$scripname.XXXXXXXX) + trap "rm -rf $TMPDIR" EXIT INT TERM + + cd $TMPDIR + svn checkout -N "$SVNURL" svn + +fi + for i in "$@"; do - svn co svn+ssh://gerolde.archlinux.org/srv/svn-packages/$i + if (($CREATE)); then + cd $TMPDIR/svn + mkdir -p "$i/"{repos,trunk} + svn add "$i" + svn commit -m "add new package: $i" + cd $STARTDIR + fi + + svn co "$SVNURL/$i" done diff --git a/communityco b/communityco deleted file mode 100755 index 0909db1..0000000 --- a/communityco +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ "$1" = '' ]; then - echo 'Usage: communityco <package name> [<package name>]' - exit 1 -fi - -for i in "$@"; do - svn co svn+ssh://aur.archlinux.org/srv/svn-packages/$i -done -- 1.7.6

1 0

[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