Commit 93a1d735 authored by Lennart Poettering's avatar Lennart Poettering
Browse files

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!)
parent ca6b98ae
......@@ -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 && \
......
......@@ -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>,
......
......@@ -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;
......
......@@ -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"
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment