picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

units: rename fsck@.service to systemd-fsck@.service

Browse source 
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!)
This commit is contained in:
Lennart Poettering 2012-06-25 13:47:45 +02:00
parent ca6b98ae21
commit 93a1d735ac
10 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Makefile.am
View file

@ -334,8 +334,8 @@ nodist_systemunit_DATA = \
units/poweroff.service \ units/poweroff.service \
units/reboot.service \ units/reboot.service \
units/kexec.service \ units/kexec.service \
units/fsck@.service \ units/systemd-fsck@.service \
units/fsck-root.service \ units/systemd-fsck-root.service \
units/rescue.service \ units/rescue.service \
units/suspend.service \ units/suspend.service \
units/user@.service \ units/user@.service \
@ -374,8 +374,8 @@ EXTRA_DIST += \
units/reboot.service.in \ units/reboot.service.in \
units/kexec.service.in \ units/kexec.service.in \
units/user/exit.service.in \ units/user/exit.service.in \
units/fsck@.service.in \ units/systemd-fsck@.service.in \
units/fsck-root.service.in \ units/systemd-fsck-root.service.in \
units/user@.service.in \ units/user@.service.in \
units/systemd-udev.service \ units/systemd-udev.service \
units/systemd-udev-trigger.service \ units/systemd-udev-trigger.service \
@ -2442,10 +2442,10 @@ rootlibexec_PROGRAMS += \
systemd-quotacheck systemd-quotacheck
nodist_systemunit_DATA += \ nodist_systemunit_DATA += \
units/quotacheck.service units/systemd-quotacheck.service
EXTRA_DIST += \ EXTRA_DIST += \
units/quotacheck.service.in units/systemd-quotacheck.service.in
systemd_quotacheck_SOURCES = \ systemd_quotacheck_SOURCES = \
src/quotacheck/quotacheck.c src/quotacheck/quotacheck.c
@ -3192,10 +3192,10 @@ systemd-install-data-hook:
$(LN_S) ../systemd-update-utmp-shutdown.service systemd-update-utmp-shutdown.service ) $(LN_S) ../systemd-update-utmp-shutdown.service systemd-update-utmp-shutdown.service )
( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \ ( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
rm -f systemd-remount-fs.service \ rm -f systemd-remount-fs.service \
fsck-root.service \ systemd-fsck-root.service \
tmp.mount && \ tmp.mount && \
$(LN_S) ../systemd-remount-fs.service systemd-remount-fs.service && \ $(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 ) $(LN_S) ../tmp.mount tmp.mount )
( cd $(DESTDIR)$(userunitdir) && \ ( cd $(DESTDIR)$(userunitdir) && \
rm -f shutdown.target sockets.target bluetooth.target printer.target sound.target && \ rm -f shutdown.target sockets.target bluetooth.target printer.target sound.target && \

8
man/kernel-command-line.xml
View file

@ -160,7 +160,7 @@
<para>Parameter understood by <para>Parameter understood by
the file system checker the file system checker
services. For details see 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> </listitem>
</varlistentry> </varlistentry>
@ -171,7 +171,7 @@
<para>Parameter understood by <para>Parameter understood by
the file quota checker the file quota checker
service. For details see 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> </listitem>
</varlistentry> </varlistentry>
@ -280,8 +280,8 @@
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>bootparam</refentrytitle><manvolnum>7</manvolnum></citerefentry>, <citerefentry><refentrytitle>bootparam</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
<citerefentry><refentrytitle>dracut.cmdline</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>systemd-fsck-root.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
<citerefentry><refentrytitle>quotacheck.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-journald.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd-vconsole-setup.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>, <citerefentry><refentrytitle>systemd-udevd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,

2
src/core/mount.c
View file

@ -366,7 +366,7 @@ static int mount_add_device_links(Mount *m) {
/* Let's add in the fsck service */ /* Let's add in the fsck service */
/* aka SPECIAL_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) if (!name)
return -ENOMEM; return -ENOMEM;

4
src/core/special.h
View file

@ -64,8 +64,8 @@
#define SPECIAL_HTTP_DAEMON_TARGET "http-daemon.target" #define SPECIAL_HTTP_DAEMON_TARGET "http-daemon.target"
/* Magic early boot services */ /* Magic early boot services */
#define SPECIAL_FSCK_SERVICE "fsck@.service" #define SPECIAL_FSCK_SERVICE "systemd-fsck@.service"
#define SPECIAL_QUOTACHECK_SERVICE "quotacheck.service" #define SPECIAL_QUOTACHECK_SERVICE "systemd-quotacheck.service"
#define SPECIAL_QUOTAON_SERVICE "quotaon.service" #define SPECIAL_QUOTAON_SERVICE "quotaon.service"
#define SPECIAL_REMOUNT_FS_SERVICE "systemd-remount-fs.service" #define SPECIAL_REMOUNT_FS_SERVICE "systemd-remount-fs.service"

6
units/.gitignore vendored
View file

@ -12,9 +12,9 @@ systemd-sysctl.service
systemd-ask-password-console.service systemd-ask-password-console.service
rescue.service rescue.service
systemd-ask-password-wall.service systemd-ask-password-wall.service
quotacheck.service /systemd-quotacheck.service
fsck@.service /systemd-fsck@.service
fsck-root.service /systemd-fsck-root.service
systemd-tmpfiles-clean.service systemd-tmpfiles-clean.service
systemd-tmpfiles-setup.service systemd-tmpfiles-setup.service
halt.service halt.service

2
units/quotaon.service
View file

@ -8,7 +8,7 @@
[Unit] [Unit]
Description=Enable File System Quotas Description=Enable File System Quotas
DefaultDependencies=no 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 Before=local-fs.target shutdown.target
ConditionPathExists=/sbin/quotaon ConditionPathExists=/sbin/quotaon

0
units/fsck-root.service.in → units/systemd-fsck-root.service.in
View file

0
units/fsck@.service.in → units/systemd-fsck@.service.in
View file

0
units/quotacheck.service.in → units/systemd-quotacheck.service.in
View file

2
units/systemd-remount-fs.service.in
View file

@ -10,7 +10,7 @@ Description=Remount Root and Kernel File Systems
Documentation=man:systemd-remount-fs.service(8) Documentation=man:systemd-remount-fs.service(8)
DefaultDependencies=no DefaultDependencies=no
Conflicts=shutdown.target 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 Before=local-fs-pre.target local-fs.target shutdown.target
Wants=local-fs-pre.target Wants=local-fs-pre.target
ConditionPathExists=/etc/fstab ConditionPathExists=/etc/fstab