commit: 0c229faf7e6a57bcff70f2143b83cb69a34c89f4 Author: Martin Väth <martin <AT> mvath <DOT> de> AuthorDate: Wed May 25 09:03:12 2016 +0000 Commit: William Hubbs <williamh <AT> gentoo <DOT> org> CommitDate: Tue Jul 26 15:53:54 2016 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=0c229faf
tmpfiles.sh: Support lines with q Q h H btrfs support is not implemented yet (for q Q v), but at least tmpfiles.sh no longer chokes about tmpfiles.d lines of recent systemd versions This fixes #87. sh/tmpfiles.sh.in | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 2 deletions(-) diff --git a/sh/tmpfiles.sh.in b/sh/tmpfiles.sh.in index f7ee11b..87545ed 100644 --- a/sh/tmpfiles.sh.in +++ b/sh/tmpfiles.sh.in @@ -10,8 +10,10 @@ # http://projects.archlinux.org/initscripts.git/tree/arch-tmpfiles # # See the tmpfiles.d manpage as well: +# https://www.freedesktop.org/software/systemd/man/tmpfiles.d.html +# This script should match the old manpage # http://0pointer.de/public/systemd-man/tmpfiles.d.html -# This script should match the manpage as of 2012/03/12 +# as of 2012/03/12 and also implements some more recent features # DRYRUN=0 @@ -44,6 +46,17 @@ dryrun_or_real() { $dryrun "$@" } +_chattr() { + local attr="$2" + case $attr in + [+-=]*) : ;; + '') return ;; + *) attr="+$attr" ;; + esac + local IFS= + dryrun_or_real chattr $1 "$attr" -- $3 +} + relabel() { local path local paths=$1 mode=$2 uid=$3 gid=$4 @@ -163,6 +176,37 @@ _v() { _d "$@" } +_q() { + # Similar to _v. However, make sure that the subvolume will be assigned + # to the same higher-level quota groups as the subvolume it has + # been created in. + # TODO: Implement btrfs subvol creation. + _d "$@" +} + +_Q() { + # Similar to q. However, instead of copying the higher-level quota + # group assignments from the parent as-is, the lowest quota group + # of the parent subvolume is determined that is not the + # leaf quota group. + # TODO: Implement btrfs subvol creation. + _d "$@" +} + +_h() { + # Set file/directory attributes. Lines of this type accept + # shell-style globs in place of normal path names. + # The format of the argument field matches chattr + _chattr '' "$6" "$1" +} + +_H() { + # Recursively set file/directory attributes. Lines of this type accept + # shell-syle globs in place of normal path names. + # Does not follow symlinks + _chattr -R "$6" "$1" +} + _L() { # Create a symlink if it doesn't exist yet local path=$1 mode=$2 uid=$3 gid=$4 age=$5 arg=$6 @@ -371,7 +415,7 @@ for FILE in $tmpfiles_d ; do # whine about invalid entries case $cmd in - f|F|w|d|D|v|p|L|c|C|b|x|X|r|R|z|Z) ;; + f|F|w|d|D|v|p|L|c|C|b|x|X|r|R|z|Z|q|Q|h|H) ;; *) warninvalid ; continue ;; esac
