[systemd-commits] 4 commits - fixme src/locale-setup.c src/random-seed.c src/vconsole-setup.c

Lennart Poettering lennart at kemper.freedesktop.org
Mon Sep 20 14:14:54 PDT 2010


 fixme                |    4 ++++
 src/locale-setup.c   |    8 ++++++++
 src/random-seed.c    |    5 +++++
 src/vconsole-setup.c |   10 ++++++++++
 4 files changed, 27 insertions(+)

New commits:
commit f2fcd59ffaaa97aaa238089cde5225f0e1086904
Author: Tom Gundersen <teg at jklm.no>
Date:   Sat Sep 18 23:43:53 2010 +0100

    locale: set LANG on Arch
    
    This variable is defined in /etc/rc.conf

diff --git a/src/locale-setup.c b/src/locale-setup.c
index 923be04..675a739 100644
--- a/src/locale-setup.c
+++ b/src/locale-setup.c
@@ -76,6 +76,14 @@ int locale_setup(void) {
                 if (r != -ENOENT)
                         log_warning("Failed to read /etc/sysconfig/i18n: %s", strerror(-r));
         }
+#elif defined(TARGET_ARCH)
+	if ((r = parse_env_file("/etc/rc.conf", NEWLINE,
+				"LOCALE", &variables[VARIABLE_LANG],
+				NULL)) < 0) {
+
+		if (r != -ENOENT)
+			log_warning("Failed to read /etc/rc.conf: %s", strerror(-r));
+	}
 #endif
 
         /* Override distribution-specific options with the
commit 424313503a6813bd78a7e8524668044ab61f3fb3
Author: Tom Gundersen <teg at jklm.no>
Date:   Sat Sep 18 23:45:39 2010 +0100

    vconsole: set keyboard mapping and font settings on Arch
    
    These variables are defined in /etc/rc.conf

diff --git a/src/vconsole-setup.c b/src/vconsole-setup.c
index 0f730a0..06d9a21 100644
--- a/src/vconsole-setup.c
+++ b/src/vconsole-setup.c
@@ -199,6 +199,16 @@ int main(int argc, char **argv) {
                 free(vc_keymap);
                 vc_keymap = t;
         }
+#elif defined(TARGET_ARCH)
+        if ((r = parse_env_file("/etc/rc.conf", NEWLINE,
+				"KEYMAP", &vc_keymap,
+                                "CONSOLEFONT", &vc_font,
+                                "CONSOLEMAP", &vc_font_map,
+                                NULL)) < 0) {
+
+                if (r != -ENOENT)
+                        log_warning("Failed to read /etc/rc.conf: %s", strerror(-r));
+        }
 #endif
 
         /* Override distribution-specific options with the
commit b56e57470c92f123044ea690b5404bdd730ddaa6
Author: Gustavo Sverzut Barbieri <barbieri at profusion.mobi>
Date:   Mon Sep 20 10:04:10 2010 -0300

    random-seed: create parents of RANDOM_SEED if they do not exist.
    
    it may happen that parent directories of RANDOM_SEED do not exist, in
    that case we must create it otherwise save will not work.

diff --git a/src/random-seed.c b/src/random-seed.c
index 936ed47..8eab2b4 100644
--- a/src/random-seed.c
+++ b/src/random-seed.c
@@ -61,6 +61,11 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
 
+        if (mkdir_parents(RANDOM_SEED, 0755) < 0) {
+                log_error("Failed to create directories parents of %s: %m", RANDOM_SEED);
+                goto finish;
+        }
+
         /* When we load the seed we read it and write it to the device
          * and then immediately update the saved seed with new data,
          * to make sure the next boot gets seeded differently. */
commit 26febd4590469579eb74e2d92c3fa137645f2286
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Sep 20 21:47:32 2010 +0200

    update fixme

diff --git a/fixme b/fixme
index cb7bd91..4e29ae3 100644
--- a/fixme
+++ b/fixme
@@ -97,6 +97,10 @@
 
 * ask-password tty timeout
 
+* properly handle bind mounts in /etc/fstab
+
+* cleanup /tmp.
+
 External:
 
 * place /etc/inittab with explaining blurb.


More information about the systemd-commits mailing list