You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by wf...@apache.org on 2015/11/26 19:23:31 UTC

aurora-packaging git commit: Remove `--root` flag in observer start scripts.

Repository: aurora-packaging
Updated Branches:
  refs/heads/master a5551ecaa -> c24040076


Remove `--root` flag in observer start scripts.

The flag was removed in 1b1c70c79a0b4a96263508c5918d6d9d0646f8ec in the
aurora repo and start scripts were updated there but not here.

Bugs closed: AURORA-1338

Reviewed at https://reviews.apache.org/r/40757/


Project: http://git-wip-us.apache.org/repos/asf/aurora-packaging/repo
Commit: http://git-wip-us.apache.org/repos/asf/aurora-packaging/commit/c2404007
Tree: http://git-wip-us.apache.org/repos/asf/aurora-packaging/tree/c2404007
Diff: http://git-wip-us.apache.org/repos/asf/aurora-packaging/diff/c2404007

Branch: refs/heads/master
Commit: c24040076c157c09fe8a83017c4c3035d0dbdd2a
Parents: a5551ec
Author: John Sirois <jo...@gmail.com>
Authored: Thu Nov 26 10:23:25 2015 -0800
Committer: Bill Farner <wf...@apache.org>
Committed: Thu Nov 26 10:23:25 2015 -0800

----------------------------------------------------------------------
 specs/debian/aurora-executor.thermos.init    | 3 +--
 specs/debian/aurora-executor.thermos.upstart | 1 -
 specs/rpm/SOURCES/thermos-observer.sysconfig | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/c2404007/specs/debian/aurora-executor.thermos.init
----------------------------------------------------------------------
diff --git a/specs/debian/aurora-executor.thermos.init b/specs/debian/aurora-executor.thermos.init
index 24a59d2..e5c9401 100755
--- a/specs/debian/aurora-executor.thermos.init
+++ b/specs/debian/aurora-executor.thermos.init
@@ -35,8 +35,7 @@ fi
 
 [ -r /etc/default/thermos ] && . /etc/default/thermos
 
-ARGS="--root=/var/run/thermos
-      --port=${OBSERVER_PORT:-1338}
+ARGS="--port=${OBSERVER_PORT:-1338}
       --log_to_disk=NONE
       --log_to_stderr=google:INFO"
 

http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/c2404007/specs/debian/aurora-executor.thermos.upstart
----------------------------------------------------------------------
diff --git a/specs/debian/aurora-executor.thermos.upstart b/specs/debian/aurora-executor.thermos.upstart
index ffa4f98..7ebe4be 100644
--- a/specs/debian/aurora-executor.thermos.upstart
+++ b/specs/debian/aurora-executor.thermos.upstart
@@ -21,7 +21,6 @@ pre-start exec mkdir -p /var/run/thermos
 script
   [ -r /etc/default/thermos ] && . /etc/default/thermos
   exec start-stop-daemon --start --exec /usr/sbin/thermos_observer -- \
-    --root=/var/run/thermos \
     --port=${OBSERVER_PORT:-1338} \
     --log_to_disk=NONE \
     --log_to_stderr=google:INFO

http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/c2404007/specs/rpm/SOURCES/thermos-observer.sysconfig
----------------------------------------------------------------------
diff --git a/specs/rpm/SOURCES/thermos-observer.sysconfig b/specs/rpm/SOURCES/thermos-observer.sysconfig
index 4bc5430..353cfa3 100644
--- a/specs/rpm/SOURCES/thermos-observer.sysconfig
+++ b/specs/rpm/SOURCES/thermos-observer.sysconfig
@@ -15,7 +15,6 @@
 
 
 OBSERVER_ARGS=(
-  --root=/var/run/thermos
   --port=1338
   --log_to_disk=NONE
   --log_to_stderr=google:INFO