From 211ee5b043c167a111e591fc4d42c342646fe372 Mon Sep 17 00:00:00 2001 From: Matt Coddington Date: Wed, 25 Jan 2012 23:11:59 -0500 Subject: [PATCH] adding support for amazon linux --- conf/explorer/os | 5 +++++ conf/explorer/os_version | 3 +++ conf/type/__package/manifest | 2 +- conf/type/__package_yum/gencode-remote | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/conf/explorer/os b/conf/explorer/os index 1aafb468..a7eebb8a 100755 --- a/conf/explorer/os +++ b/conf/explorer/os @@ -75,6 +75,11 @@ if [ -f /etc/cdist-preos ]; then exit 0 fi +if grep -q ^Amazon /etc/system-release 2>/dev/null; then + echo amazon + exit 0 +fi + uname_s="$(uname -s)" # Assume there is no tr on the client -> do lower case ourselves diff --git a/conf/explorer/os_version b/conf/explorer/os_version index ef80e8fc..73d3ecd7 100755 --- a/conf/explorer/os_version +++ b/conf/explorer/os_version @@ -23,6 +23,9 @@ # case "$($__explorer/os)" in + amazon) + cat /etc/system-release + ;; archlinux) # empty, but well... cat /etc/arch-release diff --git a/conf/type/__package/manifest b/conf/type/__package/manifest index 48818dd8..f344cff7 100755 --- a/conf/type/__package/manifest +++ b/conf/type/__package/manifest @@ -33,7 +33,7 @@ else archlinux) type="pacman" ;; debian|ubuntu) type="apt" ;; gentoo) type="emerge" ;; - fedora|redhat|centos) type="yum" ;; + fedora|redhat|centos|amazon) type="yum" ;; *) echo "Don't know how to manage packages on: $os" >&2 exit 1 diff --git a/conf/type/__package_yum/gencode-remote b/conf/type/__package_yum/gencode-remote index e43712f8..b24ed220 100755 --- a/conf/type/__package_yum/gencode-remote +++ b/conf/type/__package_yum/gencode-remote @@ -29,7 +29,7 @@ fi state="$(cat "$__object/parameter/state")" -if grep -q -E "(centos|redhat)" "$__global/explorer/os"; then +if grep -q -E "(centos|redhat|amazon)" "$__global/explorer/os"; then opts="-y --quiet" else opts="--assumeyes --quiet"