[systemd-commits] 2 commits - src/shared src/vconsole

[Kay Sievers]

 src/shared/selinux-util.c     |    8 ++++++--
 src/vconsole/vconsole-setup.c |    7 -------
 2 files changed, 6 insertions(+), 9 deletions(-)

New commits:
commit 0b6018f3d9d437fdbad8f39dca2409d63a5df854
Author: Colin Walters <walters at verbum.org>
Date:   Tue Oct 2 18:15:14 2012 -0400

    build-sys: fix !HAVE_SELINUX case

diff --git a/src/shared/selinux-util.c b/src/shared/selinux-util.c
index 4310a97..ff33756 100644
--- a/src/shared/selinux-util.c
+++ b/src/shared/selinux-util.c
@@ -19,10 +19,12 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <selinux/selinux.h>
-
 #include "selinux-util.h"
 
+#ifdef HAVE_SELINUX
+
+#include <selinux/selinux.h>
+
 static int use_selinux_cached = -1;
 
 bool use_selinux(void) {
@@ -36,3 +38,5 @@ bool use_selinux(void) {
 void retest_selinux(void) {
         use_selinux_cached = -1;
 }
+
+#endif

commit 8d789b905dba8aebd30238520b6ad52fb866af95
Author: Tom Gundersen <teg at jklm.no>
Date:   Wed Oct 3 15:57:40 2012 +0200

        vconsole: default to the kernel compiled-in keymap
    
        No longer override the default kernel keymap if nothing is specified in
        vconsole.conf.
    
        The default should be to do nothing (i.e., use what is already in the
        kernel) unless the distro/admin has explicitly requested it.

diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
index 1227b04..a652ec2 100644
--- a/src/vconsole/vconsole-setup.c
+++ b/src/vconsole/vconsole-setup.c
@@ -214,13 +214,6 @@ int main(int argc, char **argv) {
 
         utf8 = is_locale_utf8();
 
-        vc_keymap = strdup("us");
-
-        if (!vc_keymap) {
-                log_error("Failed to allocate string.");
-                goto finish;
-        }
-
         r = 0;
 
         if (detect_container(NULL) <= 0) {