From c88f64bd1ae833f3674b8945f5b31b102bdc0923 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 13 Aug 2010 19:13:25 +0200 Subject: [PATCH] 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 --- Makefile.am | 13 ++++++------- fixme | 6 +++--- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Makefile.am b/Makefile.am index e4fcb43d..c7663560 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@tty1.service getty@tty2.service getty@tty3.service getty@tty4.service getty@tty5.service getty@tty6.service && \ $(LN_S) $(systemunitdir)/getty@.service getty@tty1.service && \ diff --git a/fixme b/fixme index 9d7bbd11..31ebbbb1 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 -- 2.39.5