From f35ea6baaf1d11c25af6787757f118fd9b898c6d Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 15 Mar 2014 08:57:54 +0000 Subject: [PATCH] Properly detect Oracle Linux. Fixes #335. Fixes #271. --- bootstrap-salt.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 60721b0..5f31540 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -597,7 +597,7 @@ __strip_duplicates() { __sort_release_files() { KNOWN_RELEASE_FILES=$(echo "(arch|centos|debian|ubuntu|fedora|redhat|suse|\ mandrake|mandriva|gentoo|slackware|turbolinux|unitedlinux|lsb|system|\ - os)(-|_)(release|version)" | sed -r 's:[[:space:]]::g') + oracle|os)(-|_)(release|version)" | sed -r 's:[[:space:]]::g') primary_release_files="" secondary_release_files="" # Sort know VS un-known files first @@ -702,6 +702,7 @@ __gather_linux_system_info() { slackware ) n="Slackware" ;; turbolinux ) n="TurboLinux" ;; unitedlinux ) n="UnitedLinux" ;; + oracle ) n="Oracle Linux" ;; system ) while read -r line; do [ "${n}x" != "systemx" ] && break