dracut-nohostonly and dracut-norescue got renamed for dracut >= 030 (#990305)

This commit is contained in:
Harald Hoyer 2013-07-30 14:47:16 +02:00 committed by Brian C. Lane
parent 2ea99b1810
commit 22a36d3a81
7 changed files with 11 additions and 7 deletions

View File

@ -111,7 +111,8 @@ passwd -d root > /dev/null
cat /dev/null > /dev/fstab cat /dev/null > /dev/fstab
11. Don't delete initramfs files from /boot in %post 11. Don't delete initramfs files from /boot in %post
12. Have dracut-norescue, grub-efi, memtest86+ and syslinux in the package list 12. Have grub-efi, memtest86+ and syslinux in the package list
13. Omit dracut-config-rescue from the package list "-dracut-config-rescue"
One drawback to using virt-install is that it pulls the packages from One drawback to using virt-install is that it pulls the packages from
the repo each time you run it. To speed things up you either need a local the repo each time you run it. To speed things up you either need a local

View File

@ -64,7 +64,7 @@ iputils
cloud-init cloud-init
grub grub
dracut-norescue -dracut-config-rescue
%end %end
# more ec2-ify # more ec2-ify

View File

@ -386,5 +386,5 @@ grub2-efi
grub2 grub2
shim shim
syslinux syslinux
dracut-norescue -dracut-config-rescue
%end %end

View File

@ -34,6 +34,7 @@ Requires: util-linux
Requires: xz Requires: xz
Requires: yum Requires: yum
Requires: pykickstart Requires: pykickstart
Requires: dracut >= 030
%if 0%{?fedora} %if 0%{?fedora}
# Fedora specific deps # Fedora specific deps

View File

@ -23,7 +23,8 @@ removefrom ${product.name}-logos /usr/share/plymouth/*
## We also need dracut-shutdown.service and dracut-initramfs-restore to reboot ## We also need dracut-shutdown.service and dracut-initramfs-restore to reboot
removefrom dracut --allbut /usr/lib/dracut/modules.d/30convertfs/convertfs.sh \ removefrom dracut --allbut /usr/lib/dracut/modules.d/30convertfs/convertfs.sh \
/usr/lib/dracut/modules.d/99base/dracut-lib.sh \ /usr/lib/dracut/modules.d/99base/dracut-lib.sh \
/usr/lib/systemd/* /usr/lib/dracut/dracut-initramfs-restore /usr/lib/systemd/* /usr/lib/dracut/modules.d/98systemd/*.service \
/usr/lib/dracut/dracut-initramfs-restore
## we don't run SELinux (not in enforcing, anyway) ## we don't run SELinux (not in enforcing, anyway)
removepkg checkpolicy selinux-policy libselinux-utils removepkg checkpolicy selinux-policy libselinux-utils
## anaconda has its own repo files ## anaconda has its own repo files

View File

@ -43,7 +43,7 @@ installpkg kernel
installpkg plymouth installpkg plymouth
## extra dracut modules ## extra dracut modules
installpkg anaconda-dracut dracut-network dracut-nohostonly dracut-norescue installpkg anaconda-dracut dracut-network dracut-config-generic
## fedup-dracut handles upgrades ## fedup-dracut handles upgrades
installpkg fedup-dracut fedup-dracut-plymouth installpkg fedup-dracut fedup-dracut-plymouth

View File

@ -364,8 +364,9 @@ class KernelInfo(object):
Examine the vmlinuz-* versions and return a list of them Examine the vmlinuz-* versions and return a list of them
Ignore any with -rescue- in them, these are dracut rescue images. Ignore any with -rescue- in them, these are dracut rescue images.
The user shoud add dracut-norescue package to the kickstart to remove them, The user shoud add
but catch it here as well. -dracut-config-rescue
to the kickstart to remove them, but catch it here as well.
""" """
files = os.listdir(self.boot_dir) files = os.listdir(self.boot_dir)
return [f[8:] for f in files if f.startswith("vmlinuz-") \ return [f[8:] for f in files if f.startswith("vmlinuz-") \