X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=config.lxc%2Fbootcd.pkgs;h=53e7e2df1c4f25d8af01d468d6fba84a926d5b14;hb=1d2e4d6de0b872cacbad8aa2f72b472f34b21d8a;hp=295c4a5dd641642971e14fd49be2bed52ce887f2;hpb=b72c4b7ba65cc4956888cee81f658b3da81edffb;p=build.git

diff --git a/config.lxc/bootcd.pkgs b/config.lxc/bootcd.pkgs
index 295c4a5d..53e7e2df 100644
--- a/config.lxc/bootcd.pkgs
+++ b/config.lxc/bootcd.pkgs
@@ -12,6 +12,12 @@ package: coreutils
 package: iputils
 package: kernel
 package>=f23: kernel-modules kernel-modules-extra
+# f31: building root images with a kernel with kernel-core
+# apparently this requires grubby-deprecated;
+# it might even be safer to install that one 
+# earlier so that we can be sure that grubby-deprecated is there
+# when the kernel-core install scriptlet triggers
+package>=f31: grubby-deprecated kernel-core 
 package>=f24: systemd-udev
 package: bzip2
 package: diffutils
@@ -36,7 +42,9 @@ package: authconfig
 package: hdparm
 package: lvm2
 package: kexec-tools
-package>=f8 package>=centos5: gnupg
+# see myplc/plc.d/gpg
+package<=f29: gnupg
+package>=f31: gnupg1
 package>=sl6: gnupg2
 package: nano
 package: parted