[systemd-commits] 2 commits - fixme Makefile.am

[Lennart Poettering]

 Makefile.am |   42 ++++++++++++++++++++++--------------------
 fixme       |    6 +++---
 2 files changed, 25 insertions(+), 23 deletions(-)

New commits:
commit 3cc144eba3b085265d1620c441e38f759e204716
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Aug 13 19:14:12 2010 +0200

    units: move plymouth services from /etc to /lib since fedora does not support plymouth-less boots

diff --git a/Makefile.am b/Makefile.am
index c766356..2c1caa5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -821,10 +821,11 @@ install-data-hook:
 if TARGET_FEDORA
 	$(MKDIR_P) -m 0755 \
 		$(DESTDIR)$(SYSTEM_SYSVINIT_PATH) \
-		$(DESTDIR)$(pkgsysconfdir)/system/reboot.target.wants \
-		$(DESTDIR)$(pkgsysconfdir)/system/poweroff.target.wants \
-		$(DESTDIR)$(pkgsysconfdir)/system/halt.target.wants \
-		$(DESTDIR)$(systemunitdir)/rescue.target.wants
+		$(DESTDIR)$(systemunitdir)/reboot.target.wants \
+		$(DESTDIR)$(systemunitdir)/poweroff.target.wants \
+		$(DESTDIR)$(systemunitdir)/halt.target.wants \
+		$(DESTDIR)$(systemunitdir)/rescue.target.wants \
+		$(DESTDIR)$(systemunitdir)/multi-user.target.wants
 	( cd $(DESTDIR)$(pkgsysconfdir)/system && \
 		rm -f display-manager.service && \
 		$(LN_S) $(systemunitdir)/prefdm.service display-manager.service )
@@ -832,21 +833,23 @@ if TARGET_FEDORA
 		rm -f prefdm.service && \
 		$(LN_S) $(systemunitdir)/prefdm.service prefdm.service )
 	( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
-		rm -f rc-local.service plymouth-quit.service && \
-		$(LN_S) $(systemunitdir)/rc-local.service rc-local.service && \
-		$(LN_S) $(systemunitdir)/plymouth-quit.service plymouth-quit.service )
+		rm -f rc-local.service && \
+		$(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
 	( cd $(DESTDIR)$(systemunitdir)/rescue.target.wants && \
 		rm -f single.service && \
 		$(LN_S) $(systemunitdir)/single.service single.service )
-	( cd $(DESTDIR)$(pkgsysconfdir)/system/reboot.target.wants && \
+	( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
+		rm -f plymouth-quit.service && \
+		$(LN_S) ../plymouth-quit.service plymouth-quit.service )
+	( cd $(DESTDIR)$(systemunitdir)/reboot.target.wants && \
 		rm -f plymouth-reboot.service && \
-		$(LN_S) $(systemunitdir)/plymouth-reboot.service plymouth-reboot.service )
-	( cd $(DESTDIR)$(pkgsysconfdir)/system/poweroff.target.wants && \
+		$(LN_S) ../plymouth-reboot.service plymouth-reboot.service )
+	( cd $(DESTDIR)$(systemunitdir)/poweroff.target.wants && \
 		rm -f plymouth-poweroff.service && \
-		$(LN_S) $(systemunitdir)/plymouth-poweroff.service plymouth-poweroff.service )
-	( cd $(DESTDIR)$(pkgsysconfdir)/system/halt.target.wants && \
+		$(LN_S) ../plymouth-poweroff.service plymouth-poweroff.service )
+	( cd $(DESTDIR)$(systemunitdir)/halt.target.wants && \
 		rm -f plymouth-halt.service && \
-		$(LN_S) $(systemunitdir)/plymouth-halt.service plymouth-halt.service )
+		$(LN_S) ../plymouth-halt.service plymouth-halt.service )
 	( cd $(DESTDIR)$(systemunitdir) && \
 		rm -f local.service && \
 		$(LN_S) rc-local.service local.service )
commit c88f64bd1ae833f3674b8945f5b31b102bdc0923
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Aug 13 19:13:25 2010 +0200

    units: move runlevel[2-5] links to /lib because they are legacy and hence should not be as obviously in sight. The user may still override them by placing links in /etc

diff --git a/Makefile.am b/Makefile.am
index e4fcb43..c766356 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -779,20 +779,19 @@ install-data-hook:
 		$(LN_S) $(systemunitdir)/bluetooth.target bluetooth.target && \
 		$(LN_S) $(systemunitdir)/printer.target printer.target)
 	( cd $(DESTDIR)$(systemunitdir) && \
-		rm -f runlevel0.target runlevel1.target runlevel6.target && \
+		rm -f runlevel0.target runlevel1.target runlevel2.target runlevel3.target runlevel4.target runlevel5.target runlevel6.target && \
 		$(LN_S) poweroff.target runlevel0.target && \
 		$(LN_S) rescue.target runlevel1.target && \
+		$(LN_S) multi-user.target runlevel2.target && \
+		$(LN_S) multi-user.target runlevel3.target && \
+		$(LN_S) multi-user.target runlevel4.target && \
+		$(LN_S) graphical.target runlevel5.target && \
 		$(LN_S) reboot.target runlevel6.target )
 	( cd $(DESTDIR)$(pkgsysconfdir)/system && \
 		rm -f default.target ctrl-alt-del.target kbrequest.target && \
 		$(LN_S) $(systemunitdir)/graphical.target default.target && \
 		$(LN_S) $(systemunitdir)/reboot.target ctrl-alt-del.target && \
-		$(LN_S) $(systemunitdir)/rescue.target kbrequest.target && \
-		rm -f runlevel2.target runlevel3.target runlevel4.target runlevel5.target && \
-		$(LN_S) $(systemunitdir)/multi-user.target runlevel2.target && \
-		$(LN_S) $(systemunitdir)/multi-user.target runlevel3.target && \
-		$(LN_S) $(systemunitdir)/multi-user.target runlevel4.target && \
-		$(LN_S) $(systemunitdir)/graphical.target runlevel5.target )
+		$(LN_S) $(systemunitdir)/rescue.target kbrequest.target )
 	( cd $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants && \
 		rm -f getty at tty1.service getty at tty2.service getty at tty3.service getty at tty4.service getty at tty5.service getty at tty6.service && \
 		$(LN_S) $(systemunitdir)/getty at .service getty at tty1.service && \
diff --git a/fixme b/fixme
index 9d7bbd1..31ebbbb 100644
--- a/fixme
+++ b/fixme
@@ -71,13 +71,13 @@
 
 * be more forgiving when parsing unit files, when encountering incorrect lines with assignments
 
-* move runlevel symlinks to /lib
-
 * agetty darf nicht mit emergency.service kollidieren
 
+* sort systemctl list-units/lis-jobs output
+
 External:
 
-* sysv functions should color when stdout is ttny, not stdin
+* sysv functions should color when stdout is tty, not stdin
 
 * agetty should not modify baudrate https://bugzilla.redhat.com/show_bug.cgi?id=623685