← Back to branch summary

~ubuntu-branches/debian/jessie/btrfs-tools/jessie

« back to all changes in this revision

Viewing changes to debian/patches/0004-Default-to-acting-like-fsck.patch

  • Committer: Package Import Robot
  • Author(s): Dimitri John Ledkov
  • Date: 2014-10-11 16:54:05 UTC
  • mfrom: (1.2.14) (6.1.39 sid)
  • Revision ID: package-import@ubuntu.com-20141011165405-zvdemnhzw41f2doj
Tags: 3.16.2-1
* New upstream release.
* Drop patches (not needed, or upstremed), but unaligned memory access.
* Update upstream location in uscan, to pull release by kdave.
* Use upstream fsck.btrfs script.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0004-Default-to-acting-like-fsck.patch
1
 
From 4e4f7ac0475892fee0bd2224c23aa32acaae0b81 Mon Sep 17 00:00:00 2001
2
 
From: Dimitri John Ledkov <xnox@debian.org>
3
 
Date: Sat, 19 Apr 2014 12:10:15 +0100
4
 
Subject: Default to acting like fsck.
5
 
 
6
 
Inspect arguments, if we are not called as btrfs, then assume we are
7
 
called to act like fsck.
8
 
 
9
 
Bug-Debian: http://bugs.debian.org/712078
10
 
Signed-off-by: Dimitri John Ledkov <xnox@debian.org>
11
 
---
12
 
 btrfs.c | 2 +-
13
 
 1 file changed, 1 insertion(+), 1 deletion(-)
14
 
 
15
 
diff --git a/btrfs.c b/btrfs.c
16
 
index e83349c..e8a87ac 100644
17
 
--- a/btrfs.c
18
 
+++ b/btrfs.c
19
 
@@ -222,7 +222,7 @@ int main(int argc, char **argv)
20
 
        else
21
 
                bname = argv[0];
22
 
 
23
 
-       if (!strcmp(bname, "btrfsck")) {
24
 
+       if (strcmp(bname, "btrfs") != 0) {
25
 
                argv[0] = "check";
26
 
        } else {
27
 
                argc--;