Sun May 16 12:16:12 PDT 2010

.gitignore                        |   16 ++-----
 99-systemd.rules                  |   38 ------------------
 Makefile.am                       |   58 +++++++++++++++++++++-------
 configure.ac                      |   39 +++++++++----------
 org.freedesktop.systemd1.conf     |   78 --------------------------------------
 src/.gitignore                    |    3 +
 src/99-systemd.rules              |   38 ++++++++++++++++++
 src/manager.h                     |    2 
 src/org.freedesktop.systemd1.conf |   78 ++++++++++++++++++++++++++++++++++++++
 units/.gitignore                  |    2 
 units/emergency.service           |   17 ++++++++
 units/local-fs.target             |   19 +++++++++
 units/network.target              |   19 +++++++++
 units/nss-lookup.target           |   21 ++++++++++
 units/remote-fs.target            |   21 ++++++++++
 units/rtc-set.target              |   19 +++++++++
 units/shutdown.target             |   19 +++++++++
 units/sigpwr.target               |   19 +++++++++
 units/sockets.target              |   19 +++++++++
 units/swap.target                 |   19 +++++++++
 units/systemd-initctl.service.in  |   19 ++++++++-
 units/systemd-initctl.socket      |   19 ++++++++-
 units/systemd-logger.service.in   |   17 ++++++++
 units/systemd-logger.socket       |   17 ++++++++
 24 files changed, 454 insertions(+), 162 deletions(-)

New commits:
commit 865f2ad151d9b45a4ea253626343b4a974f21ab7
Author: Lennart Poettering <lennart at poettering.net>
Date:   Sun May 16 21:15:35 2010 +0200

    units: drop After=sysinit.service line in local-fs.target which should be reversed and put into sysinit.service

diff --git a/units/local-fs.target b/units/local-fs.target
index 45259cd..3e7124a 100644
--- a/units/local-fs.target
+++ b/units/local-fs.target
@@ -17,4 +17,3 @@
 
 [Unit]
 Description=Local File Systems
-After=sysinit.service
commit a7b6f8e578724c3b4f0cfc8777d9b4a8e29207b0
Author: Lennart Poettering <lennart at poettering.net>
Date:   Sun May 16 21:12:12 2010 +0200

    units: automatically generated syslog.target

diff --git a/Makefile.am b/Makefile.am
index 963c648..780ded6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -80,11 +80,13 @@ dist_systemunit_DATA = \
 
 systemunit_DATA = \
 	units/systemd-initctl.service \
-	units/systemd-logger.service
+	units/systemd-logger.service \
+	units/syslog.target
 
 EXTRA_DIST = \
 	units/systemd-initctl.service.in \
 	units/systemd-logger.service.in \
+	units/syslog.target.in \
 	LICENSE \
 	README
 
@@ -281,12 +283,18 @@ units/systemd-logger.service: units/systemd-logger.service.in Makefile
 		-e 's, at pkglibexecdir\@,$(pkglibexecdir),g' \
 		< $< > $@
 
+units/syslog.target: units/syslog.target.in Makefile
+	$(MKDIR_P) units
+	$(SED) -e 's, at SPECIAL_SYSLOG_SERVICE\@,$(SPECIAL_SYSLOG_SERVICE),g' \
+		< $< > $@
+
 CLEANFILES = \
 	src/systemd-interfaces.c \
 	src/systemctl.c \
 	src/systemadm.c \
 	units/systemd-initctl.service \
-	units/systemd-logger.service
+	units/systemd-logger.service \
+	units/syslog.target
 
 if HAVE_XSLTPROC
 man/%.5: man/%.xml
diff --git a/configure.ac b/configure.ac
index 691d970..850987d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -164,43 +164,43 @@ case $with_distro in
         fedora)
                 SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d
                 SYSTEM_SYSVRCND_PATH=/etc/rc.d
-                special_dbus_service=messagebus.service
-                special_syslog_service=rsyslog.service
+                SPECIAL_DBUS_SERVICE=messagebus.service
+                SPECIAL_SYSLOG_SERVICE=rsyslog.service
                 AC_DEFINE(TARGET_FEDORA, [], [Target is Fedora/RHEL])
                 ;;
         suse)
                 SYSTEM_SYSVINIT_PATH=/etc/init.d
                 SYSTEM_SYSVRCND_PATH=/etc/init.d
