Anaconda-devel February 2017

anaconda-devel@lists.stg.fedoraproject.org

3 participants
4 discussions

default kickstart configuration (beyond interactive-defaults.ks)
by Colin Walters 15 Sep '17

15 Sep '17

I'd like to fix: https://pagure.io/atomic-wg/issue/226 Right now for Atomic Host, we embed the ostree content inside the squashfs, with the goal that users of the ISO don't have to hit the network. We hook bits into interactive-defaults.ks; see this change for how it works: https://pagure.io/fedora-lorax-templates/c/e34c371501d6eac75925aae86bd737c8… However, if one wants to then extract the ISO to do a kickstart install, the user must repeat the `ostreesetup` bits: https://lists.fedoraproject.org/archives/list/cloud@lists.fedoraproject.org… Specifically from his attachment: ostreesetup --osname="fedora-atomic" --remote="fedora-atomic" --url="file:////run/install/repo/content/repo" --ref="fedora-atomic/25/x86_64/docker-host" --nogpg which is really internal implementation details that I'd like the ability to change without breaking people's kickstarts, and conversely not require them to specify by default. Are there any facilities today for a "default kickstart" like /usr/share/anaconda/interactive-defaults.ks, except not just interactive?

2 4

[PATCH] Perform recursive copying of driver disk RPM repo contents
by Eugene Syromiatnikov 28 Feb '17

28 Feb '17

Commit anaconda-25.20-1-100-ge0e86f4 introduced a new way of copying RPM repository data from a driver disk, which apparently is not recursive. Since repository metadata is stored in a separate directory "repodata", this now produces a warning like this: DD: WARNING: DD repo content not a file: /media/DD-1/rpms/x86_64/repodata and skips repodata directory entirely. Luckily, it is generated later by the code in pyanaconda.packaging,PackagePayload.addDriverRepos(). Unfortunately, test case was also written in assumption that repodata is just a file and not a directory, so it hasn't caught it. Resolves: #rhbz1425760 * dracut/driver_updates.py (save_repo): Implement recursive copying. * tests/dracut_tests/test_driver_updates.py (makerepodata): New function for populating fake repo metadata. (TestSaveRepo.test_folder_repo): Update test in order to check for the case of repodata being a directory. --- dracut/driver_updates.py | 17 ++++++++++------- tests/dracut_tests/test_driver_updates.py | 16 ++++++++++++++-- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/dracut/driver_updates.py b/dracut/driver_updates.py index 3c0b714..488fe29 100755 --- a/dracut/driver_updates.py +++ b/dracut/driver_updates.py @@ -272,13 +272,16 @@ def save_repo(repo, target="/run/install"): if os.path.isfile(repo): shutil.copy2(repo, newdir) elif os.path.isdir(repo): - for item in os.listdir(repo): - item_path = os.path.join(repo, item) - if os.path.isfile(item_path): - log.debug("copying %s to %s", item_path, newdir) - shutil.copy2(item_path, newdir) - else: - log.warning("DD repo content not a file: %s", item_path) + for root, dirs, files in os.walk(repo): + dest_path = os.path.join(newdir, os.path.relpath(root, repo)) + for file in files: + item_path = os.path.join(repo, root, file) + log.debug("copying %s to %s", item_path, dest_path) + shutil.copy2(item_path, dest_path) + for dir in dirs: + item_path = os.path.join(dest_path, dir) + log.debug("creating %s", item_path) + os.mkdir(item_path) else: log.error("ERROR: DD repository needs to be a file or a directory: %s", repo) diff --git a/tests/dracut_tests/test_driver_updates.py b/tests/dracut_tests/test_driver_updates.py index 55120c9..3f1fb30 100644 --- a/tests/dracut_tests/test_driver_updates.py +++ b/tests/dracut_tests/test_driver_updates.py @@ -250,6 +250,14 @@ def makerepo(topdir, desc=None): makedir(topdir+'/rpms/'+ARCH) +def makerepodata(topdir): + makedir(topdir + '/repodata/') + makefile(topdir + '/repodata/repomd.xml') + makefile(topdir + '/repodata/filelists.xml.gz') + makefile(topdir + '/repodata/primary.xml.gz') + makefile(topdir + '/repodata/other.xml.gz') + + class TestFindRepos(FileTestCaseBase): def test_basic(self): """find_repos: return RPM dir if a valid repo is found""" @@ -272,12 +280,16 @@ class TestSaveRepo(FileTestCaseBase): """save_repo: copies directory contents to /run/install/DD-X""" makerepo(self.srcdir) repo = find_repos(self.srcdir)[0] - makefile(repo + '/repodata') + makerepodata(repo) makefile(repo + '/fake-something1.rpm') makefile(repo + '/fake-something2.rpm') makefile(repo + '/fake-something3.rpm') saved = save_repo(repo, target=self.destdir) - expected_files = set(["fake-something1.rpm", "fake-something2.rpm", "fake-something3.rpm", "repodata"]) + expected_files = set(["fake-something1.rpm", "fake-something2.rpm", + "fake-something3.rpm", "repodata/repomd.xml", + "repodata/filelists.xml.gz", + "repodata/primary.xml.gz", + "repodata/other.xml.gz"]) self.assertEqual(set(listfiles(saved)), expected_files) self.assertEqual(saved, os.path.join(self.destdir, "DD-1")) -- 2.1.4

2 1

[PATCH] Fix a typo in an error message
by Eugene Syromiatnikov 24 Feb '17

24 Feb '17

"DD repository needs to be a file file or a directory: %s" contains double "file". * dracut/driver_updates.py (save_repo): Fix word doubling typo in message. --- dracut/driver_updates.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dracut/driver_updates.py b/dracut/driver_updates.py index c5f2cec..3c0b714 100755 --- a/dracut/driver_updates.py +++ b/dracut/driver_updates.py @@ -280,7 +280,8 @@ def save_repo(repo, target="/run/install"): else: log.warning("DD repo content not a file: %s", item_path) else: - log.error("ERROR: DD repository needs to be a file file or a directory: %s", repo) + log.error("ERROR: DD repository needs to be a file or a directory: %s", + repo) return newdir def extract_drivers(drivers=None, repos=None, outdir="/updates", -- 2.1.4

1 0

[PATCH] Bump required pykickstart version
by Eugene Syromiatnikov 24 Feb '17

24 Feb '17

The commit anaconda-25.20-1-132-gfa08a9d introduced usage of commands.displaymode.F26_DisplayMode, which appeared in pykickstart only in r3.4-1-99-g2e9246a (3.5 being the first release with this class being provided). * anaconda.spec.in: Update pykickstartver definition. --- anaconda.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anaconda.spec.in b/anaconda.spec.in index 2e3ae0c..6ec8c81 100644 --- a/anaconda.spec.in +++ b/anaconda.spec.in @@ -19,7 +19,7 @@ Source0: %{name}-%{version}.tar.bz2 # match the requires versions of things). %define gettextver 0.19.8 -%define pykickstartver 2.32-1 +%define pykickstartver 3.5-1 %define dnfver 2.0.0 %define partedver 1.8.1 %define pypartedver 2.5-2 -- 2.1.4

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Anaconda-devel February 2017