[systemd-commits] 2 commits - src/path-lookup.c src/selinux-setup.c systemd.pc.in TODO

Lennart Poettering lennart at kemper.freedesktop.org
Wed Mar 9 11:33:43 PST 2011


 TODO                |    6 ------
 src/path-lookup.c   |    2 ++
 src/selinux-setup.c |    2 +-
 systemd.pc.in       |    1 +
 4 files changed, 4 insertions(+), 7 deletions(-)

New commits:
commit 607df95be184308b6bb7a5534f04109c67c039c3
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Mar 9 20:15:44 2011 +0100

    pkconfig: export full search path as .pc variable

diff --git a/src/path-lookup.c b/src/path-lookup.c
index f094969..1a21ca0 100644
--- a/src/path-lookup.c
+++ b/src/path-lookup.c
@@ -181,6 +181,8 @@ int lookup_paths_init(LookupPaths *p, ManagerRunningAs running_as) {
                                 return -ENOMEM;
                 } else
                         if (!(p->unit_path = strv_new(
+                                              /* If you modify this you also want to modify
+                                               * systemdsystemunitpath= in systemd.pc.in! */
                                               "/dev/.systemd/system",
                                               SYSTEM_CONFIG_UNIT_PATH,
                                               "/etc/systemd/system",
diff --git a/systemd.pc.in b/systemd.pc.in
index 2049913..e939293 100644
--- a/systemd.pc.in
+++ b/systemd.pc.in
@@ -11,6 +11,7 @@ systemdsystemunitdir=@systemunitdir@
 systemduserunitdir=@pkgdatadir@/user
 systemdsystemconfdir=@pkgsysconfdir@/system
 systemduserconfdir=@pkgsysconfdir@/user
+systemdsystemunitpath=/dev/.systemd/system:${systemdsystemconfdir}:/etc/systemd/system:/usr/local/share/systemd/system:/usr/share/systemd/system:/lib/systemd/system:${systemdsystemunitdir}
 
 Name: systemd
 Description: systemd System and Service Manager

commit 2e60ecb2f760936552f9d6db32d6ecf828b3c322
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Mar 9 20:12:30 2011 +0100

    selinux: bump up error level when in non-enforcing mode

diff --git a/TODO b/TODO
index 237ba7b..8395d69 100644
--- a/TODO
+++ b/TODO
@@ -6,8 +6,6 @@ F15:
 
 * isolate multi-user.target doesn't start a getty at tty1 if we run it from graphical.target
 
-* finish syslog socket stuff
-
 * NFS, networkmanager ordering issue
 
 * add fstab fields to add wait timeouts, change Wants to Requires by local-fs.target
@@ -16,10 +14,6 @@ F15:
 
 * mount /dev/.run and /var/run as bind mounts
 
-* Make use of UnknownInterface
-
-* support chkconfig without forwarding to systemctl to facilitate upgrades
-
 * drop SIGHUP handling from rsyslog.service upstream
 
 * teach dbus to activate all services it finds in /etc/systemd/services/org-*.service
diff --git a/src/selinux-setup.c b/src/selinux-setup.c
index b2beb33..8bd9380 100644
--- a/src/selinux-setup.c
+++ b/src/selinux-setup.c
@@ -59,7 +59,7 @@ int selinux_setup(char *const argv[]) {
                return -errno;
 
        } else {
-               log_full(enforce > 0 ? LOG_ERR : LOG_DEBUG, "Failed to load SELinux policy.");
+               log_full(enforce > 0 ? LOG_ERR : LOG_WARNING, "Failed to load SELinux policy.");
 
                unlink("/dev/.systemd/relabel-devtmpfs");
 



More information about the systemd-commits mailing list