dracut: update to 029.

This commit is contained in:
Juan RP 2013-06-14 17:34:01 +02:00
parent 88736b25ac
commit dec6eddb39
2 changed files with 4 additions and 44 deletions

View File

@ -1,36 +0,0 @@
From c6011f2add61e3b902fb385760fdaa9d8816f29a Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Thu, 13 Jun 2013 07:29:17 +0000
Subject: i18n: make the default font configurable
To set the default font for your distribution, add
i18n_default_font="latarcyrheb-sun16"
to your /lib/dracut/dracut.conf.d/01-dist.conf distribution config.
---
diff --git a/dracut.conf.d/fedora.conf.example b/dracut.conf.d/fedora.conf.example
index 6389437..3d6faa2 100644
--- dracut.conf.d/fedora.conf.example
+++ dracut.conf.d/fedora.conf.example
@@ -2,6 +2,7 @@
# i18n
i18n_vars="/etc/sysconfig/keyboard:KEYTABLE-KEYMAP /etc/sysconfig/i18n:SYSFONT-FONT,FONTACM-FONT_MAP,FONT_UNIMAP"
+i18n_default_font="latarcyrheb-sun16"
omit_drivers+=' .*/fs/ocfs/.* i2o_scsi'
stdloglvl=3
logfile=/var/log/dracut.log
diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh
index 60a50e7..195364c 100755
--- modules.d/10i18n/module-setup.sh
+++ modules.d/10i18n/module-setup.sh
@@ -14,7 +14,7 @@ depends() {
install() {
dracut_install -o $systemdutildir/systemd-vconsole-setup
KBDSUBDIRS=consolefonts,consoletrans,keymaps,unimaps
- DEFAULT_FONT=latarcyrheb-sun16
+ DEFAULT_FONT="${i18n_default_font:-LatArCyrHeb-16}"
I18N_CONF="/etc/locale.conf"
VCONFIG_CONF="/etc/vconsole.conf"
--
cgit v0.9.2

View File

@ -1,22 +1,18 @@
# Template file for 'dracut'
pkgname=dracut
version=028
revision=2
version=029
revision=1
build_style=gnu-makefile
make_build_args="sysconfdir=/etc systemdsystemunitdir=/usr/lib/systemd/system"
make_install_args="sysconfdir=/etc systemdsystemunitdir=/usr/lib/systemd/system"
hostmakedepends="libxslt docbook-xsl asciidoc"
makedepends="psmisc cpio xz systemd"
homepage="http://www.kernel.org/pub/linux/utils/boot/dracut/dracut.html"
short_desc="A new initramfs infrastructure"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
distfiles="${KERNEL_SITE}/utils/boot/$pkgname/$pkgname-$version.tar.xz"
checksum=24971a529cc4b57d6d889f5df6f895c251a528f04b5ba2f9bf481a09ac2cd6ac
pre_build() {
# Remove the nonsense syncheck target.
sed -i -e "s|all: syncheck|all:|g" Makefile
}
checksum=5623e4fbcb14737ae76baf97736e4b2a0b4bc037dfb572de6021ffbd37928c59
pre_install() {
# fix path to busybox.