- Arch-projects - lists.archlinux.org

[arch-projects] [PATCH] Check java packages dependency on java-runtime-headless
by Guillaume ALAUX 04 Jun '12

04 Jun '12

Java packages should be checked against java-runtime-headless rather than the whole java-environment as most of them will only need the 'java' binary instead of the whole 'javac' & Al. stuff. Signed-off-by: Guillaume ALAUX <guillaume(a)archlinux.org> --- Namcap/rules/javafiles.py | 4 ++-- namcap-tags | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Namcap/rules/javafiles.py b/Namcap/rules/javafiles.py index 3f93fa3..f83abb7 100644 --- a/Namcap/rules/javafiles.py +++ b/Namcap/rules/javafiles.py @@ -43,7 +43,7 @@ class JavaFiles(TarballRule): #self.infos.append( ('java-class-file-found %s', entry.name) ) f.close() if len(javas) > 0: - reasons = pkginfo.detected_deps.setdefault('java-environment', []) - reasons.append( ('java-environment-needed %s', ', '.join(javas)) ) + reasons = pkginfo.detected_deps.setdefault('java-runtime-headless', []) + reasons.append( ('java-runtime-headless-needed %s', ', '.join(javas)) ) # vim: set ts=4 sw=4 noet: diff --git a/namcap-tags b/namcap-tags index 818c7a5..0330a2f 100644 --- a/namcap-tags +++ b/namcap-tags @@ -94,6 +94,6 @@ hicolor-icon-theme-needed-for-hicolor-dir :: needed for hicolor theme hierarchy shared-mime-info-needed :: needed for update-mime-database desktop-file-utils-needed :: needed for update-desktop-database kdebase-runtime-needed %s :: needed for programs %s -java-environment-needed %s :: found class files %s +java-runtime-headless-needed %s :: found class files %s libraries-needed %s %s :: libraries %s needed in files %s programs-needed %s %s :: programs %s needed in scripts %s -- 1.7.10.3

1 0

[arch-projects] [mkinitcpio] [GIT] The official mkinitcpio repository annotated tag 0.9.1 created. 0.9.1
by dreisner＠archlinux.org 02 Jun '12

02 Jun '12

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 "The official mkinitcpio repository". The annotated tag, 0.9.1 has been created at 1def9668197a2b02c388f47ca48c497fb39eef23 (tag) tagging f465358ba4ac5e32c858b0f7a30c5983fb2a318a (commit) replaces 0.9.0 tagged by Dave Reisner on Sat Jun 2 18:36:25 2012 -0400 - Log ----------------------------------------------------------------- tag as 0.9.1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQEcBAABAgAGBQJPypVrAAoJEB6yY4/1bAxTKZQIALX2LIIGLRdEB8QBGaDkvLTA oNWXpd0etuYFsqCJbJMKpGQe9/iDBWaxS/Rq+z9mhWQCC3j7Z3vY8HHdsJtpJr1W XH2AWvhvaQjMXsCAw7+IWFHK+Yv0byH8dsGcMYaoEgJa2Qc76r1dfKFeFwC4MtAW ZmXefiBFBde/k5hmS1MhHkqgTFiT8TylJnb42cF6jtMG84NTNnCmYwxp1pXMhxzR 1unLgVaZCNt+gYqNK2fDXecC0EEQGAAhZQ3bPuH6p0b+BKxPCRmKCYbPkwV7dA0H FcXeZpSphyMWDI/7P1r9AahdoAL/M3OjKVoD/CnntRNQeCU92SL8/c6J6XylYKA= =Dqms -----END PGP SIGNATURE----- Dave Reisner (7): add_full_dir: properly handle symlinks and empty dirs update comments in config move running of hooks to separate function avoid subshell in adding --quiet to bsdcpio add hookpoints to --hookhelp output catch errors in ldd ELF dep resolution Don't report success when builderrors > 0 ----------------------------------------------------------------------- hooks/post-receive -- The official mkinitcpio repository

