[systemd-commits] 4 commits - src/mount.c src/special.h units/fsck at .service.in units/quotacheck.service.in units/quotaon.service

[Lennart Poettering]

 src/mount.c                 |    4 ++--
 src/special.h               |    2 +-
 units/fsck at .service.in      |    3 ++-
 units/quotacheck.service.in |    3 +++
 units/quotaon.service       |    3 +++
 5 files changed, 11 insertions(+), 4 deletions(-)

New commits:
commit 4c446f03e85e1321d6b999d92e3be07a7022432f
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Oct 20 15:22:20 2010 +0200

    quota: add install hooks for basic.target

diff --git a/units/quotacheck.service.in b/units/quotacheck.service.in
index 089cffe..b670c57 100644
--- a/units/quotacheck.service.in
+++ b/units/quotacheck.service.in
@@ -16,3 +16,6 @@ ConditionPathExists=/sbin/quotacheck
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=@rootlibexecdir@/systemd-quotacheck
+
+[Install]
+WantedBy=basic.target
diff --git a/units/quotaon.service b/units/quotaon.service
index deaa917..1c4a0cd 100644
--- a/units/quotaon.service
+++ b/units/quotaon.service
@@ -16,3 +16,6 @@ ConditionPathExists=/sbin/quotaon
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=/sbin/quotaon -anug
+
+[Install]
+WantedBy=basic.target
commit 7d1316aa29ea6757336e434a8b07266f7f2dc67a
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Oct 20 15:22:04 2010 +0200

    fsck: wait for device to show up

diff --git a/units/fsck at .service.in b/units/fsck at .service.in
index 0f4f026..f0ccc8f 100644
--- a/units/fsck at .service.in
+++ b/units/fsck at .service.in
@@ -8,7 +8,8 @@
 [Unit]
 Description=File System Check on %I
 DefaultDependencies=no
-After=systemd-readahead-collect.service systemd-readahead-replay.service
+Requires=%i.device
+After=systemd-readahead-collect.service systemd-readahead-replay.service %i.device
 Before=local-fs.target shutdown.target
 
 [Service]
commit 417e842dc398448dca067b7481d88bf99da7cb60
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Oct 20 15:21:44 2010 +0200

    mount: pull in quotacheck.service, not quotacheck.target

diff --git a/src/mount.c b/src/mount.c
index cef6997..bbc29d8 100644
--- a/src/mount.c
+++ b/src/mount.c
@@ -395,7 +395,7 @@ static int mount_add_default_dependencies(Mount *m) {
         if (m->meta.manager->running_as == MANAGER_SYSTEM &&
             !path_equal(m->where, "/")) {
 
-                if ((r = unit_add_dependency_by_name(UNIT(m), UNIT_BEFORE, SPECIAL_QUOTACHECK_TARGET, NULL, true)) < 0)
+                if ((r = unit_add_dependency_by_name(UNIT(m), UNIT_BEFORE, SPECIAL_QUOTACHECK_SERVICE, NULL, true)) < 0)
                         return r;
 
                 if ((r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_BEFORE, UNIT_CONFLICTED_BY, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0)
diff --git a/src/special.h b/src/special.h
index 6f15e6e..efd792d 100644
--- a/src/special.h
+++ b/src/special.h
@@ -53,7 +53,7 @@
 #define SPECIAL_SOCKETS_TARGET "sockets.target"
 #define SPECIAL_SYSINIT_TARGET "sysinit.target"
 #define SPECIAL_FSCK_SERVICE "fsck at .service"
-#define SPECIAL_QUOTACHECK_TARGET "quotacheck.target"
+#define SPECIAL_QUOTACHECK_SERVICE "quotacheck.service"
 #define SPECIAL_RESCUE_TARGET "rescue.target"
 #define SPECIAL_EXIT_TARGET "exit.target"
 #define SPECIAL_EMERGENCY_TARGET "emergency.target"
commit 0355825f59d846b6692a92ae221cbbd6678b4d1e
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Oct 20 15:21:05 2010 +0200

    mount: require fsck

diff --git a/src/mount.c b/src/mount.c
index 5aa51de..cef6997 100644
--- a/src/mount.c
+++ b/src/mount.c
@@ -380,7 +380,7 @@ static int mount_add_device_links(Mount *m) {
 
                 SERVICE(fsck)->fsck_passno = p->passno;
 
-                if ((r = unit_add_two_dependencies(UNIT(m), UNIT_AFTER, UNIT_WANTS, fsck, true)) < 0)
+                if ((r = unit_add_two_dependencies(UNIT(m), UNIT_AFTER, UNIT_REQUIRES, fsck, true)) < 0)
                         return r;
         }