Merge remote-tracking branch 'zbigniew/systemadm_changes'

diff --combined Makefile.am
index 0ce2356d78323e341a843941d2553cdee844f24d,07129455324baaafcb94b1ed926f76d7a4a540f4..d30d626ebfa3ef34c6d73ae0983c9dfe92c97795
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -20,7 -20,7 +20,7 @@@ ACLOCAL_AMFLAGS = -I m
  SUBDIRS = po
  
  LIBSYSTEMD_LOGIN_CURRENT=0
 -LIBSYSTEMD_LOGIN_REVISION=4
 +LIBSYSTEMD_LOGIN_REVISION=6
  LIBSYSTEMD_LOGIN_AGE=0
  
  LIBSYSTEMD_DAEMON_CURRENT=0
@@@ -76,7 -76,6 +76,7 @@@ AM_CPPFLAGS = 
        -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
        -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \
        -DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
 +        -DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \
        -I $(top_srcdir)/src
  
  if TARGET_GENTOO
@@@ -119,13 -118,6 +119,13 @@@ AM_CPPFLAGS += 
        -DKBD_LOADKEYS=\"/bin/loadkeys\" \
        -DKBD_SETFONT=\"/bin/setfont\" \
        -DDEFAULT_FONT=\"latarcyrheb-sun16\"
 +else
 +if TARGET_MAGEIA
 +AM_CPPFLAGS += \
 +      -DKBD_LOADKEYS=\"/bin/loadkeys\" \
 +      -DKBD_SETFONT=\"/bin/setfont\" \
 +      -DDEFAULT_FONT=\"LatArCyrHeb-16\"
 +endif
  endif
  endif
  endif
@@@ -321,7 -313,7 +321,7 @@@ dbusinterface_DATA += 
  endif
  
  dist_bashcompletion_DATA = \
 -      src/systemctl-bash-completion.sh
 +      src/systemd-bash-completion.sh
  
  dist_tmpfiles_DATA = \
        tmpfiles.d/systemd.conf \
@@@ -344,9 -336,7 +344,9 @@@ dist_systemunit_DATA = 
        units/halt.target \
        units/kexec.target \
        units/local-fs.target \
 +        units/local-fs-pre.target \
        units/remote-fs.target \
 +        units/remote-fs-pre.target \
        units/cryptsetup.target \
        units/network.target \
        units/nss-lookup.target \
@@@ -367,12 -357,14 +367,12 @@@
        units/systemd-stdout-syslog-bridge.socket \
        units/systemd-shutdownd.socket \
        units/syslog.socket \
 -      units/dev-hugepages.automount \
        units/dev-hugepages.mount \
 -      units/dev-mqueue.automount \
        units/dev-mqueue.mount \
 -      units/sys-kernel-debug.automount \
 +      units/sys-kernel-config.mount \
        units/sys-kernel-debug.mount \
 -      units/sys-kernel-security.automount \
        units/sys-kernel-security.mount \
 +      units/sys-fs-fuse-connections.mount \
        units/var-run.mount \
        units/media.mount \
        units/remount-rootfs.service \
@@@ -549,13 -541,6 +549,13 @@@ dist_systemunit_DATA += 
        units/suse/halt-local.service
  endif
  
 +if TARGET_MAGEIA
 +dist_systemunit_DATA += \
 +      units/mageia/prefdm.service \
 +      units/fedora/rc-local.service \
 +      units/fedora/halt-local.service
 +endif
 +
  if HAVE_PLYMOUTH
  dist_systemunit_DATA += \
        units/plymouth-start.service \
@@@ -630,7 -615,6 +630,7 @@@ noinst_LTLIBRARIES = 
  
  libsystemd_basic_la_SOURCES = \
        src/util.c \
 +        src/virt.c \
        src/label.c \
        src/hashmap.c \
        src/set.c \
@@@ -1048,12 -1032,6 +1048,12 @@@ systemd_localed_LDADD = 
        libsystemd-daemon.la \
        $(DBUS_LIBS)
  
 +dist_pkgdata_DATA = \
 +        src/kbd-model-map
 +
 +dist_noinst_SCRIPT = \
 +        src/generate-kbd-model-map
 +
  systemd_timedated_SOURCES = \
        src/timedated.c \
          src/dbus-common.c \
@@@ -1440,7 -1418,8 +1440,8 @@@ systemd_stdio_bridge_LDADD = 
  
  systemadm_SOURCES = \
        src/systemadm.vala \
-       src/systemd-interfaces.vala
+       src/systemd-interfaces.vala \
+       src/wraplabel.vala
  
  systemadm_CFLAGS = \
        $(AM_CFLAGS) \
@@@ -1453,6 -1432,7 +1454,7 @@@
  systemadm_VALAFLAGS = \
        --pkg=posix \
        --pkg=gtk+-2.0 \
+       --pkg=gee-1.0 \
        -g
  
  systemadm_LDADD = \
@@@ -1860,12 -1840,10 +1862,12 @@@ endi
                rm -f remote-fs.target && \
                $(LN_S) $(systemunitdir)/remote-fs.target remote-fs.target )
        ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
 -              rm -f dev-hugepages.automount \
 -                      dev-mqueue.automount \
 -                      sys-kernel-debug.automount \
 -                      sys-kernel-security.automount \
 +              rm -f dev-hugepages.mount \
 +                      dev-mqueue.mount \
 +                        sys-kernel-config.mount \
 +                      sys-kernel-debug.mount \
 +                      sys-kernel-security.mount \
 +                      sys-fs-fuse-connections.mount \
                        systemd-vconsole-setup.service \
                        systemd-modules-load.service \
                        systemd-random-seed-load.service \
