[systemd-commits] 2 commits - Makefile.am src/hostname-setup.c units/systemd-initctl.service.in units/systemd-logger.service.in

[Lennart Poettering]

 Makefile.am                      |    5 ++---
 src/hostname-setup.c             |    3 ++-
 units/systemd-initctl.service.in |    2 +-
 units/systemd-logger.service.in  |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 1136a371e204602a5a4d7cc5870f573bb61ee182
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Jun 2 15:51:38 2010 +0200

    untis: fix path to helper services

diff --git a/Makefile.am b/Makefile.am
index d752ec5..2ab7995 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -368,11 +368,10 @@ systemadm_LDADD = $(DBUSGLIB_LIBS) $(GTK_LIBS)
 
 SED_PROCESS = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-	$(SED)  -e 's, at libexecdir\@,$(libexecdir),g' \
-		-e 's, at pkglibexecdir\@,$(pkglibexecdir),g' \
+	$(SED)  -e 's, at rootlibexecdir\@,$(rootlibexecdir),g' \
 		-e 's, at SPECIAL_SYSLOG_SERVICE\@,$(SPECIAL_SYSLOG_SERVICE),g' \
 		-e 's, at SPECIAL_DBUS_SERVICE\@,$(SPECIAL_DBUS_SERVICE),g' \
-		-e 's, at SYSTEMCTL\@,$(bindir)/systemctl,g' \
+		-e 's, at SYSTEMCTL\@,$(rootbindir)/systemctl,g' \
 		< $< > $@
 
 units/%: units/%.in Makefile
diff --git a/units/systemd-initctl.service.in b/units/systemd-initctl.service.in
index 283c057..6c93653 100644
--- a/units/systemd-initctl.service.in
+++ b/units/systemd-initctl.service.in
@@ -11,5 +11,5 @@
 Description=systemd /dev/initctl Compatibility Daemon
 
 [Service]
-ExecStart=@pkglibexecdir@/systemd-initctl
+ExecStart=@rootlibexecdir@/systemd-initctl
 Type=simple
diff --git a/units/systemd-logger.service.in b/units/systemd-logger.service.in
index 39a2001..5fc0532 100644
--- a/units/systemd-logger.service.in
+++ b/units/systemd-logger.service.in
@@ -12,5 +12,5 @@ Description=systemd Logging Daemon
 After=@SPECIAL_SYSLOG_SERVICE@
 
 [Service]
-ExecStart=@pkglibexecdir@/systemd-logger
+ExecStart=@rootlibexecdir@/systemd-logger
 Type=simple
commit 10a49d708df010645717d2791050caf8629f62c2
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Jun 2 15:40:43 2010 +0200

    hostname: keep dots in hostname

diff --git a/src/hostname-setup.c b/src/hostname-setup.c
index 3b988d4..e9f722e 100644
--- a/src/hostname-setup.c
+++ b/src/hostname-setup.c
@@ -52,7 +52,8 @@ static char* strip_bad_chars(char *s) {
                     (*p >= 'A' && *p <= 'Z') ||
                     (*p >= '0' && *p <= '9') ||
                     *p == '-' ||
-                    *p == '_')
+                    *p == '_' ||
+                    *p == '.')
                         *(d++) = *p;
 
         *d = 0;