Accepting request 668711 from home:dmolkentin:branches:Base:System

- Remove invalid "FONT_MAP=none" from vconsole.conf (osc#1013573)

OBS-URL: https://build.opensuse.org/request/show/668711
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=362
This commit is contained in:
Daniel Molkentin 2019-01-25 16:45:21 +00:00 committed by Git OBS Bridge
parent 3e7d1873a8
commit b7a611d1d4
2 changed files with 9 additions and 0 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jan 25 16:03:09 UTC 2019 - Daniel Molkentin <daniel.molkentin@suse.com>
- Remove invalid "FONT_MAP=none" from vconsole.conf (osc#1013573)
-------------------------------------------------------------------
Mon Jan 21 14:01:20 UTC 2019 - Daniel Molkentin <daniel.molkentin@suse.com>

View File

@ -802,6 +802,10 @@ ln -s %{dracutlibdir}/modules.d/45ifcfg/write-ifcfg-redhat.sh %{buildroot}/%{dra
%post
%service_add_post purge-kernels.service
%{?regenerate_initrd_post}
# Due to a bug in YaST and subsequent work by the migration script, /etc/vconsole.conf
# may contain "FONT_MAP=none" which is invalid. While systemd will silently ignore this,
# dracut will complain. Eliminate the entry (bsc#1096771, bsc#1013573).
sed -i '/^FONT_MAP=none/d' %{_sysconfdir}/vconsole.conf || :
%post fips
%{?regenerate_initrd_post}