Updated Branches: refs/heads/master ea94ffbff -> d8713cd79
A few small changes as a result of additional feedback review Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/d8713cd7 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/d8713cd7 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/d8713cd7 Branch: refs/heads/master Commit: d8713cd79222c2fc135fe84f050a892b468e09af Parents: 5f11950 Author: Roman Shaposhnik <[email protected]> Authored: Tue Dec 4 15:58:04 2012 -0800 Committer: Roman Shaposhnik <[email protected]> Committed: Tue Dec 4 15:58:04 2012 -0800 ---------------------------------------------------------------------- bigtop-packages/src/common/oozie/install_oozie.sh | 4 ++-- .../src/main/resources/apt/package_data.xml | 2 +- .../src/main/resources/urpmi/package_data.xml | 2 +- .../src/main/resources/yum/package_data.xml | 2 +- .../src/main/resources/zypper/package_data.xml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/d8713cd7/bigtop-packages/src/common/oozie/install_oozie.sh ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/oozie/install_oozie.sh b/bigtop-packages/src/common/oozie/install_oozie.sh index a762419..1bd8cfb 100755 --- a/bigtop-packages/src/common/oozie/install_oozie.sh +++ b/bigtop-packages/src/common/oozie/install_oozie.sh @@ -1,5 +1,5 @@ #!/bin/sh -set -x +set -ex # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with @@ -161,7 +161,7 @@ for file in ooziedb.sh oozied.sh oozie-sys.sh ; do done install -d -m 0755 ${CONF_DIR} -cp ${BUILD_DIR}/conf/* ${CONF_DIR} +cp -r ${BUILD_DIR}/conf/* ${CONF_DIR} sed -i -e '/oozie.service.HadoopAccessorService.hadoop.configurations/,/<\/property>/s#<value>\*=hadoop-conf</value>#<value>*=/etc/hadoop/conf</value>#g' \ ${CONF_DIR}/oozie-site.xml # FIXME: OOZIE-1089, MAPREDUCE-4820 http://git-wip-us.apache.org/repos/asf/bigtop/blob/d8713cd7/bigtop-packages/src/rpm/crunch/RPMS/.gitignore ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/crunch/RPMS/.gitignore b/bigtop-packages/src/rpm/crunch/RPMS/.gitignore new file mode 100644 index 0000000..e69de29 http://git-wip-us.apache.org/repos/asf/bigtop/blob/d8713cd7/bigtop-tests/test-artifacts/package/src/main/resources/apt/package_data.xml ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-artifacts/package/src/main/resources/apt/package_data.xml b/bigtop-tests/test-artifacts/package/src/main/resources/apt/package_data.xml index 4701640..8ed6ebe 100644 --- a/bigtop-tests/test-artifacts/package/src/main/resources/apt/package_data.xml +++ b/bigtop-tests/test-artifacts/package/src/main/resources/apt/package_data.xml @@ -19,7 +19,7 @@ <flume> <users> <flume> - <home>/var/run/flume</home> + <home>/var/lib/flume</home> <descr>Flume User</descr> <shell>/bin/false</shell> </flume> http://git-wip-us.apache.org/repos/asf/bigtop/blob/d8713cd7/bigtop-tests/test-artifacts/package/src/main/resources/urpmi/package_data.xml ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-artifacts/package/src/main/resources/urpmi/package_data.xml b/bigtop-tests/test-artifacts/package/src/main/resources/urpmi/package_data.xml index 456d9d3..27ebe0e 100644 --- a/bigtop-tests/test-artifacts/package/src/main/resources/urpmi/package_data.xml +++ b/bigtop-tests/test-artifacts/package/src/main/resources/urpmi/package_data.xml @@ -754,7 +754,7 @@ <flume> <users> <flume> - <home>/var/run/flume</home> + <home>/var/lib/flume</home> <descr>Flume</descr> <shell>/sbin/nologin</shell> </flume> http://git-wip-us.apache.org/repos/asf/bigtop/blob/d8713cd7/bigtop-tests/test-artifacts/package/src/main/resources/yum/package_data.xml ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-artifacts/package/src/main/resources/yum/package_data.xml b/bigtop-tests/test-artifacts/package/src/main/resources/yum/package_data.xml index 96906d6..a0ac0f7 100644 --- a/bigtop-tests/test-artifacts/package/src/main/resources/yum/package_data.xml +++ b/bigtop-tests/test-artifacts/package/src/main/resources/yum/package_data.xml @@ -29,7 +29,7 @@ <flume> <users> <flume> - <home>/var/run/flume</home> + <home>/var/lib/flume</home> <descr>Flume</descr> <shell>/sbin/nologin</shell> </flume> http://git-wip-us.apache.org/repos/asf/bigtop/blob/d8713cd7/bigtop-tests/test-artifacts/package/src/main/resources/zypper/package_data.xml ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-artifacts/package/src/main/resources/zypper/package_data.xml b/bigtop-tests/test-artifacts/package/src/main/resources/zypper/package_data.xml index 66c1939..3e6eeaf 100644 --- a/bigtop-tests/test-artifacts/package/src/main/resources/zypper/package_data.xml +++ b/bigtop-tests/test-artifacts/package/src/main/resources/zypper/package_data.xml @@ -29,7 +29,7 @@ <flume> <users> <flume> - <home>/var/run/flume</home> + <home>/var/lib/flume</home> <descr>Flume</descr> <shell>/sbin/nologin</shell> </flume>