@@@ -1874,12 -1852,10 +1876,12 @@@
                        systemd-ask-password-console.path \
                        systemd-kmsg-syslogd.service \
                        cryptsetup.target && \
 -              $(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \
 -              $(LN_S) ../dev-mqueue.automount dev-mqueue.automount && \
 -              $(LN_S) ../sys-kernel-debug.automount sys-kernel-debug.automount && \
 -              $(LN_S) ../sys-kernel-security.automount sys-kernel-security.automount && \
 +              $(LN_S) ../dev-hugepages.mount dev-hugepages.mount && \
 +              $(LN_S) ../dev-mqueue.mount dev-mqueue.mount && \
 +                $(LN_S) ../sys-kernel-config.mount sys-kernel-config.mount && \
 +              $(LN_S) ../sys-kernel-debug.mount sys-kernel-debug.mount && \
 +              $(LN_S) ../sys-kernel-security.mount sys-kernel-security.mount && \
 +              $(LN_S) ../sys-fs-fuse-connections.mount sys-fs-fuse-connections.mount && \
                $(LN_S) ../systemd-vconsole-setup.service systemd-vconsole-setup.service && \
                $(LN_S) ../systemd-modules-load.service systemd-modules-load.service && \
                $(LN_S) ../systemd-random-seed-load.service systemd-random-seed-load.service && \
@@@ -2013,23 -1989,6 +2015,23 @@@ if TARGET_SUS
                $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
  endif
  
 +if TARGET_MAGEIA
 +      $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
 +      ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
 +              rm -f rc-local.service && \
 +              $(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
 +      ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
 +              rm -f halt-local.service && \
 +              $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
 +      ( cd $(DESTDIR)$(systemunitdir) && \
 +              rm -f display-manager.service && \
 +              $(LN_S) prefdm.service display-manager.service && \
 +              $(LN_S) prefdm.service dm.service )
 +      ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
 +              rm -f display-manager.service && \
 +              $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
 +endif
 +
  if HAVE_SYSV_COMPAT
        ( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
                rm -f var-lock.mount && \
@@@ -2056,6 -2015,3 +2058,6 @@@ upload: all distchec
  
  git-tag:
        git tag "v$(VERSION)" -m "systemd $(VERSION)"
 +
 +update-kbd-model-map:
 +      src/generate-kbd-model-map > src/kbd-model-map

diff --combined configure.ac
index 0bc98603d32fb2545998d91a33afa9d191750dea,b2411c937bc4490fad14068b1f99b5d9a98a13fb..596a32ac23d627cee54b132c0329ee3d0440daee
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -17,7 -17,7 +17,7 @@@
  
  AC_PREREQ(2.63)
  
 -AC_INIT([systemd],[35],[systemd-devel@lists.freedesktop.org])
 +AC_INIT([systemd],[37],[systemd-devel@lists.freedesktop.org])
  AC_CONFIG_SRCDIR([src/main.c])
  AC_CONFIG_MACRO_DIR([m4])
  AC_CONFIG_HEADERS([config.h])
@@@ -327,7 -327,7 +327,7 @@@ AM_CONDITIONAL(ENABLE_LOCALED, [test "$
  have_gtk=no
  AC_ARG_ENABLE(gtk, AS_HELP_STRING([--disable-gtk], [disable GTK tools]))
  if test "x$enable_gtk" != "xno"; then
-         PKG_CHECK_MODULES(GTK, [ gtk+-2.0 glib-2.0 > 2.26 gio-unix-2.0 ],
+         PKG_CHECK_MODULES(GTK, [ gtk+-2.0 glib-2.0 > 2.26 gio-unix-2.0 gee-1.0],
                  [AC_DEFINE(HAVE_GTK, 1, [Define if GTK is available]) have_gtk=yes], have_gtk=no)
          AC_SUBST(GTK_CFLAGS)
          AC_SUBST(GTK_LIBS)
@@@ -371,7 -371,6 +371,7 @@@ if test "z$with_distro" = "z"; the
                  test -f "/etc/mandriva-release" && with_distro="mandriva"
                  test -f "/etc/meego-release" && with_distro="meego"
                  test -f "/etc/angstrom-version" && with_distro="angstrom"
 +                test -f "/etc/mageia-release" && with_distro="mageia"
                  if test "x`lsb_release -is 2>/dev/null`" = "xUbuntu"; then
                          with_distro="ubuntu"
                  fi
@@@ -459,12 -458,6 +459,12 @@@ case $with_distro i
                  AC_DEFINE(TARGET_ANGSTROM, [], [Target is Ångström])
                  M4_DEFINES=-DTARGET_ANGSTROM=1
                  ;;
 +        mageia)
 +                SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d
 +                AC_DEFINE(TARGET_MAGEIA, [], [Target is Mageia])
 +                M4_DISTRO_FLAG=-DTARGET_MAGEIA=1
 +                have_plymouth=yes
 +                ;;
          other)
                  ;;
          *)
@@@ -522,7 -515,6 +522,7 @@@ AM_CONDITIONAL(TARGET_ALTLINUX, test x"
  AM_CONDITIONAL(TARGET_MANDRIVA, test x"$with_distro" = xmandriva)
  AM_CONDITIONAL(TARGET_MEEGO, test x"$with_distro" = xmeego)
  AM_CONDITIONAL(TARGET_ANGSTROM, test x"$with_distro" = xangstrom)
 +AM_CONDITIONAL(TARGET_MAGEIA, test x"$with_distro" = xmageia)
  
  AM_CONDITIONAL(HAVE_PLYMOUTH, test "$have_plymouth" = "yes")
  AM_CONDITIONAL(HAVE_SYSV_COMPAT, test "$SYSTEM_SYSV_COMPAT" = "yes")