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 e9ac82c049427c3dc6ce9581cc19d43945a38ec5..4c1b295cc51daa07f1458e5d75f34f519edc2f53 100644 (file)
--- 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 75b9fde278a4e9dfdc063ca7546c15b88c13ade7..5fb82e614d18a3d45af46afe14157ff7fb1c45bf 100644 (file)
--- 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 c17a4e12d0ca03fc9b1b99a91dddbf6b8ce72c2a..3f59b14339b6d9d9eb0ad02aaa3011bcd5b183d6 100644 (file)
--- 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]