-                special_dbus_service=dbus.service
-                special_syslog_service=syslog.service
+                SPECIAL_DBUS_SERVICE=dbus.service
+                SPECIAL_SYSLOG_SERVICE=syslog.service
                 AC_DEFINE(TARGET_SUSE, [], [Target is OpenSUSE/SLES])
                 ;;
         debian)
                 SYSTEM_SYSVINIT_PATH=/etc/init.d
                 SYSTEM_SYSVRCND_PATH=/etc
-                special_dbus_service=dbus.service
-                special_syslog_service=rsyslog.service
+                SPECIAL_DBUS_SERVICE=dbus.service
+                SPECIAL_SYSLOG_SERVICE=rsyslog.service
                 AC_DEFINE(TARGET_DEBIAN, [], [Target is Debian/Ubuntu])
                 ;;
         arch)
                 SYSTEM_SYSVINIT_PATH=/etc/rc.d
                 SYSTEM_SYSVRCND_PATH=/etc
-                special_dbus_service=dbus.service
-                special_syslog_service=syslog-ng.service
+                SPECIAL_DBUS_SERVICE=dbus.service
+                SPECIAL_SYSLOG_SERVICE=syslog-ng.service
                 AC_DEFINE(TARGET_ARCH, [], [Target is ArchLinux])
                 ;;
         gentoo)
                 SYSTEM_SYSVINIT_PATH=/etc/init.d
                 SYSTEM_SYSVRCND_PATH=/etc
-                special_dbus_service=dbus.service
-                special_syslog_service=syslog-ng.service
+                SPECIAL_DBUS_SERVICE=dbus.service
+                SPECIAL_SYSLOG_SERVICE=syslog-ng.service
                 AC_DEFINE(TARGET_GENTOO, [], [Target is Gentoo])
                 ;;
         slackware)
                 SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d
                 SYSTEM_SYSVRCND_PATH=/etc/rc.d
-                special_dbus_service=messagebus.service
-                special_syslog_service=syslog.service
+                SPECIAL_DBUS_SERVICE=messagebus.service
+                SPECIAL_SYSLOG_SERVICE=syslog.service
                 AC_DEFINE(TARGET_SLACKWARE, [], [Target is Slackware])
                 ;;
         other)
