Skip to content

Commit 96d9117

Browse files
committed
fsck: remove fsckd again, but keep the door open for external replacement
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.
1 parent e7a3aa3 commit 96d9117

14 files changed

+167
-1002
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@
7878
/systemd-export
7979
/systemd-firstboot
8080
/systemd-fsck
81-
/systemd-fsckd
8281
/systemd-fstab-generator
8382
/systemd-getty-generator
8483
/systemd-gnome-ask-password-agent

Makefile-man.am

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ MANPAGES += \
6666
man/systemd-efi-boot-generator.8 \
6767
man/systemd-escape.1 \
6868
man/systemd-fsck@.service.8 \
69-
man/systemd-fsckd.service.8 \
7069
man/systemd-fstab-generator.8 \
7170
man/systemd-getty-generator.8 \
7271
man/systemd-gpt-auto-generator.8 \
@@ -209,8 +208,6 @@ MANPAGES_ALIAS += \
209208
man/systemd-ask-password-wall.service.8 \
210209
man/systemd-fsck-root.service.8 \
211210
man/systemd-fsck.8 \
212-
man/systemd-fsckd.8 \
213-
man/systemd-fsckd.socket.8 \
214211
man/systemd-hibernate-resume.8 \
215212
man/systemd-hibernate.service.8 \
216213
man/systemd-hybrid-sleep.service.8 \
@@ -321,8 +318,6 @@ man/systemd-ask-password-wall.path.8: man/systemd-ask-password-console.service.8
321318
man/systemd-ask-password-wall.service.8: man/systemd-ask-password-console.service.8
322319
man/systemd-fsck-root.service.8: man/systemd-fsck@.service.8
323320
man/systemd-fsck.8: man/systemd-fsck@.service.8
324-
man/systemd-fsckd.8: man/systemd-fsckd.service.8
325-
man/systemd-fsckd.socket.8: man/systemd-fsckd.service.8
326321
man/systemd-hibernate-resume.8: man/systemd-hibernate-resume@.service.8
327322
man/systemd-hibernate.service.8: man/systemd-suspend.service.8
328323
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
601596
man/systemd-fsck.html: man/systemd-fsck@.service.html
602597
$(html-alias)
603598

604-
man/systemd-fsckd.html: man/systemd-fsckd.service.html
605-
$(html-alias)
606-
607-
man/systemd-fsckd.socket.html: man/systemd-fsckd.service.html
608-
$(html-alias)
609-
610599
man/systemd-hibernate-resume.html: man/systemd-hibernate-resume@.service.html
611600
$(html-alias)
612601

@@ -1764,7 +1753,6 @@ EXTRA_DIST += \
17641753
man/systemd-escape.xml \
17651754
man/systemd-firstboot.xml \
17661755
man/systemd-fsck@.service.xml \
1767-
man/systemd-fsckd.service.xml \
17681756
man/systemd-fstab-generator.xml \
17691757
man/systemd-getty-generator.xml \
17701758
man/systemd-gpt-auto-generator.xml \

Makefile.am

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,6 @@ rootlibexec_PROGRAMS = \
398398
systemd-remount-fs \
399399
systemd-reply-password \
400400
systemd-fsck \
401-
systemd-fsckd \
402401
systemd-machine-id-commit \
403402
systemd-ac-power \
404403
systemd-sysctl \
@@ -501,7 +500,6 @@ dist_systemunit_DATA = \
501500
units/slices.target \
502501
units/system.slice \
503502
units/x-.slice \
504-
units/systemd-fsckd.socket \
505503
units/systemd-initctl.socket \
506504
units/syslog.socket \
507505
units/dev-hugepages.mount \
@@ -552,7 +550,6 @@ nodist_systemunit_DATA = \
552550
units/systemd-kexec.service \
553551
units/systemd-fsck@.service \
554552
units/systemd-fsck-root.service \
555-
units/systemd-fsckd.service \
556553
units/systemd-machine-id-commit.service \
557554
units/systemd-udevd.service \
558555
units/systemd-udev-trigger.service \
@@ -605,7 +602,6 @@ EXTRA_DIST += \
605602
units/user/systemd-exit.service.in \
606603
units/systemd-fsck@.service.in \
607604
units/systemd-fsck-root.service.in \
608-
units/systemd-fsckd.service.in \
609605
units/systemd-machine-id-commit.service.in \
610606
units/user@.service.m4.in \
611607
units/debug-shell.service.in \
@@ -2377,19 +2373,6 @@ systemd_fsck_LDADD = \
23772373
libsystemd-internal.la \
23782374
libsystemd-shared.la
23792375

2380-
# ------------------------------------------------------------------------------
2381-
systemd_fsckd_SOURCES = \
2382-
src/fsckd/fsckd.c \
2383-
src/fsckd/fsckd.h \
2384-
$(NULL)
2385-
2386-
systemd_fsckd_LDADD = \
2387-
libsystemd-internal.la \
2388-
libsystemd-label.la \
2389-
libsystemd-shared.la \
2390-
libudev-internal.la \
2391-
$(NULL)
2392-
23932376
# ------------------------------------------------------------------------------
23942377
systemd_machine_id_commit_SOURCES = \
23952378
src/machine-id-commit/machine-id-commit.c \

man/systemd-fsck@.service.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,7 @@
8080
the filesystem should actually be checked based on the time since
8181
last check, number of mounts, unclean unmount, etc.</para>
8282

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

man/systemd-fsckd.service.xml

Lines changed: 0 additions & 162 deletions
This file was deleted.

0 commit comments

Comments
 (0)