diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-11-19 07:11:13 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-11-19 07:36:18 +0000 |
| commit | f594492b3884ba26ac7cf9b5950656f70bdd006a (patch) | |
| tree | 07a79fce7b71ba24607f94e9bfecbc91f36e035b | |
| parent | 8cbcfd63d0193e3bb35e386123a5e31be77dec02 (diff) | |
| download | aports-f594492b3884ba26ac7cf9b5950656f70bdd006a.tar.bz2 aports-f594492b3884ba26ac7cf9b5950656f70bdd006a.tar.xz | |
main/alpine-baselayout: hide error message for missing /etc/group
(cherry picked from commit 1b1dbe80072846cd2109741b9475af49180265a1)
| -rw-r--r-- | main/alpine-baselayout/APKBUILD | 2 | ||||
| -rw-r--r-- | main/alpine-baselayout/alpine-baselayout.pre-install | 2 | ||||
| -rw-r--r-- | main/alpine-baselayout/alpine-baselayout.pre-upgrade | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/main/alpine-baselayout/APKBUILD b/main/alpine-baselayout/APKBUILD index d416929a84..618f466a96 100644 --- a/main/alpine-baselayout/APKBUILD +++ b/main/alpine-baselayout/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-baselayout pkgver=2.3.1 -pkgrel=4 +pkgrel=5 pkgdesc="Alpine base dir structure and init scripts" url="http://git.alpinelinux.org/cgit/aports/tree/main/alpine-baselayout" arch="all" diff --git a/main/alpine-baselayout/alpine-baselayout.pre-install b/main/alpine-baselayout/alpine-baselayout.pre-install index 25783b323d..3b9f141083 100644 --- a/main/alpine-baselayout/alpine-baselayout.pre-install +++ b/main/alpine-baselayout/alpine-baselayout.pre-install @@ -1,6 +1,6 @@ #!/bin/sh -if [ -e /etc/shadow ] && grep -q '^shadow:' /etc/group; then +if [ -e /etc/group ] && ! grep -q '^shadow:' /etc/group; then addgroup -S -g 42 shadow fi diff --git a/main/alpine-baselayout/alpine-baselayout.pre-upgrade b/main/alpine-baselayout/alpine-baselayout.pre-upgrade index bb2695e47c..8a7098f7d1 100644 --- a/main/alpine-baselayout/alpine-baselayout.pre-upgrade +++ b/main/alpine-baselayout/alpine-baselayout.pre-upgrade @@ -14,6 +14,6 @@ for i in /etc/modprobe.d/*; do mv "$i" "$i".conf done -if ! grep -q '^shadow:' /etc/group; then +if [ -e /etc/group ] && ! grep -q '^shadow:' /etc/group; then addgroup -S -g 42 shadow fi |