1 0

[arch-projects] [mkinitcpio] [GIT] The official mkinitcpio repository branch master updated. 0.9.0-7-gf465358
by dreisner＠archlinux.org 02 Jun '12

02 Jun '12

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 "The official mkinitcpio repository". The branch, master has been updated via f465358ba4ac5e32c858b0f7a30c5983fb2a318a (commit) via c8f6effd1884b24de27c24d92883b0e270bcc3ba (commit) from b44e4e7cfd88fc5e2bd95fa9d0dbc36b1bd64483 (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 f465358ba4ac5e32c858b0f7a30c5983fb2a318a Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Jun 1 23:32:45 2012 -0400 Don't report success when builderrors > 0 Technically, we report success when we wrote an image to disk, but this might not be obvious to users, even with a blaring warning right before this line. If in the event builderrors is incremented at all, avoid reporting any sort of "success", since there might be cause for concern. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit c8f6effd1884b24de27c24d92883b0e270bcc3ba Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Jun 1 23:24:09 2012 -0400 catch errors in ldd ELF dep resolution ldd reporting a library to be 'not found' is dangerous, and should be reported. Consider this a build error, which will hopefully prompt the user to reconsider before rebooting. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: functions | 8 +++++++- mkinitcpio | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) hooks/post-receive -- The official mkinitcpio repository

1 0

[arch-projects] [mkinitcpio] [GIT] The official mkinitcpio repository branch master updated. 0.9.0-5-gb44e4e7
by dreisner＠archlinux.org 01 Jun '12

01 Jun '12

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 "The official mkinitcpio repository". The branch, master has been updated via b44e4e7cfd88fc5e2bd95fa9d0dbc36b1bd64483 (commit) via 015d482ce8394acd2f8bc9da2cd70339ebbcc3f9 (commit) via 9a20048c6279cd5a037108980069bb46b4a6299d (commit) via 01b4ec4fef66c164cad1bf35eeda83bd3c53f2d1 (commit) via 96e616f06785f4c885ee9c2532a043e620ab07ba (commit) from 61ae4752dc2de0c3cca201701b92908b1dd18dee (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 b44e4e7cfd88fc5e2bd95fa9d0dbc36b1bd64483 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue May 22 10:03:12 2012 -0400 add hookpoints to --hookhelp output Generalize the awk program embedded in add_runscript and create a separate function which can be reused to display the specific hooks that a script has. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 015d482ce8394acd2f8bc9da2cd70339ebbcc3f9 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat May 26 17:19:29 2012 -0400 avoid subshell in adding --quiet to bsdcpio Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 9a20048c6279cd5a037108980069bb46b4a6299d Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat May 26 16:54:43 2012 -0400 move running of hooks to separate function This allows us to declare sourced variables that we want to shield from stomping on our config variables, and without needing to use a subshell. Incidentally, this also fixes FS#29992 in a more permanent way. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 01b4ec4fef66c164cad1bf35eeda83bd3c53f2d1 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon May 28 15:12:26 2012 -0400 update comments in config This really should be moved into a man page. FS#30042. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 96e616f06785f4c885ee9c2532a043e620ab07ba Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed May 30 08:46:12 2012 -0400 add_full_dir: properly handle symlinks and empty dirs Note that we're intentionally very liberal about what we accept for symlinks, and don't actually care if the target exists. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: functions | 74 +++++++++++++++++++++++++++++++++++++++++++++++++------ mkinitcpio | 62 ++++++++++++---------------------------------- mkinitcpio.conf | 13 ++++------ 3 files changed, 87 insertions(+), 62 deletions(-) hooks/post-receive -- The official mkinitcpio repository

1 0

[arch-projects] [netcfg] [GIT] netcfg network scripts repository branch master updated. 2.8.3-2-g964f899
by jouke＠archlinux.org 01 Jun '12

01 Jun '12

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 "netcfg network scripts repository". The branch, master has been updated via 964f899f665a14455b527890f445f6cb2f1d4576 (commit) from c037ed5e21d74b7b264b793849bab2972d6912cb (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 964f899f665a14455b527890f445f6cb2f1d4576 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Fri Jun 1 12:15:43 2012 +0200 List ifenslave as an optional dependency (FS#30091) Needed for bonding interfaces. ----------------------------------------------------------------------- Summary of changes: contrib/PKGBUILD | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) hooks/post-receive -- netcfg network scripts repository

1 0

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch master updated. 2012.05.1-11-ga20ce0e
by tomegun＠archlinux.org 29 May '12

29 May '12

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 a20ce0e666b5c97080a880eee9d8301c3d48b177 (commit) from c92270d34def149ed74a3202b1ffed056c0151d0 (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 a20ce0e666b5c97080a880eee9d8301c3d48b177 Author: Tom Gundersen <teg(a)jklm.no> Date: Tue May 29 20:42:58 2012 +0200 udev: fix path so systemd can drop a symlink Signed-off-by: Tom Gundersen <teg(a)jklm.no> ----------------------------------------------------------------------- Summary of changes: functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch master updated. 2012.05.1-10-gc92270d
by tomegun＠archlinux.org 29 May '12

29 May '12

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 c92270d34def149ed74a3202b1ffed056c0151d0 (commit) via fb88ea7f023439cb66f7ba79c0271d0660e1c7fb (commit) from 496fab1fd454b6f8422c2c05db787977dc9d1071 (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 c92270d34def149ed74a3202b1ffed056c0151d0 Author: Tom Gundersen <teg(a)jklm.no> Date: Tue May 29 20:27:39 2012 +0200 fix another wrong path Signed-off-by: Tom Gundersen <teg(a)jklm.no> commit fb88ea7f023439cb66f7ba79c0271d0660e1c7fb Author: Tom Gundersen <teg(a)jklm.no> Date: Tue May 29 20:17:56 2012 +0200 man: drop duplicate manpages These are now shipped with systemd-tools. Signed-off-by: Tom Gundersen <teg(a)jklm.no> ----------------------------------------------------------------------- Summary of changes: Makefile | 11 ++-------- binfmt.d.5.txt | 57 -------------------------------------------------- functions | 2 +- hostname.5.txt | 34 ------------------------------ locale.conf.5.txt | 40 ----------------------------------- rc.conf.5.txt | 8 ++++++- vconsole.conf.5.txt | 58 --------------------------------------------------- 7 files changed, 10 insertions(+), 200 deletions(-) delete mode 100644 binfmt.d.5.txt delete mode 100644 hostname.5.txt delete mode 100644 locale.conf.5.txt delete mode 100644 vconsole.conf.5.txt hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [netcfg] [GIT] netcfg network scripts repository branch master updated. 2.8.3-1-gc037ed5
by jouke＠archlinux.org 29 May '12

29 May '12

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 "netcfg network scripts repository". The branch, master has been updated via c037ed5e21d74b7b264b793849bab2972d6912cb (commit) from a347ed655b0163edbb724d114dc6f016726ed166 (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 c037ed5e21d74b7b264b793849bab2972d6912cb Author: Thomas Bächler <thomas(a)archlinux.org> Date: Tue May 29 17:18:51 2012 +0200 pppoe default to noauth pppd is a bit stupid with regard to configuration: It will always read /etc/ppp/options. This overrides the default 'auth' setting. ----------------------------------------------------------------------- Summary of changes: src/connections/pppoe | 1 + 1 file changed, 1 insertion(+) hooks/post-receive -- netcfg network scripts repository

1 0

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch master updated. 2012.05.1-8-g496fab1
by tomegun＠archlinux.org 29 May '12

29 May '12

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 496fab1fd454b6f8422c2c05db787977dc9d1071 (commit) via 4826ad0747f9caa8e685f819102e71845905a6a1 (commit) via 9882b6ac728255b9e17c042b3c0d57cddd0d60d8 (commit) via e09c66ded0f2d4888aafeca812dc972e52eb3972 (commit) via 854aa04187d4f65607f9b4525ca6645a0db7c9f8 (commit) via 6aae67af18fcb9af1ab47c7dd4bfd9c265f0203b (commit) via 6f3ad111dd2dc18e0d393d59e3a1b383e69d0741 (commit) via 2915407c58c4c9cc91ae778f9565e45e8466824e (commit) from 86b2cb99028d81a6cb608f09e1a31bc7744a991c (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 496fab1fd454b6f8422c2c05db787977dc9d1071 Author: Tom Gundersen <teg(a)jklm.no> Date: Tue May 29 13:38:56 2012 +0200 systemd: correct some paths Signed-off-by: Tom Gundersen <teg(a)jklm.no> commit 4826ad0747f9caa8e685f819102e71845905a6a1 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon May 28 10:58:43 2012 -0400 add support for modules-load.d directories Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 9882b6ac728255b9e17c042b3c0d57cddd0d60d8 Author: Tom Gundersen <teg(a)jklm.no> Date: Mon May 28 22:34:55 2012 +0200 tmpfiles: let systemd-tools ship most tmpfiles.d entries We only have one that is initsrcipts specific. Rename the tmpfiles snippet from arch.conf to initscripts.conf as this is more accurate. Signed-off-by: Tom Gundersen <teg(a)jklm.no> commit e09c66ded0f2d4888aafeca812dc972e52eb3972 Author: Tom Gundersen <teg(a)jklm.no> Date: Mon May 28 22:00:55 2012 +0200 random-seed: use the systemd tool Signed-off-by: Tom Gundersen <teg(a)jklm.no> commit 854aa04187d4f65607f9b4525ca6645a0db7c9f8 Author: Tom Gundersen <teg(a)jklm.no> Date: Tue May 15 01:54:25 2012 +0200 vconsole: use the systemd tool Signed-off-by: Tom Gundersen <teg(a)jklm.no> commit 6aae67af18fcb9af1ab47c7dd4bfd9c265f0203b Author: Tom Gundersen <teg(a)jklm.no> Date: Tue May 15 01:44:52 2012 +0200 tmpfiles,sysctl,binfmt: use the systemd tools No point in reinventing the wheel. These and other tools are shipped in the systemd-tools package. Functionality should be unchanged, but we no longer have to maintain the code. Signed-off-by: Tom Gundersen <teg(a)jklm.no> commit 6f3ad111dd2dc18e0d393d59e3a1b383e69d0741 Author: Sébastien Luttringer <seblu(a)seblu.net> Date: Sun May 20 05:12:52 2012 +0200 fix /forcefsck logic with initcpio fsck hook Currently, using "shutdown -F -r now" with fsck initcpio hook doesn't make a full fsck on reboot. Initscripts hook check if /run/initramfs/root-fsck is present to add -M option to fsck which disable check of mounted filesystem. Initcpio doesn't check /forcefsck file and create root-fsck file with a simple fsck check. Signed-off-by: Sébastien Luttringer <seblu(a)seblu.net> commit 2915407c58c4c9cc91ae778f9565e45e8466824e Author: Tom Gundersen <teg(a)jklm.no> Date: Fri May 11 02:54:58 2012 +0200 console: configure console after modules have been loaded This should probably be fixed elsewhere, but for now only configure the console once the KMS drivers have been loaded to avoid the settings getting lost. Signed-off-by: Tom Gundersen <teg(a)jklm.no> ----------------------------------------------------------------------- Summary of changes: Makefile | 11 +-- PKGBUILD | 2 +- arch-binfmt | 45 --------- arch-sysctl | 29 ------ arch-tmpfiles | 297 --------------------------------------------------------- functions | 50 ++++------ rc.multi | 4 +- rc.shutdown | 13 +-- rc.sysinit | 55 +++-------- tmpfiles.conf | 16 ---- 10 files changed, 39 insertions(+), 483 deletions(-) delete mode 100755 arch-binfmt delete mode 100755 arch-sysctl delete mode 100755 arch-tmpfiles hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [initscripts][PATCH 1/4] tmpfiles, sysctl, binfmt: use the systemd tools
by Tom Gundersen 28 May '12

28 May '12

No point in reinventing the wheel. These and other tools are shipped in the systemd-tools package. Functionality should be unchanged, but we no longer have to maintain the code. Signed-off-by: Tom Gundersen <teg(a)jklm.no> --- Makefile | 8 -- arch-binfmt | 45 --------- arch-sysctl | 29 ------ arch-tmpfiles | 297 --------------------------------------------------------- functions | 2 +- rc.multi | 4 +- 6 files changed, 3 insertions(+), 382 deletions(-) delete mode 100755 arch-binfmt delete mode 100755 arch-sysctl delete mode 100755 arch-tmpfiles diff --git a/Makefile b/Makefile index a2e5e04..bea5570 100644 --- a/Makefile +++ b/Makefile @@ -7,13 +7,6 @@ DIRS := \ /etc/logrotate.d \ /etc/profile.d \ /usr/sbin \ - /etc/tmpfiles.d \ - /usr/lib/tmpfiles.d \ - /etc/binfmt.d \ - /usr/lib/binfmt.d \ - /etc/sysctl.d \ - /usr/lib/sysctl.d \ - /usr/lib/initscripts \ /usr/share/bash-completion/completions \ /usr/share/zsh/site-functions \ /usr/share/man/man5 \ @@ -41,7 +34,6 @@ install: installdirs doc install -m755 -t $(DESTDIR)/usr/sbin rc.d install -m644 -t $(DESTDIR)/usr/share/man/man5 $(filter %.5, $(MAN_PAGES)) install -m644 -t $(DESTDIR)/usr/share/man/man8 $(filter %.8, $(MAN_PAGES)) - install -m755 -t $(DESTDIR)/usr/lib/initscripts arch-tmpfiles arch-sysctl arch-binfmt install -m644 tmpfiles.conf $(DESTDIR)/usr/lib/tmpfiles.d/arch.conf install -m644 -T bash-completion $(DESTDIR)/usr/share/bash-completion/completions/rc.d install -m644 -T zsh-completion $(DESTDIR)/usr/share/zsh/site-functions/_rc.d diff --git a/arch-binfmt b/arch-binfmt deleted file mode 100755 index 91468ef..0000000 --- a/arch-binfmt +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash -# -# /usr/lib/initscripts/arch-binfmt -# -# Configure additional binary formats at boot -# - -shopt -s nullglob - -declare -a binfmt_d -# files given has argv supersede config files -if (( $# > 0 )); then - for arg; do [[ -r "$arg" ]] && binfmt_d+=("$arg"); done -else - binfmt_d=( - /usr/lib/binfmt.d/*.conf - /etc/binfmt.d/*.conf - /run/binfmt.d/*.conf - ) -fi - -# check there is file to load -(( ${#binfmt_d[@]} > 0 )) || exit 1 - -# mount binfmt_misc if api filesystem is missing -mountpoint -q /proc/sys/fs/binfmt_misc || - mount -t binfmt_misc binfmt /proc/sys/fs/binfmt_misc - -# files declared later in the binfmt_d array will override earlier -# Example: `/etc/binfmt.d/foo.conf' supersedes `/usr/lib/binfmt.d/foo.conf'. -declare -A fragments -for path in "${binfmt_d[@]}"; do - [[ -f $path ]] && fragments[${path##*/}]=$path -done - -for path in "${fragments[@]}"; do - while read -r line; do - [[ ${line:0:1} == '#' ]] && continue - printf "%s" "$line" > /proc/sys/fs/binfmt_misc/register - done < "$path" -done - -: - -# vim: set ts=2 sw=2 noet: diff --git a/arch-sysctl b/arch-sysctl deleted file mode 100755 index f73f1f0..0000000 --- a/arch-sysctl +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -# -# /usr/lib/initscripts/arch-sysctl -# -# Load sysctl configuration files following -# http://0pointer.de/public/systemd-man/sysctl.d.html -# - -shopt -s nullglob - -declare -a sysctl_d=( - /usr/lib/sysctl.d/*.conf - /etc/sysctl.d/*.conf - /run/sysctl.d/*.conf - /etc/sysctl.conf -) -declare -A fragments - -# files declared later in the sysctl_d array will override earlier -# Example: `/etc/sysctl.d/foo.conf' supersedes `/usr/lib/sysctl.d/foo.conf'. -for path in "${@:-${sysctl_d[@]}}"; do - [[ -f $path ]] && fragments[${path##*/}]=$path -done - -for path in "${fragments[@]}"; do - sysctl -q -p"$path" -done - -# vim: set ts=2 sw=2 noet: diff --git a/arch-tmpfiles b/arch-tmpfiles deleted file mode 100755 index 9355fdc..0000000 --- a/arch-tmpfiles +++ /dev/null @@ -1,297 +0,0 @@ -#!/bin/bash -# -# /usr/lib/initscripts/arch-tmpfiles -# -# Control creation, deletion, and cleaning of volatile and temporary files -# - -warninvalid() { - printf "arch-tmpfiles: ignoring invalid entry on line %d of \`%s'\n" "$LINENUM" "$FILE" - (( ++error )) -} >&2 - -checkparams() { - local parmreq=$1; shift - local path=$1 mode=$2 uid=$3 gid=$4 - - # parmcount must be >= parmreq - if (( $# < parmreq )); then - return 1 - fi - - # mode must be valid octal and 3 or 4 digits - if [[ $mode && ! $mode =~ ^[0-7]{3,4}$ ]]; then - return 1 - fi - - # uid must be numeric or a valid user name - # don't try to resolve numeric IDs in case they don't exist - if [[ $uid ]]; then - if [[ $uid != +([0-9]) ]] && ! getent passwd "$uid" >/dev/null; then - return 1 - fi - fi - - # gid must be numeric or a valid group name - # don't try to resolve numeric IDs in case they don't exist - if [[ $gid ]]; then - if [[ $gid != +([0-9]) ]] && ! getent group "$gid" >/dev/null; then - return 1 - fi - fi - - return 0 -} - -relabel() { - local -a paths=($1) - local mode=$2 uid=$3 gid=$4 - - if ! checkparams 4 "$@"; then - warninvalid - return - fi - - for path in "${paths[@]}"; do - if [[ -e $path ]]; then - [[ $uid != '-' ]] && chown $CHOPTS "$uid" "$path" - [[ $gid != '-' ]] && chgrp $CHOPTS "$gid" "$path" - [[ $mode != '-' ]] && chmod $CHOPTS "$mode" "$path" - fi - done -} - -_f() { - # Create a file if it doesn't exist yet - local path=$1 mode=$2 uid=$3 gid=$4 - - (( CREATE )) || return 0 - - if ! checkparams 4 "$@"; then - warninvalid - return - fi - - if [[ ! -e $path ]]; then - install -m"$mode" -o"$uid" -g"$gid" /dev/null "$path" - fi -} - -_F() { - # Create or truncate a file - local path=$1 mode=$2 uid=$3 gid=$4 - - (( CREATE )) || return 0 - - if ! checkparams 4 "$@"; then - warninvalid - return - fi - - install -m"$mode" -o"$uid" -g"$gid" /dev/null "$path" -} - -_d() { - # Create a directory if it doesn't exist yet - local path=$1 mode=$2 uid=$3 gid=$4 - - (( CREATE )) || return 0 - - if ! checkparams 4 "$@"; then - warninvalid - return - fi - - 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 ! checkparams 4 "$@"; then - warninvalid - return - fi - - if [[ -d $path ]] && (( REMOVE )); then - find "$path" -mindepth 1 -maxdepth 1 -xdev -exec rm -rf {} + - fi - - if (( CREATE )); then - install -d -m"$mode" -o"$uid" -g"$gid" "$path" - fi -} - -_p() { - # Create a named pipe (FIFO) if it doesn't exist yet - local path=$1 mode=$2 uid=$3 gid=$4 - - (( CREATE )) || return 0 - - if ! checkparams 4 "$@"; then - warninvalid - return - fi - - 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 path - local -a paths=($1) - - (( REMOVE )) || return 0 - - if ! checkparams 1 "$@"; then - warninvalid - return - fi - - 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 path - local -a paths=($1) - - (( REMOVE )) || return 0 - - if ! checkparams 1 "$@"; then - warninvalid - return - fi - - for path in "${paths[@]}"; do - [[ -d $path ]] && rm -rf --one-file-system "$path" - done -} - -_z() { - # Set ownership, access mode and relabel security context of a file or - # directory if it exists. Lines of this type accept shell-style globs in - # place of normal path names. - local -a paths=($1) - local mode=$2 uid=$3 gid=$4 - - (( CREATE )) || return 0 - - relabel "$@" -} - -_Z() { - # Recursively set ownership, access mode and relabel security context of 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. - - (( CREATE )) || return 0 - - CHOPTS=-R relabel "$@" -} - -shopt -s nullglob - -declare -i CREATE=0 REMOVE=0 CLEAN=0 error=0 LINENO=0 -declare FILE= -declare -A fragments -declare -a tmpfiles_d=( - /usr/lib/tmpfiles.d/*.conf - /etc/tmpfiles.d/*.conf - /run/tmpfiles.d/*.conf -) - -while (( $# )); do - case $1 in - --create) CREATE=1 ;; - --remove) REMOVE=1 ;; - esac - shift -done - -if (( !(CREATE + REMOVE) )); then - printf 'usage: %s [--create] [--remove]\n' "${0##*/}" - exit 1 -fi - -# 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 - [[ -f $path ]] && fragments[${path##*/}]=${path%/*} -done - -# catch errors in functions so we can exit with something meaningful -set -E -trap '(( ++error ))' ERR - -# loop through the gathered fragments, sorted globally by filename. -# `/run/tmpfiles/foo.conf' will always be read after `/etc/tmpfiles.d/bar.conf' -while read -d '' fragment; do - LINENUM=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 - (( ++LINENUM )) - - # 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 - warninvalid - 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]='root' - [[ ${line[4]} = '-' ]] && line[4]='root' - - "_${line[@]}" - 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 7516345..0d488a7 100644 --- a/functions +++ b/functions @@ -579,7 +579,7 @@ umount_all() { remove_leftover() { stat_busy "Removing Leftover Files" - /usr/lib/initscripts/arch-tmpfiles --create --remove && stat_done || stat_fail + /usr/lib/systemd/systemd-tmpfiles --create --remove && stat_done || stat_fail # move from static /var/{run,lock} to /run if [[ ! -L /var/lock ]]; then rm -rf /var/lock diff --git a/rc.multi b/rc.multi index 20ed9bc..d558753 100755 --- a/rc.multi +++ b/rc.multi @@ -9,10 +9,10 @@ run_hook multi_start # Load sysctl config files -[[ -x /usr/lib/initscripts/arch-sysctl ]] && /usr/lib/initscripts/arch-sysctl +/usr/lib/systemd/systemd-sysctl # Load additional binary formats -[[ -x /usr/lib/initscripts/arch-binfmt ]] && /usr/lib/initscripts/arch-binfmt +/usr/lib/systemd/systemd-binfmt # Start daemons for daemon in "${DAEMONS[@]}"; do -- 1.7.10.2

3 11