[lxc-devel] [lxc-templates/master] templates: opensuse: Add support for openSUSE Leap 15

[hwoarang on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 492 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20180608/6001f54e/attachment.bin>
-------------- next part --------------
From 2e03efcf6c20badd786013af199025314345747a Mon Sep 17 00:00:00 2001
From: Markos Chandras <mchandras at suse.de>
Date: Fri, 8 Jun 2018 09:19:35 +0100
Subject: [PATCH] templates: opensuse: Add support for openSUSE Leap 15

We add support for the newly released openSUSE Leap 15. Moreover we fix
some indentation issues and also switch the default distro to Leap 15
since 42.1 has been EOL'd long time ago.
---
 templates/lxc-opensuse.in | 43 +++++++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/templates/lxc-opensuse.in b/templates/lxc-opensuse.in
index c2480dd..96891c0 100644
--- a/templates/lxc-opensuse.in
+++ b/templates/lxc-opensuse.in
@@ -150,7 +150,7 @@ download_opensuse()
 
     update_repo_url="http://download.opensuse.org/update/$DISTRO/repo/oss"
     # Leap update repos were rearranged
-    if [[ $DISTRO == "leap/4"* ]]; then
+    if [[ $DISTRO == "leap/4"* ]] || [[ $DISTRO == "leap/1"* ]]; then
         update_repo_url="http://download.opensuse.org/update/$DISTRO/oss/"
     fi
     # tumbleweed has no update repo
@@ -199,12 +199,12 @@ EOF
     fi
 
     # dhcpcd is not in the default repos since Leap 42.1, neither in tumbleweed
-    if [[ $DISTRO != "leap/4"* ]] && [[ $DISTRO != "tumbleweed" ]]; then
+    if [[ $DISTRO != "leap/4"* ]] && [[ $DISTRO != "leap/1"* ]] && [[ $DISTRO != "tumbleweed" ]]; then
         echo "Support: dhcpcd" >> $cache/partial-$arch-packages/opensuse.conf
     fi
 
     # Leap and tumbleweed doesn't seem to have iproute2 utils installed
-    if [[ $DISTRO == "leap/4"* ]] || [[ $DISTRO == "tumbleweed" ]]; then
+    if [[ $DISTRO == "leap/4"* ]] || [[ $DISTRO == "leap/1"* ]] || [[ $DISTRO == "tumbleweed" ]]; then
         echo "Support: net-tools iproute2" >> $cache/partial-$arch-packages/opensuse.conf
     fi
 
@@ -479,8 +479,8 @@ fi
 
 if [ -z "$DISTRO" ]; then
     echo ""
-    echo "No release selected, using openSUSE Leap 42.2"
-    DISTRO="leap/42.2"
+    echo "No release selected, using openSUSE Leap 15.0"
+    DISTRO="leap/15.0"
 else
     echo ""
     case "$DISTRO" in
@@ -492,23 +492,30 @@ else
 	    echo "Selected openSUSE 13.2"
 	    ;;
 
-	42.1|leap/42.1|leap)
+	42.1|leap/42.1|421)
 	    echo "Selected openSUSE Leap 42.1"
 	    DISTRO="leap/42.1"
 	    ;;
 
-        42.2|leap/42.2|422)
-            echo "Selected openSUSE Leap 42.2"
-            DISTRO="leap/42.2"
-            ;;
-        42.3|leap/42.3|423)
-            echo "Selected openSUSE Leap 42.3"
-            DISTRO="leap/42.3"
-            ;;
-        tumbleweed|factory)
-            echo "Selected openSUSE Leap Tumbleweed"
-            DISTRO="tumbleweed"
-            ;;
+    42.2|leap/42.2|422)
+        echo "Selected openSUSE Leap 42.2"
+        DISTRO="leap/42.2"
+        ;;
+
+    42.3|leap/42.3|423)
+        echo "Selected openSUSE Leap 42.3"
+        DISTRO="leap/42.3"
+        ;;
+
+    15.0|leap/15.0|150|leap)
+        echo "Selected openSUSE Leap 15.0"
+        DISTRO="leap/15.0"
+        ;;
+
+    tumbleweed|factory)
+        echo "Selected openSUSE Leap Tumbleweed"
+        DISTRO="tumbleweed"
+        ;;
 
 	*)
 	    echo "You have chosen an invalid release, quitting..."