diff options
| author | Harald Hoyer <harald@redhat.com> | 2012-07-06 14:22:10 +0200 |
|---|---|---|
| committer | Harald Hoyer <harald@redhat.com> | 2012-07-06 14:22:10 +0200 |
| commit | d96c3254e8bbe56763617f45f1148d81b10f4745 (patch) | |
| tree | e03d54289ac75aed9685eef14825ccf1f6a71df9 | |
| parent | e1619ee151b20549dc5c6112a5715df58db7b108 (diff) | |
| download | dracut-d96c3254e8bbe56763617f45f1148d81b10f4745.tar.gz dracut-d96c3254e8bbe56763617f45f1148d81b10f4745.tar.bz2 dracut-d96c3254e8bbe56763617f45f1148d81b10f4745.zip | |
dracut.spec,dracut.conf.d/fedora.conf.example: no dash
hard remove dash from supported modules
we do not want to have anything to do with dash bugs
| -rw-r--r-- | dracut.conf.d/fedora.conf.example | 7 | ||||
| -rw-r--r-- | dracut.spec | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/dracut.conf.d/fedora.conf.example b/dracut.conf.d/fedora.conf.example index 25b5cfa5..ee538446 100644 --- a/dracut.conf.d/fedora.conf.example +++ b/dracut.conf.d/fedora.conf.example @@ -2,13 +2,12 @@ # i18n i18n_vars="/etc/sysconfig/keyboard:KEYTABLE-KEYMAP /etc/sysconfig/i18n:SYSFONT-FONT,FONTACM-FONT_MAP,FONT_UNIMAP" -omit_dracutmodules+=" dash " omit_drivers+=" .*/fs/ocfs/.* " -add_dracutmodules+=" systemd " stdloglvl=3 -realinitpath="/usr/lib/systemd/systemd" install_items+=" vi /etc/virc ps grep cat rm " -prefix="/" +readonly prefix="/" systemdutildir=/usr/lib/systemd systemdsystemunitdir=/usr/lib/systemd/system udevdir=/usr/lib/udev +add_dracutmodules+=" systemd " +realinitpath="/usr/lib/systemd/systemd" diff --git a/dracut.spec b/dracut.spec index b258121c..a6fec899 100644 --- a/dracut.spec +++ b/dracut.spec @@ -190,6 +190,9 @@ rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/01fips rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/02fips-aesni %endif +# we do not support dash in the initramfs +rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/00dash + # remove gentoo specific modules rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/50gensplash @@ -261,7 +264,6 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man5/dracut.conf.5* %{_mandir}/man1/lsinitrd.1* %{dracutlibdir}/modules.d/00bootchart -%{dracutlibdir}/modules.d/00dash %{dracutlibdir}/modules.d/04watchdog %{dracutlibdir}/modules.d/05busybox %{dracutlibdir}/modules.d/10i18n |