Ubuntu Pastebin

Paste from antisol at Wed, 8 Apr 2015 09:30:17 +0000

Download as text
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/e2fsck/e2fsck.8.in b/e2fsck/e2fsck.8.in
|index 3fb15e6..98c309e 100644
|--- a/e2fsck/e2fsck.8.in
|+++ b/e2fsck/e2fsck.8.in
| <at>  <at>  -292,7 +292,7  <at>  <at>  may not be specified at the same time as the
| .B \-n
| or
| .B \-p
|-options.
|+options.  If given twice, will answer `no' to any `Abort?' question.
| .SH EXIT CODE
| The exit code returned by
| .B e2fsck
--------------------------
patching file e2fsck/e2fsck.8.in
Using Plan A...
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/e2fsck/e2fsck.h b/e2fsck/e2fsck.h
|index e763b89..2881654 100644
|--- a/e2fsck/e2fsck.h
|+++ b/e2fsck/e2fsck.h
| <at>  <at>  -155,6 +155,7  <at>  <at>  struct resource_track {
| #define E2F_OPT_WRITECHECK	0x0200
| #define E2F_OPT_COMPRESS_DIRS	0x0400
| #define E2F_OPT_FRAGCHECK	0x0800
|+#define E2F_OPT_YESYES		0x1000
|
| /*
|  * E2fsck flags
--------------------------
patching file e2fsck/e2fsck.h
Using Plan A...
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/e2fsck/problem.c b/e2fsck/problem.c
|index 9043281..c12a70f 100644
|--- a/e2fsck/problem.c
|+++ b/e2fsck/problem.c
| <at>  <at>  -1843,9 +1843,20  <at>  <at>  int fix_problem(e2fsck_t ctx, problem_t code, struct problem_context *pctx)
|				answer = 1;
|			else
|				answer = 0;
|-		} else
|-			answer = ask(ctx, (ptr->prompt == PROMPT_NULL) ? "" :
|+		} else {
|+			/*
|+			 * yesmeansno:
|+			 * e2fsck -y -y really means yes, don't abort!
|+			 */
|+			if ((ptr->prompt == PROMPT_ABORT) &&
|+			    (ctx->options & E2F_OPT_YESYES)) {
|+				printf (_("%s? no\n\n"), _(prompt[(int) ptr->prompt]));
|+						answer = 0;
|+			} else {
|+				answer = ask(ctx, (ptr->prompt == PROMPT_NULL) ? "" :
|				     _(prompt[(int) ptr->prompt]), def_yn);
|+			}
|+		}
|		if (!answer && !(ptr->flags & PR_NO_OK))
|			ext2fs_unmark_valid(fs);
|
--------------------------
patching file e2fsck/problem.c
Using Plan A...
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/e2fsck/unix.c b/e2fsck/unix.c
|index d53921a..d01b3cb 100644
|--- a/e2fsck/unix.c
|+++ b/e2fsck/unix.c
| <at>  <at>  -709,6 +709,10  <at>  <at>  static errcode_t PRS(int argc, char *argv[], e2fsck_t *ret_ctx)
|		case 'y':
|			if (ctx->options & (E2F_OPT_PREEN|E2F_OPT_NO))
|				goto conflict_opt;
|+			if (ctx->options & (E2F_OPT_YES)) {
|+				printf("yesyes\n");
|+				ctx->options |= E2F_OPT_YESYES;
|+			}
|			ctx->options |= E2F_OPT_YES;
|			break;
|		case 't':
|
--------------------------
patching file e2fsck/unix.c
Using Plan A...
done
Download as text