Skip to content
Permalink
Browse files

fsck: remove fsckd again, but keep the door open for external replace…

…ment

For a longer discussion see this:

http://lists.freedesktop.org/archives/systemd-devel/2015-April/030175.html

This introduces /run/systemd/fsck.progress as a simply
AF_UNIX/SOCK_STREAM socket. If it exists and is connectable we'll
connect fsck's -c switch with it. If external programs want to get
progress data they should hence listen on this socket and will get
all they need via that socket. To get information about the connecting
fsck client they should use SO_PEERCRED.

Unless /run/systemd/fsck.progress is around and connectable this change
reverts back to v219 behaviour where we'd forward fsck output to
/dev/console on our own.
  • Loading branch information
poettering committed Apr 28, 2015
1 parent e7a3aa3 commit 96d9117ad2db7d8c13f7898127eee8939e88daf1
@@ -78,7 +78,6 @@
/systemd-export
/systemd-firstboot
/systemd-fsck
/systemd-fsckd
/systemd-fstab-generator
/systemd-getty-generator
/systemd-gnome-ask-password-agent
@@ -66,7 +66,6 @@ MANPAGES += \
man/systemd-efi-boot-generator.8 \
man/systemd-escape.1 \
man/systemd-fsck@.service.8 \
man/systemd-fsckd.service.8 \
man/systemd-fstab-generator.8 \
man/systemd-getty-generator.8 \
man/systemd-gpt-auto-generator.8 \
@@ -209,8 +208,6 @@ MANPAGES_ALIAS += \
man/systemd-ask-password-wall.service.8 \
man/systemd-fsck-root.service.8 \
man/systemd-fsck.8 \
man/systemd-fsckd.8 \
man/systemd-fsckd.socket.8 \
man/systemd-hibernate-resume.8 \
man/systemd-hibernate.service.8 \
man/systemd-hybrid-sleep.service.8 \
@@ -321,8 +318,6 @@ man/systemd-ask-password-wall.path.8: man/systemd-ask-password-console.service.8
man/systemd-ask-password-wall.service.8: man/systemd-ask-password-console.service.8
man/systemd-fsck-root.service.8: man/systemd-fsck@.service.8
man/systemd-fsck.8: man/systemd-fsck@.service.8
man/systemd-fsckd.8: man/systemd-fsckd.service.8
man/systemd-fsckd.socket.8: man/systemd-fsckd.service.8
man/systemd-hibernate-resume.8: man/systemd-hibernate-resume@.service.8
man/systemd-hibernate.service.8: man/systemd-suspend.service.8
man/systemd-hybrid-sleep.service.8: man/systemd-suspend.service.8
@@ -601,12 +596,6 @@ man/systemd-fsck-root.service.html: man/systemd-fsck@.service.html
man/systemd-fsck.html: man/systemd-fsck@.service.html
$(html-alias)

man/systemd-fsckd.html: man/systemd-fsckd.service.html
$(html-alias)

man/systemd-fsckd.socket.html: man/systemd-fsckd.service.html
$(html-alias)

man/systemd-hibernate-resume.html: man/systemd-hibernate-resume@.service.html
$(html-alias)

@@ -1764,7 +1753,6 @@ EXTRA_DIST += \
man/systemd-escape.xml \
man/systemd-firstboot.xml \
man/systemd-fsck@.service.xml \
man/systemd-fsckd.service.xml \
man/systemd-fstab-generator.xml \
man/systemd-getty-generator.xml \
man/systemd-gpt-auto-generator.xml \
@@ -398,7 +398,6 @@ rootlibexec_PROGRAMS = \
systemd-remount-fs \
systemd-reply-password \
systemd-fsck \
systemd-fsckd \
systemd-machine-id-commit \
systemd-ac-power \
systemd-sysctl \
@@ -501,7 +500,6 @@ dist_systemunit_DATA = \
units/slices.target \
units/system.slice \
units/x-.slice \
units/systemd-fsckd.socket \
units/systemd-initctl.socket \
units/syslog.socket \
units/dev-hugepages.mount \
@@ -552,7 +550,6 @@ nodist_systemunit_DATA = \
units/systemd-kexec.service \
units/systemd-fsck@.service \
units/systemd-fsck-root.service \
units/systemd-fsckd.service \
units/systemd-machine-id-commit.service \
units/systemd-udevd.service \
units/systemd-udev-trigger.service \
@@ -605,7 +602,6 @@ EXTRA_DIST += \
units/user/systemd-exit.service.in \
units/systemd-fsck@.service.in \
units/systemd-fsck-root.service.in \
units/systemd-fsckd.service.in \
units/systemd-machine-id-commit.service.in \
units/user@.service.m4.in \
units/debug-shell.service.in \
@@ -2377,19 +2373,6 @@ systemd_fsck_LDADD = \
libsystemd-internal.la \
libsystemd-shared.la

# ------------------------------------------------------------------------------
systemd_fsckd_SOURCES = \
src/fsckd/fsckd.c \
src/fsckd/fsckd.h \
$(NULL)

systemd_fsckd_LDADD = \
libsystemd-internal.la \
libsystemd-label.la \
libsystemd-shared.la \
libudev-internal.la \
$(NULL)

# ------------------------------------------------------------------------------
systemd_machine_id_commit_SOURCES = \
src/machine-id-commit/machine-id-commit.c \
@@ -80,9 +80,7 @@
the filesystem should actually be checked based on the time since
last check, number of mounts, unclean unmount, etc.</para>

<para><filename>systemd-fsck</filename> will forward file system
checking progress to <filename>systemd-fsckd.service</filename>
socket. If a file system check fails for a service without
<para>If a file system check fails for a service without
<option>nofail</option>, emergency mode is activated, by isolating
to <filename>emergency.target</filename>.</para>
</refsect1>

This file was deleted.

0 comments on commit 96d9117

Please sign in to comment.
You can’t perform that action at this time.