From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 22 May 2012 14:12:25 +0000 (+0200)
Subject: rescue: don't pull in sockets
X-Git-Tag: v183~43
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=49e7f0277444ca10623fe790ff754f7c006f8c64;hp=499fb2152f8518796607dd0406698cb6ce4c7098;p=elogind.git

rescue: don't pull in sockets

In rescue mode let's not establish all sockets, so that we don't end up
starting a lot of additional services automatically.

Instead of pulling in basic.target we now only pull in sysinit.target
which pulls in local-fs.target and swap.target. That way rescue mode has
all the really basic setup around, but normal services are not started
and not autostarted either.
---

diff --git a/Makefile.am b/Makefile.am
index e9ac82c04..4c1b295cc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1446,9 +1446,9 @@ systemd-install-hook:
 	mkdir -p $(DESTDIR)$(systemunitdir)/sockets.target.wants
 	ln -sf ../systemd-udev-control.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udev-control.socket
 	ln -sf ../systemd-udev-kernel.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udev-kernel.socket
-	mkdir -p $(DESTDIR)$(systemunitdir)/basic.target.wants
-	ln -sf ../systemd-udev.service $(DESTDIR)$(systemunitdir)/basic.target.wants/systemd-udev.service
-	ln -sf ../systemd-udev-trigger.service $(DESTDIR)$(systemunitdir)/basic.target.wants/systemd-udev-trigger.service
+	mkdir -p $(DESTDIR)$(systemunitdir)/sysinit.target.wants
+	ln -sf ../systemd-udev.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udev.service
+	ln -sf ../systemd-udev-trigger.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udev-trigger.service
 
 INSTALL_DATA_HOOKS += systemd-install-hook
 
diff --git a/units/rescue.service.m4.in b/units/rescue.service.m4.in
index 75b9fde27..5fb82e614 100644
--- a/units/rescue.service.m4.in
+++ b/units/rescue.service.m4.in
@@ -9,7 +9,7 @@
 Description=Rescue Shell
 DefaultDependencies=no
 Conflicts=shutdown.target
-After=basic.target plymouth-start.service
+After=sysinit.target plymouth-start.service
 Before=shutdown.target
 
 [Service]
diff --git a/units/rescue.target b/units/rescue.target
index c17a4e12d..3f59b1433 100644
--- a/units/rescue.target
+++ b/units/rescue.target
@@ -8,8 +8,8 @@
 [Unit]
 Description=Rescue Mode
 Documentation=man:systemd.special(7)
-Requires=basic.target rescue.service
-After=basic.target rescue.service
+Requires=sysinit.target rescue.service
+After=sysinit.target rescue.service
 AllowIsolate=yes
 
 [Install]