From 93a1d735aca5584a005d851f12cb0b8c7bb5e5ca Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 25 Jun 2012 13:47:45 +0200 Subject: units: rename fsck@.service to systemd-fsck@.service The rule is that units that encapsulate our own code are prefixed with "systemd-". Since the fsck units invoke our own code, hence add the missing prefix. Since a long long time the fsck units didn't invoke the naked fsck binaries anymore, and it is unlikely that this well ever change. On the opposite: the code in systemd-fsck will probably get more complex over time to handle fsck progress to plymouth forwarding. Same for quotacheck (but not quotaon!) --- Makefile.am | 16 ++++++++-------- man/kernel-command-line.xml | 8 ++++---- src/core/mount.c | 2 +- src/core/special.h | 4 ++-- units/.gitignore | 6 +++--- units/fsck-root.service.in | 24 ------------------------ units/fsck@.service.in | 20 -------------------- units/quotacheck.service.in | 19 ------------------- units/quotaon.service | 2 +- units/systemd-fsck-root.service.in | 24 ++++++++++++++++++++++++ units/systemd-fsck@.service.in | 20 ++++++++++++++++++++ units/systemd-quotacheck.service.in | 19 +++++++++++++++++++ units/systemd-remount-fs.service.in | 2 +- 13 files changed, 83 insertions(+), 83 deletions(-) delete mode 100644 units/fsck-root.service.in delete mode 100644 units/fsck@.service.in delete mode 100644 units/quotacheck.service.in create mode 100644 units/systemd-fsck-root.service.in create mode 100644 units/systemd-fsck@.service.in create mode 100644 units/systemd-quotacheck.service.in diff --git a/Makefile.am b/Makefile.am index 09ea5ecdbb..c3e3ad280e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -334,8 +334,8 @@ nodist_systemunit_DATA = \ units/poweroff.service \ units/reboot.service \ units/kexec.service \ - units/fsck@.service \ - units/fsck-root.service \ + units/systemd-fsck@.service \ + units/systemd-fsck-root.service \ units/rescue.service \ units/suspend.service \ units/user@.service \ @@ -374,8 +374,8 @@ EXTRA_DIST += \ units/reboot.service.in \ units/kexec.service.in \ units/user/exit.service.in \ - units/fsck@.service.in \ - units/fsck-root.service.in \ + units/systemd-fsck@.service.in \ + units/systemd-fsck-root.service.in \ units/user@.service.in \ units/systemd-udev.service \ units/systemd-udev-trigger.service \ @@ -2442,10 +2442,10 @@ rootlibexec_PROGRAMS += \ systemd-quotacheck nodist_systemunit_DATA += \ - units/quotacheck.service + units/systemd-quotacheck.service EXTRA_DIST += \ - units/quotacheck.service.in + units/systemd-quotacheck.service.in systemd_quotacheck_SOURCES = \ src/quotacheck/quotacheck.c @@ -3192,10 +3192,10 @@ systemd-install-data-hook: $(LN_S) ../systemd-update-utmp-shutdown.service systemd-update-utmp-shutdown.service ) ( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \ rm -f systemd-remount-fs.service \ - fsck-root.service \ + systemd-fsck-root.service \ tmp.mount && \ $(LN_S) ../systemd-remount-fs.service systemd-remount-fs.service && \ - $(LN_S) ../fsck-root.service fsck-root.service && \ + $(LN_S) ../systemd-fsck-root.service systemd-fsck-root.service && \ $(LN_S) ../tmp.mount tmp.mount ) ( cd $(DESTDIR)$(userunitdir) && \ rm -f shutdown.target sockets.target bluetooth.target printer.target sound.target && \ diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml index 3655b51e03..3efd59d1b5 100644 --- a/man/kernel-command-line.xml +++ b/man/kernel-command-line.xml @@ -160,7 +160,7 @@ Parameter understood by the file system checker services. For details see - fsck-root.service8. + systemd-fsck-root.service8. @@ -171,7 +171,7 @@ Parameter understood by the file quota checker service. For details see - quotacheck.service8. + systemd-quotacheck.service8. @@ -280,8 +280,8 @@ systemd1, bootparam7, dracut.cmdline7, - fsck-root.service8, - quotacheck.service8, + systemd-fsck-root.service8, + systemd-quotacheck.service8, systemd-journald.service8, systemd-vconsole-setup.service8, systemd-udevd.service8, diff --git a/src/core/mount.c b/src/core/mount.c index 3f8cf8a68f..6b358862ea 100644 --- a/src/core/mount.c +++ b/src/core/mount.c @@ -366,7 +366,7 @@ static int mount_add_device_links(Mount *m) { /* Let's add in the fsck service */ /* aka SPECIAL_FSCK_SERVICE */ - name = unit_name_from_path_instance("fsck", p->what, ".service"); + name = unit_name_from_path_instance("systemd-fsck", p->what, ".service"); if (!name) return -ENOMEM; diff --git a/src/core/special.h b/src/core/special.h index bc9b330ffb..f71f07675b 100644 --- a/src/core/special.h +++ b/src/core/special.h @@ -64,8 +64,8 @@ #define SPECIAL_HTTP_DAEMON_TARGET "http-daemon.target" /* Magic early boot services */ -#define SPECIAL_FSCK_SERVICE "fsck@.service" -#define SPECIAL_QUOTACHECK_SERVICE "quotacheck.service" +#define SPECIAL_FSCK_SERVICE "systemd-fsck@.service" +#define SPECIAL_QUOTACHECK_SERVICE "systemd-quotacheck.service" #define SPECIAL_QUOTAON_SERVICE "quotaon.service" #define SPECIAL_REMOUNT_FS_SERVICE "systemd-remount-fs.service" diff --git a/units/.gitignore b/units/.gitignore index bcbff337dd..6808d1c82e 100644 --- a/units/.gitignore +++ b/units/.gitignore @@ -12,9 +12,9 @@ systemd-sysctl.service systemd-ask-password-console.service rescue.service systemd-ask-password-wall.service -quotacheck.service -fsck@.service -fsck-root.service +/systemd-quotacheck.service +/systemd-fsck@.service +/systemd-fsck-root.service systemd-tmpfiles-clean.service systemd-tmpfiles-setup.service halt.service diff --git a/units/fsck-root.service.in b/units/fsck-root.service.in deleted file mode 100644 index 517dee70be..0000000000 --- a/units/fsck-root.service.in +++ /dev/null @@ -1,24 +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 on Root Device -DefaultDependencies=no -After=systemd-readahead-collect.service systemd-readahead-replay.service -Before=local-fs.target shutdown.target - -# Dracut informs us with this flag file if the root fsck was already run -ConditionPathExists=!/run/initramfs/root-fsck -ConditionPathIsReadWrite=!/ - -[Service] -Type=oneshot -RemainAfterExit=no -ExecStart=@rootlibexecdir@/systemd-fsck -StandardOutput=journal+console -FsckPassNo=1 -TimeoutSec=0 diff --git a/units/fsck@.service.in b/units/fsck@.service.in deleted file mode 100644 index 4c595772de..0000000000 --- a/units/fsck@.service.in +++ /dev/null @@ -1,20 +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 on %f -DefaultDependencies=no -BindTo=%i.device -After=systemd-readahead-collect.service systemd-readahead-replay.service %i.device -Before=shutdown.target - -[Service] -Type=oneshot -RemainAfterExit=no -ExecStart=@rootlibexecdir@/systemd-fsck %f -StandardOutput=journal+console -TimeoutSec=0 diff --git a/units/quotacheck.service.in b/units/quotacheck.service.in deleted file mode 100644 index d3343df264..0000000000 --- a/units/quotacheck.service.in +++ /dev/null @@ -1,19 +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 Quota Check -DefaultDependencies=no -After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-remount-fs.service -Before=local-fs.target shutdown.target -ConditionPathExists=/sbin/quotacheck - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=@rootlibexecdir@/systemd-quotacheck -TimeoutSec=0 diff --git a/units/quotaon.service b/units/quotaon.service index f90a7fe7d9..b8df87e35b 100644 --- a/units/quotaon.service +++ b/units/quotaon.service @@ -8,7 +8,7 @@ [Unit] Description=Enable File System Quotas DefaultDependencies=no -After=systemd-readahead-collect.service systemd-readahead-replay.service quotacheck.service +After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-quotacheck.service Before=local-fs.target shutdown.target ConditionPathExists=/sbin/quotaon diff --git a/units/systemd-fsck-root.service.in b/units/systemd-fsck-root.service.in new file mode 100644 index 0000000000..517dee70be --- /dev/null +++ b/units/systemd-fsck-root.service.in @@ -0,0 +1,24 @@ +# 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 on Root Device +DefaultDependencies=no +After=systemd-readahead-collect.service systemd-readahead-replay.service +Before=local-fs.target shutdown.target + +# Dracut informs us with this flag file if the root fsck was already run +ConditionPathExists=!/run/initramfs/root-fsck +ConditionPathIsReadWrite=!/ + +[Service] +Type=oneshot +RemainAfterExit=no +ExecStart=@rootlibexecdir@/systemd-fsck +StandardOutput=journal+console +FsckPassNo=1 +TimeoutSec=0 diff --git a/units/systemd-fsck@.service.in b/units/systemd-fsck@.service.in new file mode 100644 index 0000000000..4c595772de --- /dev/null +++ b/units/systemd-fsck@.service.in @@ -0,0 +1,20 @@ +# 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 on %f +DefaultDependencies=no +BindTo=%i.device +After=systemd-readahead-collect.service systemd-readahead-replay.service %i.device +Before=shutdown.target + +[Service] +Type=oneshot +RemainAfterExit=no +ExecStart=@rootlibexecdir@/systemd-fsck %f +StandardOutput=journal+console +TimeoutSec=0 diff --git a/units/systemd-quotacheck.service.in b/units/systemd-quotacheck.service.in new file mode 100644 index 0000000000..d3343df264 --- /dev/null +++ b/units/systemd-quotacheck.service.in @@ -0,0 +1,19 @@ +# 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 Quota Check +DefaultDependencies=no +After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-remount-fs.service +Before=local-fs.target shutdown.target +ConditionPathExists=/sbin/quotacheck + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=@rootlibexecdir@/systemd-quotacheck +TimeoutSec=0 diff --git a/units/systemd-remount-fs.service.in b/units/systemd-remount-fs.service.in index 0524de82cd..cddb0a1fb9 100644 --- a/units/systemd-remount-fs.service.in +++ b/units/systemd-remount-fs.service.in @@ -10,7 +10,7 @@ Description=Remount Root and Kernel File Systems Documentation=man:systemd-remount-fs.service(8) DefaultDependencies=no Conflicts=shutdown.target -After=systemd-readahead-collect.service systemd-readahead-replay.service fsck-root.service +After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-fsck-root.service Before=local-fs-pre.target local-fs.target shutdown.target Wants=local-fs-pre.target ConditionPathExists=/etc/fstab -- cgit v1.2.3-54-g00ecf