units: SUSE support

diff --git a/configure.ac b/configure.ac
index 5e505365d3b8f8bbee8ae31f3897892d1fdbcbc1..cccb0ee3cc26017f58c3a871ed3ed97473ba9bd9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -179,7 +179,7 @@ case $with_distro in
                 ;;
         suse)
                 SYSTEM_SYSVRCND_PATH=/etc/init.d
                 ;;
         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)
                 M4_DISTRO_FLAG=-DTARGET_SUSE=1
                 ;;
         debian)

diff --git a/src/service.c b/src/service.c
index ac83862db770c39e886b8bf44694ecd3edea3835..2f699cd1e66a582e9c7f0653594b6ce2c6d18a01 100644 (file)
--- 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 },
 
         { "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 */
         { "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) {
                 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;
 
                         if (asprintf(&path, "%s/boot.%s", *p, name) < 0)
                                 return -ENOMEM;

diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
index 72d4794da15153aff3c228bf27b4637c3553e7c9..31e8415c0367d4c1c4bf4aed18ef96818531771f 100644 (file)
--- 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
 #  (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
 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 c9b76698fd8f9aabf3483a2adf43f3c2acdcc364..98555adc24bc13a6acc2c298ad6eb754d238b234 100644 (file)
--- 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_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 ac05be87daa08278fa978c9f7135f93c1e212f6e..2cc74893eddfd1ceea3be9705372e50ca9d597d8 100644 (file)
--- 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_dnl On Fedora Runlevel 3 is multi-user
 Names=runlevel3.target
 )m4_dnl

+m4_ifdef(`TARGET_SUSE',
+Names=runlevel3.target
+)m4_dnl