mirror of
https://github.com/lxc/lxc-templates.git
synced 2026-09-19 06:41:30 +00:00
templates: opensuse: Drop support for EOL distributions
All releases prior to 42.X have reached EOL so we can drop these codepaths in order to simplify the code. This also fixes an indentation issue. Signed-off-by: Markos Chandras <mchandras@suse.de>
This commit is contained in:
@@ -148,13 +148,9 @@ download_opensuse()
|
||||
fi
|
||||
zypper --quiet --root $cache/partial-$arch-packages --non-interactive ar "$oss_repo_url" repo-oss || return 1
|
||||
|
||||
update_repo_url="http://download.opensuse.org/update/$DISTRO/repo/oss"
|
||||
# Leap update repos were rearranged
|
||||
if [[ $DISTRO == "leap/4"* ]] || [[ $DISTRO == "leap/1"* ]]; then
|
||||
update_repo_url="http://download.opensuse.org/update/$DISTRO/oss/"
|
||||
fi
|
||||
# tumbleweed has no update repo
|
||||
if [[ $DISTRO != "tumbleweed" ]]; then
|
||||
update_repo_url="http://download.opensuse.org/update/$DISTRO/oss/"
|
||||
zypper --quiet --root $cache/partial-$arch-packages --non-interactive ar "$update_repo_url" update || return 1
|
||||
fi
|
||||
|
||||
@@ -181,16 +177,12 @@ Support: udev
|
||||
Support: netcfg
|
||||
Support: hwinfo insserv-compat module-init-tools openSUSE-release openssh
|
||||
Support: pwdutils sysconfig
|
||||
Support: net-tools iproute2
|
||||
|
||||
Ignore: rpm:suse-build-key,build-key
|
||||
Ignore: systemd:systemd-presets-branding
|
||||
EOF
|
||||
|
||||
if [ $DISTRO = "13.2" ]
|
||||
then
|
||||
echo "Support: python3-base" >> $cache/partial-$arch-packages/opensuse.conf
|
||||
fi
|
||||
|
||||
if [[ $DISTRO == "tumbleweed" ]]; then
|
||||
echo "Preinstall: liblua5_3 libncurses6 libreadline7" >> $cache/partial-$arch-packages/opensuse.conf
|
||||
else
|
||||
@@ -198,16 +190,6 @@ EOF
|
||||
echo "Support: rpcbind" >> $cache/partial-$arch-packages/opensuse.conf
|
||||
fi
|
||||
|
||||
# dhcpcd is not in the default repos since Leap 42.1, neither in tumbleweed
|
||||
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 == "leap/1"* ]] || [[ $DISTRO == "tumbleweed" ]]; then
|
||||
echo "Support: net-tools iproute2" >> $cache/partial-$arch-packages/opensuse.conf
|
||||
fi
|
||||
|
||||
if [ "$arch" = "i686" ]; then
|
||||
mkdir -p $cache/partial-$arch-packages/var/cache/zypp/packages/repo-oss/suse/i686/
|
||||
for i in "$cache/partial-$arch-packages/var/cache/zypp/packages/repo-oss/suse/i586/*" ; do
|
||||
|
||||
Reference in New Issue
Block a user