From b51b6daf94007f52e01715f10ccb9ee5efea848788739031f4686c02c4d7b6d1 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Tue, 9 Apr 2019 14:29:01 +0000 Subject: [PATCH] Small corrections to POSIX-compliant changes. OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/lxd?expand=0&rev=8 --- lxd.changes | 2 +- lxd.spec | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lxd.changes b/lxd.changes index 17096a0..5ab07c3 100644 --- a/lxd.changes +++ b/lxd.changes @@ -3,7 +3,7 @@ Mon Apr 8 13:18:50 UTC 2019 - Jan Engelhardt - %pre bash features: replace by POSIX equivalents. - %build bash features: add %_buildshell definition for it. -- Do not igonre errors from groupadd. +- Do not ignore errors from groupadd. ------------------------------------------------------------------- Fri Apr 5 19:13:48 UTC 2019 - Aleksa Sarai diff --git a/lxd.spec b/lxd.spec index da8ca27..b8c26fd 100644 --- a/lxd.spec +++ b/lxd.spec @@ -246,7 +246,7 @@ getent group %{name} >/dev/null || groupadd -r %{name} # /etc/sub[ug]id should exist already (it's part of shadow-utils), but older # distros don't have it. LXD just parses it and doesn't need any special # shadow-utils helpers. -touch /etc/subuid /etc/subgid || : +touch /etc/subuid /etc/subgid ||: # Add sub[ug]ids for LXD's unprivileged containers -- in order to support # isolated containers we add quite a few subuids. Since LXD runs as root we add @@ -261,9 +261,9 @@ touch /etc/subuid /etc/subgid || : # # This default setting of 500 million is enough for ~8000 isolated containers, # which should be enough for most users. -grep -q '^root:' /etc/subuid 2>/dev/null || \ +grep -q '^root:' /etc/subuid || \ usermod -v 400000000-900000000 root ||: -grep -q '^root:' /etc/subgid 2>/dev/null || \ +grep -q '^root:' /etc/subgid || \ usermod -w 400000000-900000000 root ||: %service_add_pre %{name}.service