From: Kay Sievers <kay.sievers@vrfy.org>
Date: Thu, 20 May 2010 15:55:42 +0000 (+0200)
Subject: units: SUSE support
X-Git-Tag: v1~297
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cfe243e3720062c2e0eecd8bb0bdd7b4059e156d;p=thirdparty%2Fsystemd.git

units: SUSE support
---

diff --git a/configure.ac b/configure.ac
index 5e505365d3b..cccb0ee3cc2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -179,7 +179,7 @@ case $with_distro in
                 ;;
         suse)
                 SYSTEM_SYSVRCND_PATH=/etc/init.d
-                AC_DEFINE(TARGET_SUSE, [], [Target is OpenSUSE/SLES])
+                AC_DEFINE(TARGET_SUSE, [], [Target is OpenSUSE/SLE])
                 M4_DISTRO_FLAG=-DTARGET_SUSE=1
                 ;;
         debian)
diff --git a/src/service.c b/src/service.c
index ac83862db77..2f699cd1e66 100644
--- a/src/service.c
+++ b/src/service.c
@@ -57,7 +57,7 @@ static const struct {
         { "rc5.d",  SPECIAL_RUNLEVEL5_TARGET, RUNLEVEL_UP },
         { "rc6.d",  SPECIAL_RUNLEVEL6_TARGET, RUNLEVEL_DOWN },
 
-        /* SuSE style boot.d */
+        /* SUSE style boot.d */
         { "boot.d", SPECIAL_BASIC_TARGET,     RUNLEVEL_BASIC },
 
         /* Debian style rcS.d */
@@ -676,7 +676,7 @@ static int service_load_sysv_name(Service *s, const char *name) {
                 free(path);
 
                 if (r >= 0 && UNIT(s)->meta.load_state == UNIT_STUB) {
-                        /* Try Suse style boot.xxx init scripts */
+                        /* Try SUSE style boot.xxx init scripts */
 
                         if (asprintf(&path, "%s/boot.%s", *p, name) < 0)
                                 return -ENOMEM;
diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
index 72d4794da15..31e8415c036 100644
--- a/units/getty@.service.m4
+++ b/units/getty@.service.m4
@@ -6,6 +6,7 @@
 #  (at your option) any later version.
 
 m4_ifdef(`TARGET_FEDORA', `m4_define(`GETTY', `/sbin/mingetty')')m4_dnl
+m4_ifdef(`TARGET_SUSE', `m4_define(`GETTY', `/sbin/mingetty')')m4_dnl
 m4_ifdef(`TARGET_DEBIAN', `m4_define(`GETTY', `/sbin/getty 38400')')m4_dnl
 m4_ifdef(`TARGET_GENTOO', `m4_define(`GETTY', `/sbin/agetty 38400')')m4_dnl
 m4_dnl
diff --git a/units/graphical.target.m4 b/units/graphical.target.m4
index c9b76698fd8..98555adc24b 100644
--- a/units/graphical.target.m4
+++ b/units/graphical.target.m4
@@ -17,3 +17,6 @@ m4_ifdef(`TARGET_FEDORA',
 m4_dnl On Fedora Runlevel 5 is graphical login
 Names=runlevel5.target
 )m4_dnl
+m4_ifdef(`TARGET_SUSE',
+Names=runlevel5.target
+)m4_dnl
diff --git a/units/multi-user.target.m4 b/units/multi-user.target.m4
index ac05be87daa..2cc74893edd 100644
--- a/units/multi-user.target.m4
+++ b/units/multi-user.target.m4
@@ -17,3 +17,6 @@ m4_ifdef(`TARGET_FEDORA',
 m4_dnl On Fedora Runlevel 3 is multi-user
 Names=runlevel3.target
 )m4_dnl
+m4_ifdef(`TARGET_SUSE',
+Names=runlevel3.target
+)m4_dnl