[gentoo-dev] [PATCH] tmpfiles.eclass: fix ROOT check for EAPI 7

[gentoo-dev] [PATCH] tmpfiles.eclass: fix ROOT check for EAPI 7

[Mike Gilbert]

Signed-off-by: Mike Gilbert <floppym@gentoo.org>
---
 eclass/tmpfiles.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/tmpfiles.eclass b/eclass/tmpfiles.eclass
index a8bb9061ec8c..f23c7c77ab07 100644
--- a/eclass/tmpfiles.eclass
+++ b/eclass/tmpfiles.eclass
@@ -113,7 +113,7 @@ tmpfiles_process() {
 	[[ ${#} -gt 0 ]] || die "${FUNCNAME}: Must specify at least one filename"
 
 	# Only process tmpfiles for the currently running system
-	if [[ ${ROOT} != / ]]; then
+	if [[ ${ROOT:-/} != / ]]; then
 		ewarn "Warning: tmpfiles.d not processed on ROOT != /. If you do not use"
 		ewarn "a service manager supporting tmpfiles.d, you need to run"
 		ewarn "the following command after booting (or chroot-ing with all"
-- 
2.21.0

Re: [gentoo-dev] [PATCH] tmpfiles.eclass: fix ROOT check for EAPI 7

[James Le Cuirot]

[-- Attachment #1: Type: text/plain, Size: 946 bytes --]

On Thu, 25 Apr 2019 17:46:50 -0400
Mike Gilbert <floppym@gentoo.org> wrote:

> Signed-off-by: Mike Gilbert <floppym@gentoo.org>
> ---
>  eclass/tmpfiles.eclass | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/eclass/tmpfiles.eclass b/eclass/tmpfiles.eclass
> index a8bb9061ec8c..f23c7c77ab07 100644
> --- a/eclass/tmpfiles.eclass
> +++ b/eclass/tmpfiles.eclass
> @@ -113,7 +113,7 @@ tmpfiles_process() {
>  	[[ ${#} -gt 0 ]] || die "${FUNCNAME}: Must specify at least one filename"
>  
>  	# Only process tmpfiles for the currently running system
> -	if [[ ${ROOT} != / ]]; then
> +	if [[ ${ROOT:-/} != / ]]; then
>  		ewarn "Warning: tmpfiles.d not processed on ROOT != /. If you do not use"
>  		ewarn "a service manager supporting tmpfiles.d, you need to run"
>  		ewarn "the following command after booting (or chroot-ing with all"

Ack.

-- 
James Le Cuirot (chewi)
Gentoo Linux Developer

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [gentoo-dev] [PATCH] tmpfiles.eclass: fix ROOT check for EAPI 7

[Mike Gilbert]

On Thu, Apr 25, 2019 at 5:50 PM James Le Cuirot <chewi@gentoo.org> wrote:
>
> On Thu, 25 Apr 2019 17:46:50 -0400
> Mike Gilbert <floppym@gentoo.org> wrote:
>
> > Signed-off-by: Mike Gilbert <floppym@gentoo.org>
> > ---
> >  eclass/tmpfiles.eclass | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/eclass/tmpfiles.eclass b/eclass/tmpfiles.eclass
> > index a8bb9061ec8c..f23c7c77ab07 100644
> > --- a/eclass/tmpfiles.eclass
> > +++ b/eclass/tmpfiles.eclass
> > @@ -113,7 +113,7 @@ tmpfiles_process() {
> >       [[ ${#} -gt 0 ]] || die "${FUNCNAME}: Must specify at least one filename"
> >
> >       # Only process tmpfiles for the currently running system
> > -     if [[ ${ROOT} != / ]]; then
> > +     if [[ ${ROOT:-/} != / ]]; then
> >               ewarn "Warning: tmpfiles.d not processed on ROOT != /. If you do not use"
> >               ewarn "a service manager supporting tmpfiles.d, you need to run"
> >               ewarn "the following command after booting (or chroot-ing with all"
>
> Ack.

Pushed, along with an updated copyright notice.