diff --git a/.gitignore b/.gitignore index 2e675a0..213f1f9 100644 --- a/.gitignore +++ b/.gitignore @@ -166,3 +166,4 @@ /anaconda-30.8.tar.bz2 /anaconda-30.9.tar.bz2 /anaconda-30.10.tar.bz2 +/anaconda-30.11.tar.bz2 diff --git a/0001-Re-generate-BLS-loader-file-snippets-on-live-install.patch b/0001-Re-generate-BLS-loader-file-snippets-on-live-install.patch deleted file mode 100644 index 6b1eaf4..0000000 --- a/0001-Re-generate-BLS-loader-file-snippets-on-live-install.patch +++ /dev/null @@ -1,80 +0,0 @@ -From e5619c9d094833fd9d256c2c8d1ad22fc43b3b13 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Fri, 9 Nov 2018 14:42:28 -0800 -Subject: [PATCH] Re-generate BLS loader file snippets on live installs - (#1648472) - -Currently, on live installs, the BLS loader snippets that are -part of the live image itself - in /boot/loader/entries - are -simply rsync'ed into the installed system along with everything -else. This is no good in most cases because they point to -`/boot/vmlinuz-(foo)` and `/boot/initramfs-(foo)` (since the -live image itself does not have a separate /boot partition), -whereas most installs will have a separate /boot partition so -the path specified in the config snippet should not include -`/boot`. (The files are also named for the machine ID that was -used during live image generation, which will not be the machine -ID of the installed system; I'm not sure exactly what the -consequences of this are, probably nothing major but it may be -somehow an issue when the kernel is removed, perhaps.) - -To fix this, we should exclude these files from the rsync, and -instead do something to have them re-generated after the rsync -has run. There are a few different ways and places we could do -this, but my choice is to run `kernel-install` in live payload -postInstall. This seems like it should be fairly robust. In -testing it does the job, both BIOS and UEFI installs that I -tested installed cleanly and booted successfully. Note that -`kernel-install` must run *after* `/etc/machine-id` exists in -the install root, or it will bail immediately and do nothing. -Note that at present, the 'Generating rescue image' step in -`install()` actually results in the generation of a machine ID, -so this could be done any time after that, but doing it after -the explicit failsafe machine ID generation in `postInstall()` -seems safest. - -Signed-off-by: Adam Williamson ---- - pyanaconda/payload/livepayload.py | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/pyanaconda/payload/livepayload.py b/pyanaconda/payload/livepayload.py -index 04f7e2b79..2749f540e 100644 ---- a/pyanaconda/payload/livepayload.py -+++ b/pyanaconda/payload/livepayload.py -@@ -48,6 +48,7 @@ from pyanaconda.anaconda_loggers import get_packaging_logger - log = get_packaging_logger() - - from pyanaconda.errors import errorHandler, ERROR_RAISE -+from pyanaconda.flags import flags - from pyanaconda.progress import progressQ - from blivet.size import Size - import blivet.util -@@ -143,6 +144,7 @@ class LiveImagePayload(ImagePayload): - # file system boundaries - args = ["-pogAXtlHrDx", "--exclude", "/dev/", "--exclude", "/proc/", - "--exclude", "/sys/", "--exclude", "/run/", "--exclude", "/boot/*rescue*", -+ "--exclude", "/boot/loader/", "--exclude", "/boot/efi/loader/", - "--exclude", "/etc/machine-id", INSTALL_TREE + "/", util.getSysroot()] - try: - rc = util.execWithRedirect(cmd, args) -@@ -194,9 +196,16 @@ class LiveImagePayload(ImagePayload): - super().postInstall() - - # Make sure the new system has a machine-id, it won't boot without it -+ # (and nor will some of the subsequent commands) - if not os.path.exists(util.getSysroot() + "/etc/machine-id"): -+ log.info("Generating machine ID") - util.execInSysroot("systemd-machine-id-setup", []) - -+ for kernel in self.kernelVersionList: -+ if flags.blscfg: -+ log.info("Regenerating BLS info for %s", kernel) -+ util.execInSysroot("kernel-install", ["add", kernel, "/lib/modules/{0}/vmlinuz".format(kernel)]) -+ - @property - def spaceRequired(self): - return Size(util.getDirSize("/") * 1024) --- -2.19.1 - diff --git a/anaconda.spec b/anaconda.spec index 79946d1..5d5cd19 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -6,8 +6,8 @@ Summary: Graphical system installer Name: anaconda -Version: 30.10 -Release: 2%{?dist} +Version: 30.11 +Release: 1%{?dist} License: GPLv2+ and MIT Group: Applications/System URL: http://fedoraproject.org/wiki/Anaconda @@ -19,9 +19,6 @@ URL: http://fedoraproject.org/wiki/Anaconda # make dist Source0: %{name}-%{version}.tar.bz2 -# Fix Rawhide live image boot fail bug #1648472 -Patch0: 0001-Re-generate-BLS-loader-file-snippets-on-live-install.patch - # Versions of required components (done so we make sure the buildrequires # match the requires versions of things). @@ -254,7 +251,6 @@ runtime on NFS/HTTP/FTP servers or local disks. %prep %setup -q -%patch0 -p1 %build # use actual build-time release number, not tarball creation time release number @@ -357,8 +353,27 @@ update-desktop-database &> /dev/null || : %{_prefix}/libexec/anaconda/dd_* %changelog -* Fri Nov 09 2018 Adam Williamson - 30.10-2 -- Backport PR #1688 to fix Rawhide bug #1648472 +* Mon Nov 19 2018 Martin Kolman - 30.11-1 +- Install grubby-deprecated when using the extlinux bootloader (javierm) +- Remove configurePayload (vponcova) +- Resolve the name conflicts with conf (vponcova) +- Write tests for the target support (vponcova) +- Simplify the code (vponcova) +- Replace the dirInstall flag (vponcova) +- Replace the imageInstall flag (vponcova) +- Configure the installation target (vponcova) +- Write tests for the default partitioning (vponcova) +- Define the default partitioning statically (vponcova) +- Remove l10n_domain from the install classes (vponcova) +- Re-generate BLS loader file snippets on live installs (#1648472) (awilliam) +- Remove the attribute bootloaderTimeoutDefault (vponcova) +- Remove the attribute bootloaderExtraArgs (vponcova) +- Remove the method setPackageSelection (vponcova) +- Remove the setStorageChecker method (vponcova) +- Remove the getBackend method (vponcova) +- Add doc to make a release in a mock environment (jkonecny) +- Support in our scripts creating release in a mock (jkonecny) +- Add dependencies to make a new release to dependency_solver (jkonecny) * Tue Nov 06 2018 Martin Kolman - 30.10-1 - Make the pyanaconda/image.py more pep8 (jkonecny) diff --git a/sources b/sources index 389ab98..48edf58 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (anaconda-30.10.tar.bz2) = f5398c243643efd32d64432364598a88f6304f86eb9b7d90fb936ff66de6f4bb7718c9b8b63c498a9ef5760cc3804ec9241fbbb13a0fea1ee43282f1ed414fd3 +SHA512 (anaconda-30.11.tar.bz2) = be31485f8fc5ed0edb9d727a7e031055d115dbef6375100c4350318d429d714a19bdff698eabded4a1b0166ce2dc89580090c1ef4b9c1f00607c5d36a37ead12