From 96d9117ad2db7d8c13f7898127eee8939e88daf1 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 28 Apr 2015 17:13:23 +0200 Subject: 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. --- units/.gitignore | 1 - units/systemd-fsck-root.service.in | 2 -- units/systemd-fsck@.service.in | 3 +-- units/systemd-fsckd.service.in | 17 ----------------- units/systemd-fsckd.socket | 15 --------------- 5 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 units/systemd-fsckd.service.in delete mode 100644 units/systemd-fsckd.socket (limited to 'units') diff --git a/units/.gitignore b/units/.gitignore index d81d0c587a..b8f0a0b723 100644 --- a/units/.gitignore +++ b/units/.gitignore @@ -28,7 +28,6 @@ /systemd-firstboot.service /systemd-fsck-root.service /systemd-fsck@.service -/systemd-fsckd.service /systemd-machine-id-commit.service /systemd-halt.service /systemd-hibernate.service diff --git a/units/systemd-fsck-root.service.in b/units/systemd-fsck-root.service.in index f493445b86..3617abf04a 100644 --- a/units/systemd-fsck-root.service.in +++ b/units/systemd-fsck-root.service.in @@ -9,9 +9,7 @@ Description=File System Check on Root Device Documentation=man:systemd-fsck-root.service(8) DefaultDependencies=no -Wants=systemd-fsckd.socket Before=local-fs.target shutdown.target -After=systemd-fsckd.socket ConditionPathIsReadWrite=!/ [Service] diff --git a/units/systemd-fsck@.service.in b/units/systemd-fsck@.service.in index e6d98c031b..0468392dc4 100644 --- a/units/systemd-fsck@.service.in +++ b/units/systemd-fsck@.service.in @@ -10,8 +10,7 @@ Description=File System Check on %f Documentation=man:systemd-fsck@.service(8) DefaultDependencies=no BindsTo=%i.device -Wants=systemd-fsckd.socket -After=%i.device systemd-fsck-root.service local-fs-pre.target systemd-fsckd.socket +After=%i.device systemd-fsck-root.service local-fs-pre.target Before=shutdown.target [Service] diff --git a/units/systemd-fsckd.service.in b/units/systemd-fsckd.service.in deleted file mode 100644 index 9c7ed5146d..0000000000 --- a/units/systemd-fsckd.service.in +++ /dev/null @@ -1,17 +0,0 @@ -# This file is part of systemd. -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. - -[Unit] -Description=File System Check Daemon to report status -Documentation=man:systemd-fsckd.service(8) -DefaultDependencies=no -Requires=systemd-fsckd.socket -Before=shutdown.target - -[Service] -ExecStart=@rootlibexecdir@/systemd-fsckd -StandardOutput=journal+console diff --git a/units/systemd-fsckd.socket b/units/systemd-fsckd.socket deleted file mode 100644 index 92e8eefea6..0000000000 --- a/units/systemd-fsckd.socket +++ /dev/null @@ -1,15 +0,0 @@ -# This file is part of systemd. -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. - -[Unit] -Description=fsck to fsckd communication Socket -Documentation=man:systemd-fsckd.service(8) man:systemd-fsck@.service(8) man:systemd-fsck-root.service(8) -DefaultDependencies=no - -[Socket] -ListenStream=/run/systemd/fsckd -SocketMode=0600 -- cgit v1.2.3-54-g00ecf