diff options
| author | Andrey Borzenkov <arvidjaar@gmail.com> | 2011-03-18 19:12:58 +0300 |
|---|---|---|
| committer | Andrey Borzenkov <arvidjaar@gmail.com> | 2011-03-18 19:12:58 +0300 |
| commit | 0c380104cfc52b69ab39737722e8e91fbad6c676 (patch) | |
| tree | 7920a94b9114dd564f143dbde1e5acdd17f72dd1 | |
| parent | 9700edb4e836f95815ee3237e5bc8d224b5014d7 (diff) | |
mount: pull in quota services from local mountpoints with usr/grpquota options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | src/mount.c | 17 | ||||
| -rw-r--r-- | src/special.h | 1 | ||||
| -rw-r--r-- | units/quotacheck.service.in | 3 | ||||
| -rw-r--r-- | units/quotaon.service | 3 |
5 files changed, 16 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index 371cc562e9..8df636f39c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1327,10 +1327,6 @@ install-data-hook: $(LN_S) $(systemunitdir)/getty@.service getty@tty4.service && \ $(LN_S) $(systemunitdir)/getty@.service getty@tty5.service && \ $(LN_S) $(systemunitdir)/getty@.service getty@tty6.service ) - ( cd $(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants && \ - rm -f quotaon.service quotacheck.service && \ - $(LN_S) $(systemunitdir)/quotacheck.service quotacheck.service && \ - $(LN_S) $(systemunitdir)/quotaon.service quotaon.service ) ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \ rm -f remote-fs.target && \ $(LN_S) $(systemunitdir)/remote-fs.target remote-fs.target ) diff --git a/src/mount.c b/src/mount.c index 39525b6650..99867172c9 100644 --- a/src/mount.c +++ b/src/mount.c @@ -413,9 +413,22 @@ static int mount_add_default_dependencies(Mount *m) { if (m->meta.manager->running_as == MANAGER_SYSTEM && !path_equal(m->where, "/")) { + MountParameters *p; - if ((r = unit_add_dependency_by_name(UNIT(m), UNIT_BEFORE, SPECIAL_QUOTACHECK_SERVICE, NULL, true)) < 0) - return r; + if (m->from_fragment) + p = &m->parameters_fragment; + else if (m->from_etc_fstab) + p = &m->parameters_etc_fstab; + else + p = NULL; + + if (!p || + (!mount_test_option(p->options, "_netdev") && + !(p->fstype && fstype_is_network(p->fstype)) && + (mount_test_option(p->options, "usrquota") || mount_test_option(p->options, "grpquota")))) + if ((r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_BEFORE, UNIT_WANTS, SPECIAL_QUOTACHECK_SERVICE, NULL, true)) < 0 || + (r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_BEFORE, UNIT_WANTS, SPECIAL_QUOTAON_SERVICE, NULL, true)) < 0) + return r; if ((r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0) return r; diff --git a/src/special.h b/src/special.h index 6a75e2cf7d..6cedf18c03 100644 --- a/src/special.h +++ b/src/special.h @@ -62,6 +62,7 @@ /* Magic early boot services */ #define SPECIAL_FSCK_SERVICE "fsck@.service" #define SPECIAL_QUOTACHECK_SERVICE "quotacheck.service" +#define SPECIAL_QUOTAON_SERVICE "quotaon.service" #define SPECIAL_REMOUNT_ROOTFS_SERVICE "remount-rootfs.service" /* Services systemd relies on */ diff --git a/units/quotacheck.service.in b/units/quotacheck.service.in index d46a335649..ed1ddc5589 100644 --- a/units/quotacheck.service.in +++ b/units/quotacheck.service.in @@ -18,6 +18,3 @@ RemainAfterExit=yes ExecStart=@rootlibexecdir@/systemd-quotacheck StandardOutput=syslog TimeoutSec=0 - -[Install] -WantedBy=local-fs.target diff --git a/units/quotaon.service b/units/quotaon.service index ddb51284d9..2c7b36b4fe 100644 --- a/units/quotaon.service +++ b/units/quotaon.service @@ -17,6 +17,3 @@ Type=oneshot RemainAfterExit=yes ExecStart=/sbin/quotaon -aug StandardOutput=syslog - -[Install] -WantedBy=local-fs.target |