You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by br...@apache.org on 2012/05/07 20:11:31 UTC
git commit: [TS-1098] Make RC script support Amazon EC2 Linux AMI
Review/Test: briang, zwoop, igalic Backport: briang
Updated Branches:
refs/heads/3.0.x 307d0e87b -> 8b4180995
[TS-1098] Make RC script support Amazon EC2 Linux AMI
Review/Test: briang,zwoop,igalic
Backport: briang
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/8b418099
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/8b418099
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/8b418099
Branch: refs/heads/3.0.x
Commit: 8b41809959b0f04c90955a4fbd781e7864fd5a00
Parents: 307d0e8
Author: Brian Geffon <br...@apache.org>
Authored: Mon May 7 11:09:23 2012 -0700
Committer: Brian Geffon <br...@apache.org>
Committed: Mon May 7 11:09:23 2012 -0700
----------------------------------------------------------------------
CHANGES | 2 ++
STATUS | 5 -----
rc/trafficserver.in | 12 ++++++++++++
3 files changed, 14 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8b418099/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 84876ae..0fc3e31 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 3.0.5
+ *) [TS-1098] make rc script support Amazon EC2 linux AMI
+
*) [TS-1185] fix build issues with clang
*) [TS-1116] fix build issues with gcc 4.7
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8b418099/STATUS
----------------------------------------------------------------------
diff --git a/STATUS b/STATUS
index caf1602..4b5021d 100644
--- a/STATUS
+++ b/STATUS
@@ -61,11 +61,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
Jira: https://issues.apache.org/jira/browse/TS-1109
+1: zym, zwoop, igalic
- *) Make RC script support Amazon EC2 Linux AMI
- master SHA: 620d3cc783c330da00cdbe11eb72eddd1e7aff30
- Jira: https://issues.apache.org/jira/browse/TS-1098
- +1: briang,zwoop, igalic
-
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8b418099/rc/trafficserver.in
----------------------------------------------------------------------
diff --git a/rc/trafficserver.in b/rc/trafficserver.in
index 6582984..37ae85f 100644
--- a/rc/trafficserver.in
+++ b/rc/trafficserver.in
@@ -59,6 +59,18 @@ elif [ "$UNAME_S" = "FreeBSD" ]; then
DISTRIB_ID="FreeBSD"
fi
+# We might want to move over to use /etc/system-release for more distros?
+# I know at least Fedora supports it as well.
+if [ "" = "$DISTRIB_ID" -a -e /etc/system-release ]; then
+ case $(cat /etc/system-release) in
+ *Amazon*)
+ DISTRIB_ID="redhat" # Amazon AMI is mostly like RHEL
+ ;;
+ *)
+ ;;
+ esac
+fi
+
# /usr/bin/lsb_release -rd # Ubuntu release & description info
HEAD=/usr/bin/head