From 4615877951129e2d8c8a3fdad5c6914d88de6cb4 Mon Sep 17 00:00:00 2001
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Tue, 1 Aug 2017 07:48:21 +0200
Subject: [PATCH] templates/opensuse: fix tumbleweed software selection

tumbleweed needs a newer version for a few packages, namely:
* liblua5_3
* bncurses6
* breadline7

As Leap it also has no dhcpd, but udhcp which gets pulled in already.
Further iproute2 and net-tools need manual instalation.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
 templates/lxc-opensuse.in | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/templates/lxc-opensuse.in b/templates/lxc-opensuse.in
index f4a4564e9..9f3a827be 100644
--- a/templates/lxc-opensuse.in
+++ b/templates/lxc-opensuse.in
@@ -162,10 +162,10 @@ download_opensuse()
     cat > $cache/partial-$arch-packages/opensuse.conf << EOF
 Preinstall: aaa_base bash coreutils diffutils
 Preinstall: filesystem fillup glibc grep insserv-compat perl-base
-Preinstall: libbz2-1 libncurses5 pam
-Preinstall: permissions libreadline6 rpm sed tar libz1 libselinux1
+Preinstall: libbz2-1 pam
+Preinstall: permissions rpm sed tar libz1 libselinux1
 Preinstall: liblzma5 libcap2 libacl1 libattr1
-Preinstall: libpopt0 libelf1 liblua5_1
+Preinstall: libpopt0 libelf1
 Preinstall: libpcre1
 
 RunScripts: aaa_base
@@ -178,7 +178,7 @@ Support: iputils
 Support: udev
 Support: netcfg
 Support: hwinfo insserv-compat module-init-tools openSUSE-release openssh
-Support: pwdutils rpcbind sysconfig
+Support: pwdutils sysconfig
 
 Ignore: rpm:suse-build-key,build-key
 Ignore: systemd:systemd-presets-branding
@@ -189,16 +189,21 @@ EOF
 	echo "Support: python3-base" >> $cache/partial-$arch-packages/opensuse.conf
     fi
 
-    # 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
+    if [[ $DISTRO == "tumbleweed" ]]; then
+	echo "Preinstall: liblua5_3 libncurses6 libreadline7" >> $cache/partial-$arch-packages/opensuse.conf
+    else
+	echo "Preinstall: liblua5_1 libncurses5 libreadline6" >> $cache/partial-$arch-packages/opensuse.conf
+	echo "Support: rpcbind" >> $cache/partial-$arch-packages/opensuse.conf
     fi
 
-    # Leap doesn't seem to have iproute2 utils installed
-    if [[ $DISTRO == "leap/4"* ]]
-    then
-    echo "Support: net-tools iproute2" >> $cache/partial-$arch-packages/opensuse.conf
+    # dhcpcd is not in the default repos since Leap 42.1, neither in tumbleweed
+    if [[ $DISTRO != "leap/4"* ]] && [[ $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
+        echo "Support: net-tools iproute2" >> $cache/partial-$arch-packages/opensuse.conf
     fi
 
     if [ "$arch" = "i686" ]; then
-- 
2.47.3