From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 18 Mar 2011 03:37:31 +0000 (+0100)
Subject: units: get rid of runlevel Names=, the symlinks in /lib/systemd/system are much more... 
X-Git-Tag: v21~46
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=97df13c0ac43addbf2317e438d80aa78e90c3f92

units: get rid of runlevel Names=, the symlinks in /lib/systemd/system are much more useful
---

diff --git a/units/graphical.target.m4 b/units/graphical.target.m4
index 1931d7f98..f2e30341d 100644
--- a/units/graphical.target.m4
+++ b/units/graphical.target.m4
@@ -12,20 +12,6 @@ Description=Graphical Interface
 Requires=multi-user.target
 After=multi-user.target
 Conflicts=rescue.target
-m4_dnl
-m4_ifdef(`TARGET_FEDORA',
-# On Fedora Runlevel 5 is graphical login
-Names=runlevel5.target
-)m4_dnl
-m4_ifdef(`TARGET_SUSE',
-Names=runlevel5.target
-)m4_dnl
-m4_ifdef(`TARGET_ALTLINUX',
-Names=runlevel5.target
-)m4_dnl
-m4_ifdef(`TARGET_MANDRIVA',
-Names=runlevel5.target
-)m4_dnl
 AllowIsolate=yes
 
 [Install]
diff --git a/units/multi-user.target.m4 b/units/multi-user.target.m4
index 51e7b6664..66f1a950f 100644
--- a/units/multi-user.target.m4
+++ b/units/multi-user.target.m4
@@ -12,26 +12,6 @@ Description=Multi-User
 Requires=basic.target
 Conflicts=rescue.service rescue.target
 After=basic.target rescue.service rescue.target
-m4_dnl
-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
-m4_ifdef(`TARGET_ALTLINUX',
-Names=runlevel3.target
-)m4_dnl
-m4_ifdef(`TARGET_DEBIAN',
-m4_ifdef(`TARGET_UBUNTU',
-m4_dnl On Debian/Ubuntu Runlevel 2, 3, 4 and 5 are multi-user
-Names=runlevel2.target runlevel3.target runlevel4.target runlevel5.target
-)m4_dnl
-)m4_dnl
-m4_ifdef(`TARGET_MANDRIVA',
-Names=runlevel3.target
-)m4_dnl
 AllowIsolate=yes
 
 [Install]
diff --git a/units/poweroff.target b/units/poweroff.target
index 975b08896..d2ccf4b2c 100644
--- a/units/poweroff.target
+++ b/units/poweroff.target
@@ -10,7 +10,6 @@
 [Unit]
 Description=Power-Off
 DefaultDependencies=no
-Names=runlevel0.target
 Requires=poweroff.service
 After=poweroff.service
 AllowIsolate=yes
diff --git a/units/reboot.target b/units/reboot.target
index 2cd46a062..41e133cb7 100644
--- a/units/reboot.target
+++ b/units/reboot.target
@@ -10,7 +10,6 @@
 [Unit]
 Description=Reboot
 DefaultDependencies=no
-Names=runlevel6.target
 Requires=reboot.service
 After=reboot.service
 AllowIsolate=yes
diff --git a/units/rescue.target b/units/rescue.target
index ff3aef033..5bf3f8e8e 100644
--- a/units/rescue.target
+++ b/units/rescue.target
@@ -11,7 +11,6 @@
 Description=Rescue Mode
 Requires=basic.target rescue.service
 After=basic.target rescue.service
-Names=runlevel1.target
 AllowIsolate=yes
 
 [Install]