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!)

diff --git a/Makefile.am b/Makefile.am
index 09ea5ecdbb3d233f7d50b1d825c9a06998fd6531..c3e3ad280eb23c0bf5ae1689b69bd7f4e1eae79a 100644 (file)
--- 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 3655b51e0323d81c09a6dbb77daca90babdc3cae..3efd59d1b5bf72e48328f6641ca0e508515fb7a5 100644 (file)
--- a/man/kernel-command-line.xml
+++ b/man/kernel-command-line.xml
@@ -160,7 +160,7 @@
                                         <para>Parameter understood by
                                         the file system checker
                                         services. For details see
-                                        <citerefentry><refentrytitle>fsck-root.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
+                                        <citerefentry><refentrytitle>systemd-fsck-root.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
                                 </listitem>
                         </varlistentry>
 
@@ -171,7 +171,7 @@
                                         <para>Parameter understood by
                                         the file quota checker
                                         service. For details see
-                                        <citerefentry><refentrytitle>quotacheck.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
+                                        <citerefentry><refentrytitle>systemd-quotacheck.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
                                 </listitem>
                         </varlistentry>
 
@@ -280,8 +280,8 @@
                           <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
                           <citerefentry><refentrytitle>bootparam</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
                           <citerefentry><refentrytitle>dracut.cmdline</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
-                          <citerefentry><refentrytitle>fsck-root.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-                          <citerefentry><refentrytitle>quotacheck.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+                          <citerefentry><refentrytitle>systemd-fsck-root.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+                          <citerefentry><refentrytitle>systemd-quotacheck.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
                           <citerefentry><refentrytitle>systemd-journald.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
                           <citerefentry><refentrytitle>systemd-vconsole-setup.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
                           <citerefentry><refentrytitle>systemd-udevd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,

diff --git a/src/core/mount.c b/src/core/mount.c
index 3f8cf8a68f004cb6b6bedac954c804ee2509f5f9..6b358862ea828a7e569dcb6a183d7be4cd1bbc26 100644 (file)
--- 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 bc9b330ffbe51f26a602ab59192d903f9fe80cde..f71f07675b5e605e9a01056bff2129f055bc175b 100644 (file)
--- 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 bcbff337dd54bcf7a7b40d7f1875611ad7c120c3..6808d1c82eb11ffd10dc1a3b5292437bd08d3e86 100644 (file)
--- 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/quotaon.service b/units/quotaon.service
index f90a7fe7d90c27829cf7fe96dbdfe8afeed6fc12..b8df87e35bec4a64c0319e6d6afe06c55a86340d 100644 (file)
--- 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/fsck-root.service.in b/units/systemd-fsck-root.service.in
similarity index 100%
rename from units/fsck-root.service.in
rename to units/systemd-fsck-root.service.in

diff --git a/units/fsck@.service.in b/units/systemd-fsck@.service.in
similarity index 100%
rename from units/fsck@.service.in
rename to units/systemd-fsck@.service.in

diff --git a/units/quotacheck.service.in b/units/systemd-quotacheck.service.in
similarity index 100%
rename from units/quotacheck.service.in
rename to units/systemd-quotacheck.service.in

diff --git a/units/systemd-remount-fs.service.in b/units/systemd-remount-fs.service.in
index 0524de82cde01b21a10f415911dbd1cae867cb77..cddb0a1fb93cb8bb2b119468d3857772fb5c52ca 100644 (file)
--- 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