From: Terzeus S. Dominguez <zeus@dmgznet.com>
Date: Mon, 12 Dec 2016 16:56:35 +0000 (+0800)
Subject: Update openSUSE template for Leap 42.2
X-Git-Tag: lxc-2.1.0~224^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76a8633817792fe74828ca0b6e50734e265afac9;p=thirdparty%2Flxc.git

Update openSUSE template for Leap 42.2

Aside from adding a 42.2 option, $DISTRO comparisons for Leap have been
changed [ exp ] => [[ exp ]] to accomodate pattern matching for future
releases.

Signed-off-by: Terzeus S. Dominguez <tsdmgz@gmail.com>
---

diff --git a/templates/lxc-opensuse.in b/templates/lxc-opensuse.in
index ad75e102d..a2b984f89 100644
--- a/templates/lxc-opensuse.in
+++ b/templates/lxc-opensuse.in
@@ -145,7 +145,7 @@ download_opensuse()
     mkdir -p "$cache/partial-$arch-packages"
     zypper --quiet --root $cache/partial-$arch-packages --non-interactive ar http://download.opensuse.org/distribution/$DISTRO/repo/oss/ repo-oss || return 1
     # Leap update repos were rearranged
-    if [ $DISTRO == "leap/42.1" ]; then
+    if [[ $DISTRO == "leap/4"* ]]; then
         zypper --quiet --root $cache/partial-$arch-packages --non-interactive ar http://download.opensuse.org/update/$DISTRO/oss/ update || return 1
     else
         zypper --quiet --root $cache/partial-$arch-packages --non-interactive ar http://download.opensuse.org/update/$DISTRO/ update || return 1
@@ -182,14 +182,14 @@ EOF
 	echo "Support: python3-base" >> $cache/partial-$arch-packages/opensuse.conf
     fi
 
-    # dhcpcd is not in the default repos with Leap 42.1
-    if [ $DISTRO != "leap/42.1" ]
+    # dhcpcd is not in the default repos since Leap 42.1
+    if [[ $DISTRO != "leap/4"* ]]
     then
     echo "Support: dhcpcd" >> $cache/partial-$arch-packages/opensuse.conf
     fi
 
     # Leap doesn't seem to have iproute2 utils installed
-    if [ $DISTRO == "leap/42.1" ]
+    if [[ $DISTRO == "leap/4"* ]]
     then
     echo "Support: net-tools iproute2" >> $cache/partial-$arch-packages/opensuse.conf
     fi
@@ -210,11 +210,13 @@ EOF
 
     CLEAN_BUILD=1 BUILD_ARCH="$arch" BUILD_ROOT="$cache/partial-$arch" BUILD_DIST="$cache/partial-$arch-packages/opensuse.conf" PATH="$PATH:$BUILD_DIR" $BUILD_DIR/init_buildsystem  --clean --configdir $BUILD_DIR/configs --cachedir $cache/partial-$arch-cache --repository $cache/partial-$arch-packages/var/cache/zypp/packages/repo-oss/suse/$arch --repository $cache/partial-$arch-packages/var/cache/zypp/packages/repo-oss/suse/noarch --repository $cache/partial-$arch-packages/var/cache/zypp/packages/update/$arch --repository $cache/partial-$arch-packages/var/cache/zypp/packages/update/noarch || return 1
     chroot $cache/partial-$arch /usr/bin/zypper --quiet --non-interactive ar http://download.opensuse.org/distribution/$DISTRO/repo/oss repo-oss || return 1
-    if [ $DISTRO == "leap/42.1" ]; then
+
+    if [[ $DISTRO == "leap/4"* ]]; then
         chroot $cache/partial-$arch /usr/bin/zypper --quiet --non-interactive ar http://download.opensuse.org/update/$DISTRO/oss update || return 1
     else
         chroot $cache/partial-$arch /usr/bin/zypper --quiet --non-interactive ar http://download.opensuse.org/update/$DISTRO/ update || return 1
     fi
+
 #   really clean the image
     rm -fr $cache/partial-$arch/{.build,.guessed_dist,.srcfiles*,installed-pkg}
     rm -fr $cache/partial-$arch/dev
@@ -478,6 +480,11 @@ else
 	    DISTRO="leap/42.1"
 	    ;;
 
+        42.2|leap/42.2|422)
+            echo "Selected openSUSE Leap 42.2"
+            DISTRO="leap/42.2"
+            ;; 
+
 	*)
 	    echo "You have chosen an invalid release, quitting..."
 	    exit 1