chiark / gitweb /
units: rename fsck@.service to systemd-fsck@.service
authorLennart Poettering <lennart@poettering.net>
Mon, 25 Jun 2012 11:47:45 +0000 (13:47 +0200)
committerLennart Poettering <lennart@poettering.net>
Mon, 25 Jun 2012 12:28:50 +0000 (14:28 +0200)
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
man/kernel-command-line.xml
src/core/mount.c
src/core/special.h
units/.gitignore
units/quotaon.service
units/systemd-fsck-root.service.in [moved from units/fsck-root.service.in with 100% similarity]
units/systemd-fsck@.service.in [moved from units/fsck@.service.in with 100% similarity]
units/systemd-quotacheck.service.in [moved from units/quotacheck.service.in with 100% similarity]
units/systemd-remount-fs.service.in

index 09ea5ec..c3e3ad2 100644 (file)
@@ -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 && \
index 3655b51..3efd59d 100644 (file)
                                         <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>
 
                                         <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>
 
                           <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>,
index 3f8cf8a..6b35886 100644 (file)
@@ -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;
 
index bc9b330..f71f076 100644 (file)
@@ -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"
 
index bcbff33..6808d1c 100644 (file)
@@ -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
index f90a7fe..b8df87e 100644 (file)
@@ -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
 
index 0524de8..cddb0a1 100644 (file)
@@ -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