From: "William Hubbs" <williamh@gentoo.org> To: gentoo-commits@lists.gentoo.org Subject: [gentoo-commits] proj/openrc:master commit in: sh/ Date: Fri, 22 Aug 2014 19:10:09 +0000 (UTC) [thread overview] Message-ID: <1407434044.647e08eb9166d23d0c64f0c8767d93a06bd21a40.williamh@OpenRC> (raw) commit: 647e08eb9166d23d0c64f0c8767d93a06bd21a40 Author: Jason Zaman <jason <AT> perfinion <DOT> com> AuthorDate: Tue Aug 5 22:12:35 2014 +0000 Commit: William Hubbs <williamh <AT> gentoo <DOT> org> CommitDate: Thu Aug 7 17:54:04 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=647e08eb tmpfiles.sh: do not use install install is in /usr which causes problems if /usr is not mounted. Instead, checkpath and "mkdir -p" can do everything required and are both available before /usr is mounted. Since checkpath also handles selinux labels correctly, _restorecon after is not required. X-Gentoo-Bug: 503408 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=503408 --- sh/tmpfiles.sh.in | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/sh/tmpfiles.sh.in b/sh/tmpfiles.sh.in index da64011..63c5d14 100755 --- a/sh/tmpfiles.sh.in +++ b/sh/tmpfiles.sh.in @@ -15,6 +15,7 @@ # DRYRUN=0 +CHECKPATH="@LIBEXECDIR@/bin/checkpath" checkprefix() { n=$1 @@ -87,9 +88,8 @@ _f() { [ $CREATE -gt 0 ] || return 0 if [ ! -e "$path" ]; then - dryrun_or_real install -m"$mode" -o"$uid" -g"$gid" /dev/null "$path" + dryrun_or_real $CHECKPATH -fq -m "$mode" -o "$uid:$gid" "$path" [ -z "$arg" ] || _w "$@" - _restorecon "$path" fi } @@ -99,9 +99,8 @@ _F() { [ $CREATE -gt 0 ] || return 0 - dryrun_or_real install -m"$mode" -o"$uid" -g"$gid" /dev/null "$path" + dryrun_or_real $CHECKPATH -Fq -m "$mode" -o "$uid:$gid" "$path" [ -z "$arg" ] || _w "$@" - _restorecon "$path" } _d() { @@ -111,8 +110,8 @@ _d() { [ $CREATE -gt 0 ] || return 0 if [ ! -d "$path" ]; then - dryrun_or_real install -d -m"$mode" -o"$uid" -g"$gid" "$path" - _restorecon "$path" + dryrun_or_real mkdir -p "$path" 2>/dev/null + dryrun_or_real $CHECKPATH -dq -m "$mode" -o "$uid:$gid" "$path" fi } @@ -126,8 +125,8 @@ _D() { fi if [ $CREATE -gt 0 ]; then - dryrun_or_real install -d -m"$mode" -o"$uid" -g"$gid" "$path" - _restorecon "$path" + dryrun_or_real mkdir -p "$path" 2>/dev/null + dryrun_or_real $CHECKPATH -Dq -m "$mode" -o "$uid:$gid" "$path" fi } @@ -145,9 +144,7 @@ _p() { [ $CREATE -gt 0 ] || return 0 if [ ! -p "$path" ]; then - dryrun_or_real mkfifo -m$mode "$path" - dryrun_or_real chown "$uid:$gid" "$path" - _restorecon "$path" + dryrun_or_real $CHECKPATH -pq -m $mode -o "$uid:$gid" "$path" fi }
WARNING: multiple messages have this Message-ID (diff)
From: "William Hubbs" <williamh@gentoo.org> To: gentoo-commits@lists.gentoo.org Subject: [gentoo-commits] proj/openrc:master commit in: sh/ Date: Thu, 7 Aug 2014 18:35:29 +0000 (UTC) [thread overview] Message-ID: <1407434044.647e08eb9166d23d0c64f0c8767d93a06bd21a40.williamh@OpenRC> (raw) Message-ID: <20140807183529.MKU4QiiO-akGPwMc9jlXODx6eE1May6adqMky8-fIKs@z> (raw) commit: 647e08eb9166d23d0c64f0c8767d93a06bd21a40 Author: Jason Zaman <jason <AT> perfinion <DOT> com> AuthorDate: Tue Aug 5 22:12:35 2014 +0000 Commit: William Hubbs <williamh <AT> gentoo <DOT> org> CommitDate: Thu Aug 7 17:54:04 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=647e08eb tmpfiles.sh: do not use install install is in /usr which causes problems if /usr is not mounted. Instead, checkpath and "mkdir -p" can do everything required and are both available before /usr is mounted. Since checkpath also handles selinux labels correctly, _restorecon after is not required. X-Gentoo-Bug: 503408 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=503408 --- sh/tmpfiles.sh.in | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/sh/tmpfiles.sh.in b/sh/tmpfiles.sh.in index da64011..63c5d14 100755 --- a/sh/tmpfiles.sh.in +++ b/sh/tmpfiles.sh.in @@ -15,6 +15,7 @@ # DRYRUN=0 +CHECKPATH="@LIBEXECDIR@/bin/checkpath" checkprefix() { n=$1 @@ -87,9 +88,8 @@ _f() { [ $CREATE -gt 0 ] || return 0 if [ ! -e "$path" ]; then - dryrun_or_real install -m"$mode" -o"$uid" -g"$gid" /dev/null "$path" + dryrun_or_real $CHECKPATH -fq -m "$mode" -o "$uid:$gid" "$path" [ -z "$arg" ] || _w "$@" - _restorecon "$path" fi } @@ -99,9 +99,8 @@ _F() { [ $CREATE -gt 0 ] || return 0 - dryrun_or_real install -m"$mode" -o"$uid" -g"$gid" /dev/null "$path" + dryrun_or_real $CHECKPATH -Fq -m "$mode" -o "$uid:$gid" "$path" [ -z "$arg" ] || _w "$@" - _restorecon "$path" } _d() { @@ -111,8 +110,8 @@ _d() { [ $CREATE -gt 0 ] || return 0 if [ ! -d "$path" ]; then - dryrun_or_real install -d -m"$mode" -o"$uid" -g"$gid" "$path" - _restorecon "$path" + dryrun_or_real mkdir -p "$path" 2>/dev/null + dryrun_or_real $CHECKPATH -dq -m "$mode" -o "$uid:$gid" "$path" fi } @@ -126,8 +125,8 @@ _D() { fi if [ $CREATE -gt 0 ]; then - dryrun_or_real install -d -m"$mode" -o"$uid" -g"$gid" "$path" - _restorecon "$path" + dryrun_or_real mkdir -p "$path" 2>/dev/null + dryrun_or_real $CHECKPATH -Dq -m "$mode" -o "$uid:$gid" "$path" fi } @@ -145,9 +144,7 @@ _p() { [ $CREATE -gt 0 ] || return 0 if [ ! -p "$path" ]; then - dryrun_or_real mkfifo -m$mode "$path" - dryrun_or_real chown "$uid:$gid" "$path" - _restorecon "$path" + dryrun_or_real $CHECKPATH -pq -m $mode -o "$uid:$gid" "$path" fi }
next reply other threads:[~2014-08-22 19:10 UTC|newest] Thread overview: 148+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-08-22 19:10 William Hubbs [this message] 2014-08-07 18:35 ` [gentoo-commits] proj/openrc:master commit in: sh/ William Hubbs -- strict thread matches above, loose matches on Subject: below -- 2018-06-15 22:45 William Hubbs 2018-05-22 22:12 William Hubbs 2018-03-12 2:43 William Hubbs 2018-02-28 18:45 William Hubbs 2018-02-28 18:45 William Hubbs 2018-02-23 21:53 William Hubbs 2017-12-01 21:48 William Hubbs 2017-10-26 18:58 William Hubbs 2017-10-26 18:58 William Hubbs 2017-10-25 20:10 William Hubbs 2017-09-29 17:52 William Hubbs 2017-09-22 22:25 William Hubbs 2017-09-18 18:07 William Hubbs 2017-09-15 20:32 William Hubbs 2017-09-15 18:44 William Hubbs 2017-09-15 18:31 William Hubbs 2017-09-14 15:57 William Hubbs 2017-09-14 15:57 William Hubbs 2017-08-15 22:19 William Hubbs 2017-03-23 18:27 William Hubbs 2017-02-24 0:19 William Hubbs 2016-12-18 17:54 William Hubbs 2016-12-18 17:22 William Hubbs 2016-12-17 22:57 William Hubbs 2016-09-22 23:21 William Hubbs 2016-09-20 16:36 William Hubbs 2016-09-19 23:05 William Hubbs 2016-09-14 19:00 William Hubbs 2016-09-13 17:54 William Hubbs 2016-09-12 17:59 William Hubbs 2016-07-26 15:54 William Hubbs 2016-07-25 20:54 William Hubbs 2016-07-25 20:54 William Hubbs 2016-07-25 20:54 William Hubbs 2016-05-24 16:43 William Hubbs 2016-05-24 16:43 William Hubbs 2016-02-19 21:34 William Hubbs 2016-01-19 23:02 William Hubbs 2015-12-09 18:42 William Hubbs 2015-12-01 18:31 William Hubbs 2015-10-13 22:45 William Hubbs 2015-10-13 22:45 William Hubbs 2015-10-13 13:36 William Hubbs 2015-10-06 17:17 William Hubbs 2015-10-04 20:37 William Hubbs 2015-08-04 19:41 William Hubbs 2015-07-10 18:26 William Hubbs 2015-07-10 18:26 William Hubbs 2015-05-14 19:29 William Hubbs 2015-05-13 21:56 William Hubbs 2015-04-21 21:33 William Hubbs 2015-04-08 15:33 William Hubbs 2015-03-29 23:37 William Hubbs 2015-01-12 21:02 William Hubbs 2014-09-11 19:06 William Hubbs 2014-09-11 17:03 William Hubbs 2014-08-28 14:49 William Hubbs 2014-08-28 14:49 William Hubbs 2014-08-22 19:10 William Hubbs 2014-08-13 15:07 ` William Hubbs 2014-08-22 19:10 William Hubbs 2014-08-13 20:29 ` William Hubbs 2014-07-16 18:14 William Hubbs 2014-07-10 17:08 William Hubbs 2014-07-10 17:08 William Hubbs 2014-06-21 0:44 William Hubbs 2014-06-20 21:22 William Hubbs 2014-05-26 6:52 Robin H. Johnson 2014-04-03 18:05 William Hubbs 2014-01-18 8:50 William Hubbs 2014-01-18 7:56 William Hubbs 2013-12-11 4:47 William Hubbs 2013-11-30 21:33 Mike Frysinger 2013-10-31 21:09 William Hubbs 2013-09-27 21:22 William Hubbs 2013-07-27 16:12 William Hubbs 2013-07-26 1:56 William Hubbs 2013-07-25 6:01 William Hubbs 2013-07-23 23:01 William Hubbs 2013-07-23 23:01 William Hubbs 2013-07-16 18:56 William Hubbs 2013-07-16 18:56 William Hubbs 2013-07-16 18:56 William Hubbs 2013-06-24 20:46 William Hubbs 2013-06-24 20:46 William Hubbs 2013-05-26 2:06 William Hubbs 2013-05-26 1:15 William Hubbs 2013-05-05 19:29 William Hubbs 2013-04-03 16:34 William Hubbs 2013-03-11 6:11 William Hubbs 2013-02-24 3:38 William Hubbs 2013-02-19 22:53 William Hubbs 2013-02-17 2:49 William Hubbs 2013-02-16 7:30 William Hubbs 2013-01-17 3:14 Mike Frysinger 2013-01-15 18:36 William Hubbs 2013-01-15 18:21 William Hubbs 2012-12-22 15:47 William Hubbs 2012-12-22 14:40 William Hubbs 2012-12-19 17:43 William Hubbs 2012-12-07 15:48 William Hubbs 2012-12-06 22:51 William Hubbs 2012-11-26 3:45 William Hubbs 2012-11-06 22:41 William Hubbs 2012-11-05 21:25 Robin H. Johnson 2012-10-22 0:53 William Hubbs 2012-10-22 0:53 William Hubbs 2012-10-21 19:51 William Hubbs 2012-10-17 23:19 William Hubbs 2012-09-26 22:12 Robin H. Johnson 2012-08-16 18:45 Robin H. Johnson 2012-07-02 18:27 William Hubbs 2012-05-16 22:00 Christian Ruppert 2012-05-02 19:50 William Hubbs 2012-04-26 17:59 William Hubbs 2012-04-26 17:21 William Hubbs 2012-04-26 17:12 William Hubbs 2012-04-26 16:28 William Hubbs 2012-03-12 19:05 Robin H. Johnson 2012-03-12 8:38 Robin H. Johnson 2012-02-09 9:56 Robin H. Johnson 2012-01-29 15:53 William Hubbs 2012-01-28 18:26 Christian Ruppert 2012-01-27 4:18 William Hubbs 2012-01-17 18:09 William Hubbs 2011-11-18 14:39 William Hubbs 2011-11-18 6:06 William Hubbs 2011-11-02 13:42 William Hubbs 2011-09-18 20:07 Mike Frysinger 2011-09-13 3:20 William Hubbs 2011-09-12 15:48 Christian Ruppert 2011-09-12 15:48 Christian Ruppert 2011-09-12 15:48 Christian Ruppert 2011-09-07 20:14 William Hubbs 2011-09-07 3:21 William Hubbs 2011-07-26 17:29 William Hubbs 2011-07-06 14:55 William Hubbs 2011-07-03 4:34 William Hubbs 2011-06-27 17:11 William Hubbs 2011-06-27 16:56 William Hubbs 2011-06-04 0:43 Mike Frysinger 2011-05-16 22:49 Mike Frysinger 2011-05-11 19:55 William Hubbs 2011-04-19 16:01 William Hubbs 2011-04-18 22:39 William Hubbs 2011-03-25 0:18 William Hubbs
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1407434044.647e08eb9166d23d0c64f0c8767d93a06bd21a40.williamh@OpenRC \ --to=williamh@gentoo.org \ --cc=gentoo-commits@lists.gentoo.org \ --cc=gentoo-dev@lists.gentoo.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox