summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc-Antoine Perennou <Marc-Antoine@Perennou.com>2011-04-08 11:39:05 +0200
committerMarc-Antoine Perennou <Marc-Antoine@Perennou.com>2011-04-08 11:39:05 +0200
commit97904dc28c01229d1a18206b1d8584d0945f7973 (patch)
tree94efe8aebf4924a0b41ed6a760f3cdbdbd9f0e10 /sys-apps
parentgentoo specific patch (diff)
downloadkeruspe-97904dc28c01229d1a18206b1d8584d0945f7973.tar.gz
keruspe-97904dc28c01229d1a18206b1d8584d0945f7973.tar.bz2
keruspe-97904dc28c01229d1a18206b1d8584d0945f7973.zip
update patch
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/systemd/Manifest2
-rw-r--r--sys-apps/systemd/files/0001-Allow-skipping-font-setting.patch6
2 files changed, 4 insertions, 4 deletions
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 550cd20f..c16b0fcb 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,3 +1,3 @@
-AUX 0001-Allow-skipping-font-setting.patch 2687 RMD160 bad91d4420b0d102d2626db4dce1d06a67ec04aa SHA1 7236dcf6e6c8f933df423b84cc67980430ce6a01 SHA256 6564fe678acba987b34d8bfaa2dfe037ff4fb4a574ef2bd0d5a1a0cbb7a05406
+AUX 0001-Allow-skipping-font-setting.patch 2686 RMD160 10d7605a90c70337a9a97f9c90913d4b95667df7 SHA1 ce77787c82c61c2c7fbceac09f94d3ab66020488 SHA256 bfa19bb63714abf488b87b67291f9e5cdd4ab96a973737b2357a5cebec864221
AUX 0002-Allow-skipping-font-setting-for-Gentoo.patch 1193 RMD160 8882c372c0ef2dc14aae8bab6b917aec7cf9c838 SHA1 2677803a2e991f83b6dc651920b9d268d8eaff45 SHA256 20f4b54b7d7cb6eac2203365786c2f1fd295c34c84adcc17926b35095f62d16d
EBUILD systemd-9999-r1.ebuild 3521 RMD160 e1760b06bb24f38c49b36212ccadcb675bd98edd SHA1 f9ee19df2d3a08d7fffb1da1455ee1403af0d385 SHA256 c7401a2c9d31fc5bbe481038535f0ccaff014780ccfdf15e8a2ee521ff1b6d40
diff --git a/sys-apps/systemd/files/0001-Allow-skipping-font-setting.patch b/sys-apps/systemd/files/0001-Allow-skipping-font-setting.patch
index 9811c8a5..513a9ab3 100644
--- a/sys-apps/systemd/files/0001-Allow-skipping-font-setting.patch
+++ b/sys-apps/systemd/files/0001-Allow-skipping-font-setting.patch
@@ -1,4 +1,4 @@
-From 0c9b394e6f3a1b61f799ae5372e2014297fc926c Mon Sep 17 00:00:00 2001
+From dc127d501f0e743bd7782d21150b507b66003a05 Mon Sep 17 00:00:00 2001
From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Date: Thu, 7 Apr 2011 15:31:22 +0200
Subject: [PATCH 1/2] Allow skipping font setting
@@ -15,7 +15,7 @@ Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/vconsole-setup.c b/src/vconsole-setup.c
-index 67fb7b6..510e845 100644
+index 67fb7b6..bde2b42 100644
--- a/src/vconsole-setup.c
+++ b/src/vconsole-setup.c
@@ -144,6 +144,7 @@ int main(int argc, char **argv) {
@@ -48,7 +48,7 @@ index 67fb7b6..510e845 100644
if (load_keymap(vc, vc_keymap, vc_keymap_toggle, utf8, &keymap_pid) >= 0 &&
- load_font(vc, vc_font, vc_font_map, vc_font_unimap, &font_pid) >= 0)
- r = EXIT_SUCCESS;
-+ ((skip_font_setting && strcmp(skip_font_setting, "yes") == 0) ||
++ ((skip_font_setting && parse_boolean(skip_font_setting) > 0) ||
+ load_font(vc, vc_font, vc_font_map, vc_font_unimap, &font_pid) >= 0))
+ r = EXIT_SUCCESS;