From: Lennart Poettering Date: Mon, 25 Jun 2012 11:47:45 +0000 (+0200) Subject: units: rename fsck@.service to systemd-fsck@.service X-Git-Tag: v186~102 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=93a1d735aca5584a005d851f12cb0b8c7bb5e5ca;hp=ca6b98ae21114064b57889a90561d86785223c4e 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 09ea5ecdb..c3e3ad280 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 3655b51e0..3efd59d1b 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 3f8cf8a68..6b358862e 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 bc9b330ff..f71f07675 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 bcbff337d..6808d1c82 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/quotaon.service b/units/quotaon.service index f90a7fe7d..b8df87e35 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/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 0524de82c..cddb0a1fb 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