From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D9D7C138D0E for ; Fri, 10 Jul 2015 18:26:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5937F1416B; Fri, 10 Jul 2015 18:26:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D351614153 for ; Fri, 10 Jul 2015 18:26:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0A9853408DD for ; Fri, 10 Jul 2015 18:26:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D23E675D for ; Fri, 10 Jul 2015 18:26:10 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1435210835.a36a635b016a7427dd1739a26c951fedf22f0dec.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: sh/ X-VCS-Repository: proj/openrc X-VCS-Files: sh/tmpfiles.sh.in X-VCS-Directories: sh/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: a36a635b016a7427dd1739a26c951fedf22f0dec X-VCS-Branch: master Date: Fri, 10 Jul 2015 18:26:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e31993df-7778-47ae-84db-0d8cce825c00 X-Archives-Hash: 1b844ed88034faadd6defe54ac502cfd commit: a36a635b016a7427dd1739a26c951fedf22f0dec Author: Mike Gilbert gentoo org> AuthorDate: Sun Jun 14 01:25:33 2015 +0000 Commit: William Hubbs gentoo org> CommitDate: Thu Jun 25 05:40:35 2015 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=a36a635b tmpfiles: Recognize type 'v' (create btrfs subvol) This change does NOT implement btrfs subvol creation. Instead, it treats 'v' the same as 'd', which is an acceptable fallback according to the manual. Fixes #58 sh/tmpfiles.sh.in | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/sh/tmpfiles.sh.in b/sh/tmpfiles.sh.in index 046bf9f..89bd03e 100644 --- a/sh/tmpfiles.sh.in +++ b/sh/tmpfiles.sh.in @@ -141,6 +141,13 @@ _D() { fi } +_v() { + # Create a subvolume if the path does not exist yet and the file system + # supports this (btrfs). Otherwise create a normal directory. + # TODO: Implement btrfs subvol creation. + _d "$@" +} + _L() { # Create a symlink if it doesn't exist yet local path=$1 mode=$2 uid=$3 gid=$4 age=$5 arg=$6 @@ -336,7 +343,7 @@ for FILE in $tmpfiles_d ; do # whine about invalid entries case $cmd in - f|F|w|d|D|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) ;; *) warninvalid ; continue ;; esac @@ -344,7 +351,7 @@ for FILE in $tmpfiles_d ; do if [ "$mode" = '-' -o "$mode" = '' ]; then case "$cmd" in p|f|F) mode=0644 ;; - d|D) mode=0755 ;; + d|D|v) mode=0755 ;; C|z|Z|x|r|R|L) ;; esac fi