@@ -233,17 +233,19 @@ AC_ARG_WITH([sysvrcd-path],
 AC_ARG_WITH([dbus-service],
         [AS_HELP_STRING([--with-dbus-service=PATH],
                 [Specify the name of the special DBus service @<:@default=based on distro@:>@])],
-        [special_dbus_service="$withval"],
+        [SPECIAL_DBUS_SERVICE="$withval"],
         [])
 
 AC_ARG_WITH([syslog-service],
         [AS_HELP_STRING([--with-syslog-service=PATH],
                 [Specify the name of the special syslog service @<:@default=based on distro@:>@])],
-        [special_syslog_service="$withval"],
+        [SPECIAL_SYSLOG_SERVICE="$withval"],
         [])
 
 AC_SUBST(SYSTEM_SYSVINIT_PATH)
 AC_SUBST(SYSTEM_SYSVRCND_PATH)
+AC_SUBST(SPECIAL_DBUS_SERVICE)
+AC_SUBST(SPECIAL_SYSLOG_SERVICE)
 
 AM_CONDITIONAL(TARGET_FEDORA, test x"$with_distro" = xfedora)
 AM_CONDITIONAL(TARGET_SUSE, test x"$with_distro" = xsuse)
@@ -252,8 +254,8 @@ AM_CONDITIONAL(TARGET_ARCH, test x"$with_distro" = xarch)
 AM_CONDITIONAL(TARGET_GENTOO, test x"$with_distro" = xgentoo)
 AM_CONDITIONAL(TARGET_SLACKWARE, test x"$with_distro" = xslackware)
 
-AC_DEFINE_UNQUOTED(SPECIAL_DBUS_SERVICE, ["$special_dbus_service"], [D-Bus service name])
-AC_DEFINE_UNQUOTED(SPECIAL_SYSLOG_SERVICE, ["$special_syslog_service"], [syslog service name])
+AC_DEFINE_UNQUOTED(SPECIAL_DBUS_SERVICE, ["$SPECIAL_DBUS_SERVICE"], [D-Bus service name])
+AC_DEFINE_UNQUOTED(SPECIAL_SYSLOG_SERVICE, ["$SPECIAL_SYSLOG_SERVICE"], [Syslog service name])
 
 AC_ARG_WITH([udevrulesdir],
         AS_HELP_STRING([--with-udevrulesdir=DIR], [Diectory for udev rules]),
@@ -261,7 +263,6 @@ AC_ARG_WITH([udevrulesdir],
         [with_udevrulesdir=/lib/udev/rules.d])
 AC_SUBST([udevrulesdir], [$with_udevrulesdir])
 
-
 AC_OUTPUT([Makefile])
 
 echo "
@@ -270,8 +271,8 @@ echo "
         Distribution:            ${with_distro}
         SysV init scripts:       ${SYSTEM_SYSVINIT_PATH}
         SysV rc?.d directories:  ${SYSTEM_SYSVRCND_PATH}
-        Syslog service:          ${special_syslog_service}
-        D-Bus service:           ${special_dbus_service}
+        Syslog service:          ${SPECIAL_SYSLOG_SERVICE}
+        D-Bus service:           ${SPECIAL_DBUS_SERVICE}
         Gtk:                     ${have_gtk}
         udev rules dir:          ${with_udevrulesdir}
 "
diff --git a/src/manager.h b/src/manager.h
index a6500ac..424ce87 100644
--- a/src/manager.h
+++ b/src/manager.h
@@ -103,7 +103,7 @@ struct Watch {
 #define SPECIAL_NETWORK_TARGET "network.target"
 #define SPECIAL_NSS_LOOKUP_TARGET "nss-lookup.target"     /* LSB's $named */
 #define SPECIAL_RPCBIND_TARGET "rpcbind.target"           /* LSB's $portmap */
-#define SPECIAL_SYSLOG_TARGET "syslog.target"             /* Should pull in syslog.socket or syslog.service */
+#define SPECIAL_SYSLOG_TARGET "syslog.target"             /* LSB's $syslog; Should pull in syslog.socket or syslog.service */
 #define SPECIAL_RTC_SET_TARGET "rtc-set.target"           /* LSB's $time */
 
 #define SPECIAL_BASIC_TARGET "basic.target"
commit 70449379def39da2a3efbd7c7da27a4745702b08
Author: Lennart Poettering <lennart at poettering.net>
Date:   Sun May 16 20:49:41 2010 +0200

    units: move a number of units into the tarball

diff --git a/Makefile.am b/Makefile.am
index 35eceba..963c648 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -66,6 +66,15 @@ dist_udevrules_DATA = \
 
 dist_systemunit_DATA = \
 	units/emergency.service \
+	units/local-fs.target \
+	units/network.target \
+	units/nss-lookup.target \
+	units/remote-fs.target \
+	units/rtc-set.target \
+	units/shutdown.target \
+	units/sigpwr.target \
+	units/sockets.target \
+	units/swap.target \
 	units/systemd-initctl.socket \
 	units/systemd-logger.socket
 
@@ -298,12 +307,21 @@ install-data-hook:
 		$(DESTDIR)$(systemunitdir) \
 		$(DESTDIR)$(sessionunitdir) \
 		$(DESTDIR)$(pkgsysconfdir)/system \
+		$(DESTDIR)$(pkgsysconfdir)/system/sockets.target.wants \
 		$(DESTDIR)$(pkgsysconfdir)/session \
 		$(DESTDIR)$(sysconfdir)/xdg/systemd \
 		$(DESTDIR)/cgroup/debug
 	( cd $(DESTDIR)$(sysconfdir)/xdg/systemd/ && \
 		rm -f session && \
 		$(LN_S) $(DESTDIR)$(pkgsysconfdir)/session session )
+	( cd $(DESTDIR)$(pkgsysconfdir)/system/sockets.target.wants && \
+		rm -f systemd-initctl.socket systemd-logger.socket && \
+		$(LN_S) $(DESTDIR)$(systemunitdir)/systemd-logger.socket systemd-logger.socket && \
+		$(LN_S) $(DESTDIR)$(systemunitdir)/systemd-initctl.socket systemd-initctl.socket )
+	( cd $(DESTDIR)$(sessionunitdir) && \
+		rm -f shutdown.target sockets.target && \
+		$(LN_S) ../system/shutdown.target shutdown.target && \
+		$(LN_S) ../system/sockets.target sockets.target )
 
 DISTCHECK_CONFIGURE_FLAGS = \
 	--with-udevrulesdir=$$dc_install_base/$(udevrulesdir)
diff --git a/units/emergency.service b/units/emergency.service
index 3959eac..13fca6f 100644
--- a/units/emergency.service
+++ b/units/emergency.service
@@ -1,3 +1,20 @@
+#  This file is part of systemd.
+#
+#  Copyright 2010 Lennart Poettering
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+
 [Unit]
 Description=Emergency Shell
 
diff --git a/units/local-fs.target b/units/local-fs.target
new file mode 100644
index 0000000..45259cd
--- /dev/null
+++ b/units/local-fs.target
@@ -0,0 +1,20 @@
+#  This file is part of systemd.
+#
+#  Copyright 2010 Lennart Poettering
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+
+[Unit]
+Description=Local File Systems
+After=sysinit.service
diff --git a/units/network.target b/units/network.target
new file mode 100644
index 0000000..cdb1b5e
--- /dev/null
+++ b/units/network.target
@@ -0,0 +1,19 @@
+#  This file is part of systemd.
+#
+#  Copyright 2010 Lennart Poettering
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+
+[Unit]
+Description=Network
diff --git a/units/nss-lookup.target b/units/nss-lookup.target
new file mode 100644
index 0000000..d1ce0a7
--- /dev/null
+++ b/units/nss-lookup.target
@@ -0,0 +1,21 @@
+#  This file is part of systemd.
+#
+#  Copyright 2010 Lennart Poettering
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+
+[Unit]
+Description=Name Lookups
+Wants=network.target
+After=network.target
diff --git a/units/remote-fs.target b/units/remote-fs.target
new file mode 100644
index 0000000..0ed324e
--- /dev/null
+++ b/units/remote-fs.target
@@ -0,0 +1,21 @@
+#  This file is part of systemd.
+#
+#  Copyright 2010 Lennart Poettering
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+
+[Unit]
+Description=Remote File Systems
+Requires=network.target
+After=network.target
diff --git a/units/rtc-set.target b/units/rtc-set.target
new file mode 100644
index 0000000..626fa5a
--- /dev/null
+++ b/units/rtc-set.target
@@ -0,0 +1,19 @@
+#  This file is part of systemd.
+#
+#  Copyright 2010 Lennart Poettering
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+
+[Unit]
+Description=RTC Set
diff --git a/units/shutdown.target b/units/shutdown.target
new file mode 100644
index 0000000..87b1be8
--- /dev/null
+++ b/units/shutdown.target
@@ -0,0 +1,19 @@
+#  This file is part of systemd.
+#
+#  Copyright 2010 Lennart Poettering
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+
+[Unit]
+Description=Shutdown
diff --git a/units/sigpwr.target b/units/sigpwr.target
new file mode 100644
index 0000000..36d4d24
--- /dev/null
+++ b/units/sigpwr.target
@@ -0,0 +1,19 @@
+#  This file is part of systemd.
+#
+#  Copyright 2010 Lennart Poettering
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+
+[Unit]
+Description=Power Failure
diff --git a/units/sockets.target b/units/sockets.target
new file mode 100644
index 0000000..1061030
--- /dev/null
+++ b/units/sockets.target
@@ -0,0 +1,19 @@
+#  This file is part of systemd.
+#
+#  Copyright 2010 Lennart Poettering
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+
+[Unit]
+Description=Sockets
diff --git a/units/swap.target b/units/swap.target
new file mode 100644
index 0000000..aac5456
--- /dev/null
+++ b/units/swap.target
@@ -0,0 +1,19 @@
+#  This file is part of systemd.
+#
+#  Copyright 2010 Lennart Poettering
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+
+[Unit]
+Description=Swap
diff --git a/units/systemd-initctl.service.in b/units/systemd-initctl.service.in
index 4fce847..b6d5158 100644
--- a/units/systemd-initctl.service.in
+++ b/units/systemd-initctl.service.in
@@ -1,5 +1,22 @@
+#  This file is part of systemd.
+#
+#  Copyright 2010 Lennart Poettering
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+
 [Unit]
-Description=systemd /dev/initctl Compatibility
+Description=systemd /dev/initctl Compatibility Daemon
 
 [Service]
 ExecStart=@pkglibexecdir@/systemd-initctl
diff --git a/units/systemd-initctl.socket b/units/systemd-initctl.socket
index 19c444a..ff3dbac 100644
--- a/units/systemd-initctl.socket
+++ b/units/systemd-initctl.socket
@@ -1,5 +1,22 @@
+#  This file is part of systemd.
+#
+#  Copyright 2010 Lennart Poettering
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+
 [Unit]
-Description=systemd /dev/initctl Compatibility
+Description=systemd /dev/initctl Compatibility Socket
 
 [Socket]
 ListenFIFO=/dev/initctl
diff --git a/units/systemd-logger.service.in b/units/systemd-logger.service.in
index 55f3841..ba6fa47 100644
--- a/units/systemd-logger.service.in
+++ b/units/systemd-logger.service.in
@@ -1,3 +1,20 @@
+#  This file is part of systemd.
+#
+#  Copyright 2010 Lennart Poettering
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+
 [Unit]
 Description=systemd Logging Daemon
 
diff --git a/units/systemd-logger.socket b/units/systemd-logger.socket
index 8b0a66a..a1d11e8 100644
--- a/units/systemd-logger.socket
+++ b/units/systemd-logger.socket
@@ -1,3 +1,20 @@
+#  This file is part of systemd.
+#
+#  Copyright 2010 Lennart Poettering
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+
 [Unit]
 Description=systemd Logging Socket
 
commit dfac97b21e00cd3617ba817227db7b621841b5cc
Author: Lennart Poettering <lennart at poettering.net>
Date:   Sun May 16 19:09:22 2010 +0200

    build-sys: generate intermediate files in subdirs

diff --git a/.gitignore b/.gitignore
index b83dd9a..4efd824 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,23 +1,19 @@
-*.5
-*.html
-*~
-*.tar.gz
 test-ns
 test-loopback
-systemd-initctl.service
-systemd-logger.service
 systemd-cgroups-agent
 systemd-initctl
 systemd
-*.o
 test-engine
 test-job-type
 systemd-logger
 systemctl
-systemctl.c
-systemd-interfaces.c
 systemadm
-systemadm.c
+.dirstamp
+*.5
+*.html
+*~
+*.tar.gz
+*.o
 .deps/
 Makefile.in
 aclocal.m4
diff --git a/Makefile.am b/Makefile.am
index 0da02af..35eceba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,10 +59,10 @@ noinst_PROGRAMS = \
 	test-loopback
 
 dist_dbuspolicy_DATA = \
-	org.freedesktop.systemd1.conf
+	src/org.freedesktop.systemd1.conf
 
 dist_udevrules_DATA = \
-	99-systemd.rules
+	src/99-systemd.rules
 
 dist_systemunit_DATA = \
 	units/emergency.service \
@@ -70,8 +70,8 @@ dist_systemunit_DATA = \
 	units/systemd-logger.socket
 
 systemunit_DATA = \
-	systemd-initctl.service \
-	systemd-logger.service
+	units/systemd-initctl.service \
+	units/systemd-logger.service
 
 EXTRA_DIST = \
 	units/systemd-initctl.service.in \
@@ -144,12 +144,12 @@ EXTRA_DIST += \
 	src/sd-daemon.h
 
 dist_man_MANS = \
-	systemd.unit.5 \
-	systemd.service.5
+	man/systemd.unit.5 \
+	man/systemd.service.5
 
 HTMLMANS = \
-	systemd.unit.html \
-	systemd.service.html
+	man/systemd.unit.html \
+	man/systemd.service.html
 
 dist_noinst_DATA = \
 	$(HTMLMANS)
@@ -260,12 +260,14 @@ systemadm_SOURCES = \
 systemadm_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(VALA_CFLAGS)
 systemadm_LDADD = $(DBUSGLIB_LIBS) $(GTK_LIBS)
 
-systemd-initctl.service: units/systemd-initctl.service.in Makefile
+units/systemd-initctl.service: units/systemd-initctl.service.in Makefile
+	$(MKDIR_P) units
 	$(SED) -e 's, at libexecdir\@,$(libexecdir),g' \
 		-e 's, at pkglibexecdir\@,$(pkglibexecdir),g' \
 		< $< > $@
 
-systemd-logger.service: units/systemd-logger.service.in Makefile
+units/systemd-logger.service: units/systemd-logger.service.in Makefile
+	$(MKDIR_P) units
 	$(SED) -e 's, at libexecdir\@,$(libexecdir),g' \
 		-e 's, at pkglibexecdir\@,$(pkglibexecdir),g' \
 		< $< > $@
@@ -274,14 +276,16 @@ CLEANFILES = \
 	src/systemd-interfaces.c \
 	src/systemctl.c \
 	src/systemadm.c \
-	systemd-initctl.service \
-	systemd-logger.service
+	units/systemd-initctl.service \
+	units/systemd-logger.service
 
 if HAVE_XSLTPROC
-%.5: man/%.xml
+man/%.5: man/%.xml
+	$(MKDIR_P) man
 	$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
-%.html: man/%.xml
+man/%.html: man/%.xml
+	$(MKDIR_P) man
 	$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $<
 
 CLEANFILES += \
diff --git a/src/.gitignore b/src/.gitignore
new file mode 100644
index 0000000..954d7fe
--- /dev/null
+++ b/src/.gitignore
@@ -0,0 +1,3 @@
+systemctl.c
+systemd-interfaces.c
+systemadm.c
diff --git a/units/.gitignore b/units/.gitignore
new file mode 100644
index 0000000..88895b6
--- /dev/null
+++ b/units/.gitignore
@@ -0,0 +1,2 @@
+systemd-initctl.service
+systemd-logger.service
commit 797e2f0e4df4797f739bfe405c238e847d184ebf
Author: Lennart Poettering <lennart at poettering.net>
Date:   Sun May 16 18:51:06 2010 +0200

    build-sys: move remaining source files to src/

diff --git a/99-systemd.rules b/99-systemd.rules
deleted file mode 100644
index e88f10a..0000000
--- a/99-systemd.rules
+++ /dev/null
@@ -1,38 +0,0 @@
-#  This file is part of systemd.
-#
-#  Copyright 2010 Lennart Poettering
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  systemd is distributed in the hope that it will be useful, but
-#  WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#  General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-
-ACTION!="add|change", GOTO="systemd_end"
-
-KERNEL=="tty[0-9]|tty1[0-2]", ENV{SYSTEMD_EXPOSE}="1"
-KERNEL=="ttyS*", ENV{SYSTEMD_EXPOSE}="1"
-
-SUBSYSTEM=="block", ENV{SYSTEMD_EXPOSE}="1"
-
-# We need a hardware independent way to identify network devices. We
-# use the /sys/subsystem path for this. Current vanilla kernels don't
-# actually support that hierarchy right now, however upcoming kernels
-# will. HAL and udev internally support /sys/subsystem already, hence
-# it should be safe to use this here, too. This is mostly just an
-# identification string for systemd, so whether the path actually is
-# accessible or not does not matter as long as it is unique and in the
-# filesystem namespace.
-#
-# http://git.kernel.org/?p=linux/hotplug/udev.git;a=blob;f=libudev/libudev-enumerate.c;h=da831449dcaf5e936a14409e8e68ab12d30a98e2;hb=HEAD#l742
-
-SUBSYSTEM=="net", KERNEL!="lo", ENV{SYSTEMD_EXPOSE}="1", ENV{SYSTEMD_ALIAS}="/sys/subsystem/net/devices/%k"
-
-LABEL="systemd_end"
diff --git a/org.freedesktop.systemd1.conf b/org.freedesktop.systemd1.conf
deleted file mode 100644
index dfdc475..0000000
--- a/org.freedesktop.systemd1.conf
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0"?> <!--*-nxml-*-->
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
-        "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-
-<!--
-  This file is part of systemd.
-
-  Copyright 2010 Lennart Poettering
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
--->
-
-<busconfig>
-
-        <policy user="root">
-                <allow own="org.freedesktop.systemd1"/>
-
-                <allow send_destination="org.freedesktop.systemd1"/>
-                <allow receive_sender="org.freedesktop.systemd1"/>
-        </policy>
-
-        <policy context="default">
-                <deny send_destination="org.freedesktop.systemd1"/>
-
-                <allow send_destination="org.freedesktop.systemd1"
-                       send_interface="org.freedesktop.DBus.Introspectable"/>
-
-                <allow send_destination="org.freedesktop.systemd1"
-                       send_interface="org.freedesktop.DBus.Properties"
-                       send_member="Get"/>
-
-                <allow send_destination="org.freedesktop.systemd1"
-                       send_interface="org.freedesktop.DBus.Properties"
-                       send_member="GetAll"/>
-
-                <allow send_destination="org.freedesktop.systemd1"
-                       send_interface="org.freedesktop.systemd1.Manager"
-                       send_member="GetUnit"/>
-
-                <allow send_destination="org.freedesktop.systemd1"
-                       send_interface="org.freedesktop.systemd1.Manager"
-                       send_member="GetJob"/>
-
-                <allow send_destination="org.freedesktop.systemd1"
-                       send_interface="org.freedesktop.systemd1.Manager"
-                       send_member="ListUnits"/>
-
-                <allow send_destination="org.freedesktop.systemd1"
-                       send_interface="org.freedesktop.systemd1.Manager"
-                       send_member="ListJobs"/>
-
-                <allow send_destination="org.freedesktop.systemd1"
-                       send_interface="org.freedesktop.systemd1.Manager"
-                       send_member="Subscribe"/>
-
-                <allow send_destination="org.freedesktop.systemd1"
-                       send_interface="org.freedesktop.systemd1.Manager"
-                       send_member="Unsubscribe"/>
-
-                <allow send_destination="org.freedesktop.systemd1"
-                       send_interface="org.freedesktop.systemd1.Manager"
-                       send_member="Dump"/>
-
-                <allow receive_sender="org.freedesktop.systemd1"/>
-        </policy>
-
-</busconfig>
diff --git a/src/99-systemd.rules b/src/99-systemd.rules
new file mode 100644
index 0000000..e88f10a
--- /dev/null
+++ b/src/99-systemd.rules
@@ -0,0 +1,38 @@
+#  This file is part of systemd.
+#
+#  Copyright 2010 Lennart Poettering
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+
+ACTION!="add|change", GOTO="systemd_end"
+
+KERNEL=="tty[0-9]|tty1[0-2]", ENV{SYSTEMD_EXPOSE}="1"
+KERNEL=="ttyS*", ENV{SYSTEMD_EXPOSE}="1"
+
+SUBSYSTEM=="block", ENV{SYSTEMD_EXPOSE}="1"
+
+# We need a hardware independent way to identify network devices. We
+# use the /sys/subsystem path for this. Current vanilla kernels don't
+# actually support that hierarchy right now, however upcoming kernels
+# will. HAL and udev internally support /sys/subsystem already, hence
+# it should be safe to use this here, too. This is mostly just an
+# identification string for systemd, so whether the path actually is
+# accessible or not does not matter as long as it is unique and in the
+# filesystem namespace.
+#
+# http://git.kernel.org/?p=linux/hotplug/udev.git;a=blob;f=libudev/libudev-enumerate.c;h=da831449dcaf5e936a14409e8e68ab12d30a98e2;hb=HEAD#l742
+
+SUBSYSTEM=="net", KERNEL!="lo", ENV{SYSTEMD_EXPOSE}="1", ENV{SYSTEMD_ALIAS}="/sys/subsystem/net/devices/%k"
+
+LABEL="systemd_end"
diff --git a/src/org.freedesktop.systemd1.conf b/src/org.freedesktop.systemd1.conf
new file mode 100644
index 0000000..dfdc475
--- /dev/null
+++ b/src/org.freedesktop.systemd1.conf
@@ -0,0 +1,78 @@
+<?xml version="1.0"?> <!--*-nxml-*-->
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+        "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+
+<!--
+  This file is part of systemd.
+
+  Copyright 2010 Lennart Poettering
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<busconfig>
+
+        <policy user="root">
+                <allow own="org.freedesktop.systemd1"/>
+
+                <allow send_destination="org.freedesktop.systemd1"/>
+                <allow receive_sender="org.freedesktop.systemd1"/>
+        </policy>
+
+        <policy context="default">
+                <deny send_destination="org.freedesktop.systemd1"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.DBus.Introspectable"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.DBus.Properties"
+                       send_member="Get"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.DBus.Properties"
+                       send_member="GetAll"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="GetUnit"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="GetJob"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="ListUnits"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="ListJobs"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="Subscribe"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="Unsubscribe"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="Dump"/>
+
+                <allow receive_sender="org.freedesktop.systemd1"/>
+        </policy>
+
+</busconfig>
