diff options
| author | Michael Biebl <biebl@debian.org> | 2011-06-29 02:58:49 +0200 |
|---|---|---|
| committer | Tollef Fog Heen <tfheen@err.no> | 2011-06-29 14:00:16 +0200 |
| commit | c85dc49b03330013a8e7ee05718651235b662080 (patch) | |
| tree | 7b3775cc33cbf303a2d715d0dc72e08b7dd5c165 | |
| parent | 5db9a9988cae3b1a57392b13f935529420b32f40 (diff) | |
| download | systemd-c85dc49b03330013a8e7ee05718651235b662080.tar.gz | |
Depend on util-linux (>= 2.19.1-2) which provides whole-disk locking support in fsck and remove our revert patch.
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | src/fsck.c | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index d4f3c06e12..e3fdac6897 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ systemd (29-1) UNRELEASED; urgency=low sysctl.d. * Remove obsolete conffiles from /etc/tmpfiles.d on upgrades. Those files are installed in /usr/lib/tmpfiles.d now. + * Depend on util-linux (>= 2.19.1-2) which provides whole-disk locking + support in fsck and remove our revert patch. -- Tollef Fog Heen <tfheen@debian.org> Wed, 08 Jun 2011 16:14:31 +0200 diff --git a/debian/control b/debian/control index 8ff4e7c8c0..5e7a5e907b 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Section: admin Priority: extra Recommends: libpam-systemd Suggests: systemd-gui, python -Depends: ${shlibs:Depends}, ${misc:Depends}, util-linux (>= 2.17.2-5), initscripts (>= 2.88dsf-13.3), udev +Depends: ${shlibs:Depends}, ${misc:Depends}, util-linux (>= 2.19.1-2), initscripts (>= 2.88dsf-13.3), udev Breaks: lvm2 (<< 2.02.84-1) Conflicts: klogd Description: system and service manager diff --git a/src/fsck.c b/src/fsck.c index b501de9270..19ca75311b 100644 --- a/src/fsck.c +++ b/src/fsck.c @@ -145,7 +145,7 @@ static void test_files(void) { } int main(int argc, char *argv[]) { - const char *cmdline[7]; + const char *cmdline[8]; int i = 0, r = EXIT_FAILURE, q; pid_t pid; siginfo_t status; @@ -216,6 +216,7 @@ int main(int argc, char *argv[]) { cmdline[i++] = "/sbin/fsck"; cmdline[i++] = "-a"; cmdline[i++] = "-T"; + cmdline[i++] = "-l"; if (!root_directory) cmdline[i++] = "-M"; |