aboutsummaryrefslogtreecommitdiffstats
path: root/testing/opennebula
diff options
context:
space:
mode:
authorPrzemyslaw Pawelczyk <przemoc@zoho.com>2016-04-23 13:13:39 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2016-04-25 06:55:43 +0000
commita60b9f07dee0ae4e9bbe34d4146661fcb33aa478 (patch)
treef72d97073ee32bd15b5b0a913f108b144778af1c /testing/opennebula
parenta593d306c92f8bc15a1797c0a2ccfa784edbc4a0 (diff)
downloadaports-a60b9f07dee0ae4e9bbe34d4146661fcb33aa478.tar.bz2
aports-a60b9f07dee0ae4e9bbe34d4146661fcb33aa478.tar.xz
Improve consistency of scripts using adduser/addgroup.
Following rules have been applied: - script starts with shebang !#/bin/sh followed by blank line, - script ends with exit 0 prepended by blank line, - only stderr of adduser, addgroup or passwd is redirected to /dev/null, - getent passwd/group instances has been removed, - manual checking of file and group existence has been removed, - `|| true` instances has been removed. Comments and line wrapping have been preserved.
Diffstat (limited to 'testing/opennebula')
-rw-r--r--testing/opennebula/opennebula-node-kvm.pre-install3
-rw-r--r--testing/opennebula/opennebula.pre-install3
2 files changed, 4 insertions, 2 deletions
diff --git a/testing/opennebula/opennebula-node-kvm.pre-install b/testing/opennebula/opennebula-node-kvm.pre-install
index 5cf97eebc9..73173a745e 100644
--- a/testing/opennebula/opennebula-node-kvm.pre-install
+++ b/testing/opennebula/opennebula-node-kvm.pre-install
@@ -8,5 +8,6 @@ adduser -S -D -s /bin/ash \
addgroup oneadmin libvirt 2>/dev/null
addgroup oneadmin readproc 2>/dev/null
addgroup oneadmin kvm 2>/dev/null
-passwd -u oneadmin &>/dev/null
+passwd -u oneadmin 2>/dev/null
+
exit 0
diff --git a/testing/opennebula/opennebula.pre-install b/testing/opennebula/opennebula.pre-install
index e59e414429..15527ebc01 100644
--- a/testing/opennebula/opennebula.pre-install
+++ b/testing/opennebula/opennebula.pre-install
@@ -4,5 +4,6 @@ addgroup -S oneadmin 2>/dev/null
adduser -S -D -s /bin/ash \
-H -h /var/lib/one -G oneadmin \
-g "OpenNebula user" oneadmin 2>/dev/null
-passwd -u oneadmin &>/dev/null
+passwd -u oneadmin 2>/dev/null
+
exit 0