BIGTOP-2802. Some packages don't create necessary groups on debian-based system if the users correspond to them already exist
Closes #234 Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/596877c3 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/596877c3 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/596877c3 Branch: refs/heads/branch-1.2 Commit: 596877c303770a61facad6c38d7531a8425af6d7 Parents: 30c1587 Author: Kengo Seki <[email protected]> Authored: Thu Jun 8 21:13:25 2017 -0400 Committer: Evans Ye <[email protected]> Committed: Sat Jul 1 12:52:58 2017 +0000 ---------------------------------------------------------------------- bigtop-packages/src/deb/flink/flink.preinst | 3 ++- bigtop-packages/src/deb/flume/flume.preinst | 3 ++- bigtop-packages/src/deb/hadoop/hadoop-hdfs.preinst | 3 ++- bigtop-packages/src/deb/hadoop/hadoop-httpfs.preinst | 3 ++- bigtop-packages/src/deb/hadoop/hadoop-mapreduce.preinst | 3 ++- bigtop-packages/src/deb/hadoop/hadoop-yarn.preinst | 3 ++- bigtop-packages/src/deb/hama/hama.preinst | 3 ++- bigtop-packages/src/deb/hbase/hbase.preinst | 3 ++- bigtop-packages/src/deb/hive/hive.preinst | 3 ++- bigtop-packages/src/deb/hue/hue-common.preinst | 3 ++- bigtop-packages/src/deb/ignite-hadoop/ignite-hadoop.preinst | 3 ++- bigtop-packages/src/deb/oozie/oozie.preinst | 3 ++- bigtop-packages/src/deb/phoenix/phoenix.preinst | 9 +++++---- bigtop-packages/src/deb/solr/solr.preinst | 3 ++- bigtop-packages/src/deb/spark/spark-core.preinst | 3 ++- bigtop-packages/src/deb/spark1/spark-core.preinst | 3 ++- bigtop-packages/src/deb/sqoop/sqoop.preinst | 3 ++- bigtop-packages/src/deb/tajo/tajo.preinst | 3 ++- bigtop-packages/src/deb/zeppelin/zeppelin.preinst | 3 ++- bigtop-packages/src/deb/zookeeper/zookeeper.preinst | 3 ++- 20 files changed, 43 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/596877c3/bigtop-packages/src/deb/flink/flink.preinst ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/flink/flink.preinst b/bigtop-packages/src/deb/flink/flink.preinst index cee0a14..ece0ee0 100644 --- a/bigtop-packages/src/deb/flink/flink.preinst +++ b/bigtop-packages/src/deb/flink/flink.preinst @@ -32,11 +32,12 @@ set -e case "$1" in install|upgrade) + getent group flink >/dev/null || groupadd -r flink if ! getent passwd flink >/dev/null; then # Adding system user: flink . adduser \ --system \ - --group \ + --ingroup flink \ --home /var/lib/flink \ --gecos "Flink" \ --shell /bin/false \ http://git-wip-us.apache.org/repos/asf/bigtop/blob/596877c3/bigtop-packages/src/deb/flume/flume.preinst ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/flume/flume.preinst b/bigtop-packages/src/deb/flume/flume.preinst index f0fb3e5..21c0ea0 100644 --- a/bigtop-packages/src/deb/flume/flume.preinst +++ b/bigtop-packages/src/deb/flume/flume.preinst @@ -32,11 +32,12 @@ set -e case "$1" in install|upgrade) + getent group flume >/dev/null || groupadd -r flume if ! getent passwd flume >/dev/null; then # Adding system user: flume . adduser \ --system \ - --group \ + --ingroup flume \ --home /var/lib/flume \ --gecos "Flume User" \ --shell /bin/false \ http://git-wip-us.apache.org/repos/asf/bigtop/blob/596877c3/bigtop-packages/src/deb/hadoop/hadoop-hdfs.preinst ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/hadoop/hadoop-hdfs.preinst b/bigtop-packages/src/deb/hadoop/hadoop-hdfs.preinst index dedd7b9..72bdc3c 100644 --- a/bigtop-packages/src/deb/hadoop/hadoop-hdfs.preinst +++ b/bigtop-packages/src/deb/hadoop/hadoop-hdfs.preinst @@ -32,11 +32,12 @@ set -e case "$1" in install|upgrade) + getent group hdfs >/dev/null || groupadd -r hdfs if ! getent passwd hdfs >/dev/null; then # Adding system user: hdfs. adduser \ --system \ - --group \ + --ingroup hdfs \ --home /var/lib/hadoop-hdfs \ --gecos "Hadoop HDFS" \ --shell /bin/bash \ http://git-wip-us.apache.org/repos/asf/bigtop/blob/596877c3/bigtop-packages/src/deb/hadoop/hadoop-httpfs.preinst ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/hadoop/hadoop-httpfs.preinst b/bigtop-packages/src/deb/hadoop/hadoop-httpfs.preinst index 634bcc3..98d6a8b 100644 --- a/bigtop-packages/src/deb/hadoop/hadoop-httpfs.preinst +++ b/bigtop-packages/src/deb/hadoop/hadoop-httpfs.preinst @@ -32,10 +32,11 @@ set -e case "$1" in install|upgrade) + getent group httpfs >/dev/null || groupadd -r httpfs if ! getent passwd httpfs >/dev/null; then adduser \ --system \ - --group \ + --ingroup httpfs \ --home /var/run/hadoop-httpfs \ --gecos "Hadoop HTTPFS" \ --shell /bin/bash \ http://git-wip-us.apache.org/repos/asf/bigtop/blob/596877c3/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.preinst ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.preinst b/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.preinst index b52c5fd..84e975e 100644 --- a/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.preinst +++ b/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.preinst @@ -32,10 +32,11 @@ set -e case "$1" in install|upgrade) + getent group mapred >/dev/null || groupadd -r mapred if ! getent passwd mapred >/dev/null; then adduser \ --system \ - --group \ + --ingroup mapred \ --home /var/lib/hadoop-mapreduce \ --gecos "Hadoop MapReduce" \ --shell /bin/bash \ http://git-wip-us.apache.org/repos/asf/bigtop/blob/596877c3/bigtop-packages/src/deb/hadoop/hadoop-yarn.preinst ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/hadoop/hadoop-yarn.preinst b/bigtop-packages/src/deb/hadoop/hadoop-yarn.preinst index 1445136..fdf5aae 100644 --- a/bigtop-packages/src/deb/hadoop/hadoop-yarn.preinst +++ b/bigtop-packages/src/deb/hadoop/hadoop-yarn.preinst @@ -32,11 +32,12 @@ set -e case "$1" in install|upgrade) + getent group yarn >/dev/null || groupadd -r yarn if ! getent passwd yarn >/dev/null; then # Adding system user: yarn. adduser \ --system \ - --group \ + --ingroup yarn \ --home /var/lib/hadoop-yarn \ --gecos "Hadoop YARN" \ --shell /bin/bash \ http://git-wip-us.apache.org/repos/asf/bigtop/blob/596877c3/bigtop-packages/src/deb/hama/hama.preinst ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/hama/hama.preinst b/bigtop-packages/src/deb/hama/hama.preinst index 421ee90..cc0ecd7 100644 --- a/bigtop-packages/src/deb/hama/hama.preinst +++ b/bigtop-packages/src/deb/hama/hama.preinst @@ -32,11 +32,12 @@ set -e case "$1" in install|upgrade) + getent group hama >/dev/null || groupadd -r hama if ! getent passwd hama >/dev/null; then # Adding system user: hama. adduser \ --system \ - --group \ + --ingroup hama \ --home /var/lib/hama \ --gecos "Apache Hama User" \ --shell /bin/bash \ http://git-wip-us.apache.org/repos/asf/bigtop/blob/596877c3/bigtop-packages/src/deb/hbase/hbase.preinst ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/hbase/hbase.preinst b/bigtop-packages/src/deb/hbase/hbase.preinst index 3c68f76..4e4a9ea 100644 --- a/bigtop-packages/src/deb/hbase/hbase.preinst +++ b/bigtop-packages/src/deb/hbase/hbase.preinst @@ -32,11 +32,12 @@ set -e case "$1" in install|upgrade) + getent group hbase >/dev/null || groupadd -r hbase if ! getent passwd hbase >/dev/null; then # Adding system user: hbase. adduser \ --system \ - --group \ + --ingroup hbase \ --home /var/run/hbase \ --gecos "HBase User" \ --shell /bin/bash \ http://git-wip-us.apache.org/repos/asf/bigtop/blob/596877c3/bigtop-packages/src/deb/hive/hive.preinst ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/hive/hive.preinst b/bigtop-packages/src/deb/hive/hive.preinst index f87c85b..db807fe 100644 --- a/bigtop-packages/src/deb/hive/hive.preinst +++ b/bigtop-packages/src/deb/hive/hive.preinst @@ -23,11 +23,12 @@ set -e case "$1" in install|upgrade) + getent group hive >/dev/null || groupadd -r hive if ! getent passwd hive >/dev/null; then # Adding system user: hive. adduser \ --system \ - --group \ + --ingroup hive \ --home /var/lib/hive \ --gecos "Hive User" \ --shell /bin/false \ http://git-wip-us.apache.org/repos/asf/bigtop/blob/596877c3/bigtop-packages/src/deb/hue/hue-common.preinst ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/hue/hue-common.preinst b/bigtop-packages/src/deb/hue/hue-common.preinst index 0641767..28242ea 100644 --- a/bigtop-packages/src/deb/hue/hue-common.preinst +++ b/bigtop-packages/src/deb/hue/hue-common.preinst @@ -32,11 +32,12 @@ set -e USER=hue case "$1" in install|upgrade) + getent group $USER >/dev/null || groupadd -r $USER if ! getent passwd $USER >/dev/null; then adduser \ --system \ --disabled-login \ - --group \ + --ingroup $USER \ --home /usr/lib/hue \ --gecos "Hue daemon" \ $USER >/dev/null http://git-wip-us.apache.org/repos/asf/bigtop/blob/596877c3/bigtop-packages/src/deb/ignite-hadoop/ignite-hadoop.preinst ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/ignite-hadoop/ignite-hadoop.preinst b/bigtop-packages/src/deb/ignite-hadoop/ignite-hadoop.preinst index b3b7db9..2623c28 100644 --- a/bigtop-packages/src/deb/ignite-hadoop/ignite-hadoop.preinst +++ b/bigtop-packages/src/deb/ignite-hadoop/ignite-hadoop.preinst @@ -32,11 +32,12 @@ set -e case "$1" in install|upgrade) + getent group ignite >/dev/null || groupadd -r ignite if ! getent passwd ignite >/dev/null; then # Adding system user: ignite. adduser \ --system \ - --group \ + --ingroup ignite \ --home /var/run/ignite-hadoop \ --gecos "Ignite User" \ --shell /bin/bash \ http://git-wip-us.apache.org/repos/asf/bigtop/blob/596877c3/bigtop-packages/src/deb/oozie/oozie.preinst ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/oozie/oozie.preinst b/bigtop-packages/src/deb/oozie/oozie.preinst index 8a74e9c..a5f8d72 100644 --- a/bigtop-packages/src/deb/oozie/oozie.preinst +++ b/bigtop-packages/src/deb/oozie/oozie.preinst @@ -32,12 +32,13 @@ set -e case "$1" in install|upgrade) + getent group oozie >/dev/null || groupadd -r oozie if ! getent passwd oozie >/dev/null; then # Adding system user: oozie. adduser \ --system \ --disabled-login \ - --group \ + --ingroup oozie \ --home /var/lib/oozie \ --gecos "Oozie User" \ --shell /bin/false \ http://git-wip-us.apache.org/repos/asf/bigtop/blob/596877c3/bigtop-packages/src/deb/phoenix/phoenix.preinst ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/phoenix/phoenix.preinst b/bigtop-packages/src/deb/phoenix/phoenix.preinst index f3174ca..24fe06d 100644 --- a/bigtop-packages/src/deb/phoenix/phoenix.preinst +++ b/bigtop-packages/src/deb/phoenix/phoenix.preinst @@ -23,12 +23,13 @@ set -e case "$1" in install|upgrade) - if ! getent passwd phenix >/dev/null; then - # Adding system user: phenix. + getent group phoenix >/dev/null || groupadd -r phoenix + if ! getent passwd phoenix >/dev/null; then + # Adding system user: phoenix. adduser \ --system \ - --group \ - --home /var/lib/phenix \ + --ingroup phoenix \ + --home /var/lib/phoenix \ --gecos "Phoenix User" \ --shell /bin/false \ phoenix >/dev/null http://git-wip-us.apache.org/repos/asf/bigtop/blob/596877c3/bigtop-packages/src/deb/solr/solr.preinst ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/solr/solr.preinst b/bigtop-packages/src/deb/solr/solr.preinst index 1c2ad0f..68ad417 100644 --- a/bigtop-packages/src/deb/solr/solr.preinst +++ b/bigtop-packages/src/deb/solr/solr.preinst @@ -32,11 +32,12 @@ set -e case "$1" in install|upgrade) + getent group solr >/dev/null || groupadd -r solr if ! getent passwd solr >/dev/null; then # Adding system user: solr . adduser \ --system \ - --group \ + --ingroup solr \ --home /var/lib/solr \ --gecos "Solr" \ --shell /bin/false \ http://git-wip-us.apache.org/repos/asf/bigtop/blob/596877c3/bigtop-packages/src/deb/spark/spark-core.preinst ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/spark/spark-core.preinst b/bigtop-packages/src/deb/spark/spark-core.preinst index ea83e68..d0b716f 100644 --- a/bigtop-packages/src/deb/spark/spark-core.preinst +++ b/bigtop-packages/src/deb/spark/spark-core.preinst @@ -32,11 +32,12 @@ set -e case "$1" in install|upgrade) + getent group spark >/dev/null || groupadd -r spark if ! getent passwd spark >/dev/null; then # Adding system user: spark . adduser \ --system \ - --group \ + --ingroup spark \ --home /var/lib/spark \ --gecos "Spark" \ --shell /bin/false \ http://git-wip-us.apache.org/repos/asf/bigtop/blob/596877c3/bigtop-packages/src/deb/spark1/spark-core.preinst ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/spark1/spark-core.preinst b/bigtop-packages/src/deb/spark1/spark-core.preinst index ea83e68..d0b716f 100644 --- a/bigtop-packages/src/deb/spark1/spark-core.preinst +++ b/bigtop-packages/src/deb/spark1/spark-core.preinst @@ -32,11 +32,12 @@ set -e case "$1" in install|upgrade) + getent group spark >/dev/null || groupadd -r spark if ! getent passwd spark >/dev/null; then # Adding system user: spark . adduser \ --system \ - --group \ + --ingroup spark \ --home /var/lib/spark \ --gecos "Spark" \ --shell /bin/false \ http://git-wip-us.apache.org/repos/asf/bigtop/blob/596877c3/bigtop-packages/src/deb/sqoop/sqoop.preinst ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/sqoop/sqoop.preinst b/bigtop-packages/src/deb/sqoop/sqoop.preinst index 56d7e73..1477d5c 100644 --- a/bigtop-packages/src/deb/sqoop/sqoop.preinst +++ b/bigtop-packages/src/deb/sqoop/sqoop.preinst @@ -32,11 +32,12 @@ set -e case "$1" in install|upgrade) + getent group sqoop >/dev/null || groupadd -r sqoop if ! getent passwd sqoop >/dev/null; then # Adding system user: sqoop . adduser \ --system \ - --group \ + --ingroup sqoop \ --home /var/lib/sqoop \ --gecos "Sqoop User" \ --shell /bin/false \ http://git-wip-us.apache.org/repos/asf/bigtop/blob/596877c3/bigtop-packages/src/deb/tajo/tajo.preinst ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/tajo/tajo.preinst b/bigtop-packages/src/deb/tajo/tajo.preinst index ee7a794..63d7596 100644 --- a/bigtop-packages/src/deb/tajo/tajo.preinst +++ b/bigtop-packages/src/deb/tajo/tajo.preinst @@ -32,11 +32,12 @@ set -e case "$1" in install|upgrade) + getent group tajo >/dev/null || groupadd -r tajo if ! getent passwd tajo >/dev/null; then # Adding system user: tajo . adduser \ --system \ - --group \ + --ingroup tajo \ --home /var/lib/tajo \ --gecos "Tajo" \ --shell /bin/false \ http://git-wip-us.apache.org/repos/asf/bigtop/blob/596877c3/bigtop-packages/src/deb/zeppelin/zeppelin.preinst ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/zeppelin/zeppelin.preinst b/bigtop-packages/src/deb/zeppelin/zeppelin.preinst index 6434c1a..aa19763 100644 --- a/bigtop-packages/src/deb/zeppelin/zeppelin.preinst +++ b/bigtop-packages/src/deb/zeppelin/zeppelin.preinst @@ -32,11 +32,12 @@ set -e case "$1" in install|upgrade) + getent group zeppelin >/dev/null || groupadd -r zeppelin if ! getent passwd zeppelin >/dev/null; then # Adding system user: zeppelin . adduser \ --system \ - --group \ + --ingroup zeppelin \ --home /var/lib/zeppelin \ --gecos "Zeppelin" \ --shell /bin/false \ http://git-wip-us.apache.org/repos/asf/bigtop/blob/596877c3/bigtop-packages/src/deb/zookeeper/zookeeper.preinst ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/zookeeper/zookeeper.preinst b/bigtop-packages/src/deb/zookeeper/zookeeper.preinst index 3183a51..9886062 100644 --- a/bigtop-packages/src/deb/zookeeper/zookeeper.preinst +++ b/bigtop-packages/src/deb/zookeeper/zookeeper.preinst @@ -32,11 +32,12 @@ set -e case "$1" in install|upgrade) + getent group zookeeper >/dev/null || groupadd -r zookeeper if ! getent passwd zookeeper >/dev/null; then # Adding system user: zookeeper . adduser \ --system \ - --group \ + --ingroup zookeeper \ --home /var/lib/zookeeper \ --gecos "ZooKeeper User" \ --shell /bin/false \
