[lxc-devel] [lxc-templates/master] Adding support for Fedora 28 by adding fedora-gpg-keys

[edgan on Github]

The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxc-templates/pull/4

This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.

=== Description (from pull-request) ===


From 2028e27f4588a4caed27f50fd2b6013bec4c51df Mon Sep 17 00:00:00 2001
From: Nathan Grennan <nathan.gren...@parsable.com>
Date: Fri, 11 May 2018 16:10:22 -0700
Subject: [PATCH] Adding support for Fedora 28 by adding fedora-gpg-keys

---
 templates/lxc-fedora.in | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/templates/lxc-fedora.in b/templates/lxc-fedora.in
index 10b90b1..1faaecc 100644
--- a/templates/lxc-fedora.in
+++ b/templates/lxc-fedora.in
@@ -812,6 +812,13 @@ setup_repositories()
     local release="${3}"
     local mirror="${4}"
 
+    PKGS=(fedora-release-${release} fedora-repos-${release}
+
+    if [ ${release} -ne 26 ]
+    then
+        PKGS[2]=fedora-gpg-keys-${release}
+    fi
+
     # download repository packages if not found in cache
     pushd "${cache}" >/dev/null
     if [ -z "$(ls -1 ./fedora-release-${release}*.noarch.rpm 2>/dev/null)" ] ||
@@ -830,7 +837,7 @@ setup_repositories()
         do
             local release_url="${mirror_url}/Packages/f"
 
-            for pkg in fedora-release-${release} fedora-repos-${release}
+            for pkg in ${PKGS[@]}
             do
                 test -n "$(ls -1 ./${pkg}*.noarch.rpm 2>/dev/null)" && continue
 
@@ -851,28 +858,28 @@ setup_repositories()
                     echo "Error: Package download failed."
                     continue
                 fi
-            done
 
-            # if we have both packages continue
-            if [ -z "$(ls -1 ./fedora-release-${release}*.noarch.rpm 
2>/dev/null)" ] ||
-               [ -z "$(ls -1 ./fedora-repos-${release}*.noarch.rpm 
2>/dev/null)" ]
-            then
-                break
-            fi
+                # if we have the package continue
+                if [ -z "$(ls -1 ./${pkg}*.noarch.rpm 2>/dev/null)" ]
+                then
+                    break
+                fi
+            done
         done
     fi
 
     # copy packages to chroot file system
     if [ -n "${CHROOT_DIR}" ]
     then
-        cp ./fedora-release-${release}*.noarch.rpm "${CHROOT_DIR}" &&
-        cp ./fedora-repos-${release}*.noarch.rpm "${CHROOT_DIR}"
+        for pkg in ${PKGS[@]}
+        do
+            cp ./${pkg}*.noarch.rpm "${CHROOT_DIR}"
+        done
     else
         local pkgdir="${cache}"
     fi
 
-    # use '--nodeps' to work around 'fedora-release-24-*' bash dependency
-    ${CHROOT_CMD}rpm --root "${INSTALL_ROOT}" -ivh --nodeps 
"${pkgdir}"/{fedora-release-${release}*.noarch.rpm,fedora-repos-${release}*.noarch.rpm}
+    ${CHROOT_CMD}rpm --root "${INSTALL_ROOT}" -ivh 
"${pkgdir}"/{fedora-*-${release}*.noarch.rpm}
     local ret=$?
 
     # dnf will take $basearch from host, so force the arch we want
@@ -890,7 +897,7 @@ setup_repositories()
     if [ -n "${CHROOT_DIR}" ]
     then
         # shellcheck disable=SC2086
-        rm -f 
"${CHROOT_DIR}"/{fedora-release-${release}*.noarch.rpm,fedora-repos-${release}*.noarch.rpm}
+        rm -f "${CHROOT_DIR}"/{fedora-*-${release}*.noarch.rpm}
     fi
 
     return 0

_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel