diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2016-10-25 20:53:01 +0100 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2016-11-12 18:21:32 +0000 |
| commit | 8eb7d39964d283fa8f89699d2df626aca0f36a91 (patch) | |
| tree | 2a28dfa6fbdf2eccc4a775b3b781458134cb476e | |
| parent | cb0b5f44d9f4ac6676de0b146281cb4e55960313 (diff) | |
| download | draklive-config-8eb7d39964d283fa8f89699d2df626aca0f36a91.tar draklive-config-8eb7d39964d283fa8f89699d2df626aca0f36a91.tar.gz draklive-config-8eb7d39964d283fa8f89699d2df626aca0f36a91.tar.bz2 draklive-config-8eb7d39964d283fa8f89699d2df626aca0f36a91.tar.xz draklive-config-8eb7d39964d283fa8f89699d2df626aca0f36a91.zip | |
Reenable inclusion of fonts-otf-source-han (mga#18857)
Includes fix for slow boot (due to unnecessary font cache update)
ported from OpenMandriva.
| -rw-r--r-- | config/auto_inst.cfg.pl | 4 | ||||
| -rw-r--r-- | config/live.cfg | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl index 069ffb4..e80406c 100644 --- a/config/auto_inst.cfg.pl +++ b/config/auto_inst.cfg.pl @@ -81,10 +81,6 @@ $o = { 'glibc-devel', 'gdb', 'gcc', 'gcc3.3', 'dkms', 'empathy', # pulls devel stuff - # theese fonts adds 20-30 sec delay / font on initial execution of - # fontconfig cache wich is _way_ too painful on live boot (mga#17223) - 'fonts-otf-source-han', '/^google-noto/', - # shipped in live nonfree repo '/^broadcom-wl-/', 'broadcom-bcma-config', 'broadcom-ssb-config', diff --git a/config/live.cfg b/config/live.cfg index 26c90dd..203b940 100644 --- a/config/live.cfg +++ b/config/live.cfg @@ -221,6 +221,15 @@ my $_l = { # remove pre-installed grub2, we need to be able to select grub2 vs grub2-efi at install time "rpm -e --nodeps grub2", + # set the timestamp on the font directories to be a whole second + # fc-cache looks at the nano second portion which may be non-zero + # as we are on ext4, but then it will compare against the stamps + # on the squashfs live image which have whole second resolution + # (adapted from fix descrived in OpenMandriva bug 1764) + "find /usr/share/fonts -type d -exec touch -t \$(date +%Y%m%d%H%M.%S) '{}' ';'", + # now update the cache for the new timestamps + "fc-cache -rf", + ), additional_media => [ if_($live->{settings}{updates_repository}, |