From 296d869179e3d10c94398f5f7ae2f01e2ea4166d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Sun, 12 Jul 2015 01:33:08 +0200 Subject: [PATCH] anaconda: use kernel-install instead of grubby to regenerate initrd/grub.conf Since we have own hook there, it properly handles Xen. This means we no longer need post scripts in kickstart for that. Conflicts: anaconda/pyanaconda/packaging/__init__.py --- anaconda/pyanaconda/packaging/__init__.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/anaconda/pyanaconda/packaging/__init__.py b/anaconda/pyanaconda/packaging/__init__.py index 8cbeb13..e15f939 100644 --- a/anaconda/pyanaconda/packaging/__init__.py +++ b/anaconda/pyanaconda/packaging/__init__.py @@ -511,7 +511,7 @@ class Payload(object): # prevent boot on some systems def recreateInitrds(self): - """ Recreate the initrds by calling new-kernel-pkg + """ Recreate the initrds by calling kernel-install This needs to be done after all configuration files have been written, since dracut depends on some of them. @@ -521,9 +521,8 @@ class Payload(object): for kernel in self.kernelVersionList: log.info("recreating initrd for %s", kernel) if not flags.imageInstall: - iutil.execInSysroot("new-kernel-pkg", - ["--mkinitrd", "--dracut", - "--depmod", "--update", kernel]) + iutil.execInSysroot("kernel-install", + ["add", kernel, "/boot/vmlinuz-%s" % kernel]) else: # hostonly is not sensible for disk image installations # using /dev/disk/by-uuid/ is necessary due to disk image naming