1
#! /bin/sh /usr/share/dpatch/dpatch-run
2
## 09_fixmanpage.dpatch by Julian Andres Klode <jak@jak-linux.org>
4
## DP: Fix hyphen used as minus sign
7
--- aufs-0+20080719.orig/util/aufs.in.5 2008-07-19 17:51:23.567161615 +0200
8
+++ aufs-0+20080719/util/aufs.in.5 2008-07-19 18:04:38.836176370 +0200
10
Cramfs in linux stable release has strange inodes and it makes aufs
11
confused. For example,
14
+$ mkdir \-p w/d1 w/d2
18
-$ sudo mount -t cramfs -o ro,loop cramfs /mnt
20
- 76 1 drwxr-xr-x 1 jro 232 64 Jan 1 1970 /mnt
21
- 1 1 drwxr-xr-x 1 jro 232 0 Jan 1 1970 /mnt/d1
22
- 1 1 drwxr-xr-x 1 jro 232 0 Jan 1 1970 /mnt/d2
23
- 1 1 -rw-r--r-- 1 jro 232 0 Jan 1 1970 /mnt/z1
24
- 1 1 -rw-r--r-- 1 jro 232 0 Jan 1 1970 /mnt/z2
25
+$ sudo mount \-t cramfs \-o ro,loop cramfs /mnt
27
+ 76 1 drwxr\-xr\-x 1 jro 232 64 Jan 1 1970 /mnt
28
+ 1 1 drwxr\-xr\-x 1 jro 232 0 Jan 1 1970 /mnt/d1
29
+ 1 1 drwxr\-xr\-x 1 jro 232 0 Jan 1 1970 /mnt/d2
30
+ 1 1 \-rw\-r\-\-r\-\- 1 jro 232 0 Jan 1 1970 /mnt/z1
31
+ 1 1 \-rw\-r\-\-r\-\- 1 jro 232 0 Jan 1 1970 /mnt/z2
34
All these two directories and two files have the same inode with one
36
For example in 32bit environment,
41
/dev/hda14 2599968 203127 2396841 8% /branch_fs
45
# umount /your/aufs/root
47
# auplink /your/aufs/root flush
48
-# mount -o remount,mod:/your/writable/branch=ro /your/aufs/root
49
+# mount \-o remount,mod:/your/writable/branch=ro /your/aufs/root
51
# auplink /your/aufs/root flush
52
-# mount -o remount,noplink /your/aufs/root
53
+# mount \-o remount,noplink /your/aufs/root
55
# auplink /your/aufs/root flush
56
-# mount -o remount,del:/your/aufs/branch /your/aufs/root
57
+# mount \-o remount,del:/your/aufs/branch /your/aufs/root
59
# auplink /your/aufs/root flush
60
-# mount -o remount,append:/your/aufs/branch /your/aufs/root
61
+# mount \-o remount,append:/your/aufs/branch /your/aufs/root
64
The plinks are kept both in memory and on disk. When they consumes too much
68
none on /dev/shm/u type aufs (rw,xino=/dev/shm/rw/.aufs.xino,br:/dev/shm/rw=rw:/dev/shm/ro=ro)
69
-$ ls -li ../r?/f_src_linked* ./f_src_linked* ./copied
70
+$ ls \-li ../r?/f_src_linked* ./f_src_linked* ./copied
71
ls: ./copied: No such file or directory
72
-15 -rw-r--r-- 2 jro jro 2 Dec 22 11:03 ../ro/f_src_linked
73
-15 -rw-r--r-- 2 jro jro 2 Dec 22 11:03 ../ro/f_src_linked2
74
-22 -rw-r--r-- 2 jro jro 2 Dec 22 11:03 ./f_src_linked
75
-22 -rw-r--r-- 2 jro jro 2 Dec 22 11:03 ./f_src_linked2
76
+15 \-rw\-r\-\-r\-\- 2 jro jro 2 Dec 22 11:03 ../ro/f_src_linked
77
+15 \-rw\-r\-\-r\-\- 2 jro jro 2 Dec 22 11:03 ../ro/f_src_linked2
78
+22 \-rw\-r\-\-r\-\- 2 jro jro 2 Dec 22 11:03 ./f_src_linked
79
+22 \-rw\-r\-\-r\-\- 2 jro jro 2 Dec 22 11:03 ./f_src_linked2
80
$ echo abc >> f_src_linked
81
$ cp f_src_linked copied
82
-$ ls -li ../r?/f_src_linked* ./f_src_linked* ./copied
83
-15 -rw-r--r-- 2 jro jro 2 Dec 22 11:03 ../ro/f_src_linked
84
-15 -rw-r--r-- 2 jro jro 2 Dec 22 11:03 ../ro/f_src_linked2
85
-36 -rw-r--r-- 2 jro jro 6 Dec 22 11:03 ../rw/f_src_linked
86
-53 -rw-r--r-- 1 jro jro 6 Dec 22 11:03 ./copied
87
-22 -rw-r--r-- 2 jro jro 6 Dec 22 11:03 ./f_src_linked
88
-22 -rw-r--r-- 2 jro jro 6 Dec 22 11:03 ./f_src_linked2
89
+$ ls \-li ../r?/f_src_linked* ./f_src_linked* ./copied
90
+15 \-rw\-r\-\-r\-\- 2 jro jro 2 Dec 22 11:03 ../ro/f_src_linked
91
+15 \-rw\-r\-\-r\-\- 2 jro jro 2 Dec 22 11:03 ../ro/f_src_linked2
92
+36 \-rw\-r\-\-r\-\- 2 jro jro 6 Dec 22 11:03 ../rw/f_src_linked
93
+53 \-rw\-r\-\-r\-\- 1 jro jro 6 Dec 22 11:03 ./copied
94
+22 \-rw\-r\-\-r\-\- 2 jro jro 6 Dec 22 11:03 ./f_src_linked
95
+22 \-rw\-r\-\-r\-\- 2 jro jro 6 Dec 22 11:03 ./f_src_linked2
96
$ cmp copied f_src_linked2
99
none on /dev/shm/u type aufs (rw,xino=/dev/shm/rw/.aufs.xino,noplink,br:/dev/shm/rw=rw:/dev/shm/ro=ro)
100
-$ ls -li ../r?/f_src_linked* ./f_src_linked* ./copied
101
+$ ls \-li ../r?/f_src_linked* ./f_src_linked* ./copied
102
ls: ./copied: No such file or directory
103
-17 -rw-r--r-- 2 jro jro 2 Dec 22 11:03 ../ro/f_src_linked
104
-17 -rw-r--r-- 2 jro jro 2 Dec 22 11:03 ../ro/f_src_linked2
105
-23 -rw-r--r-- 2 jro jro 2 Dec 22 11:03 ./f_src_linked
106
-23 -rw-r--r-- 2 jro jro 2 Dec 22 11:03 ./f_src_linked2
107
+17 \-rw\-r\-\-r\-\- 2 jro jro 2 Dec 22 11:03 ../ro/f_src_linked
108
+17 \-rw\-r\-\-r\-\- 2 jro jro 2 Dec 22 11:03 ../ro/f_src_linked2
109
+23 \-rw\-r\-\-r\-\- 2 jro jro 2 Dec 22 11:03 ./f_src_linked
110
+23 \-rw\-r\-\-r\-\- 2 jro jro 2 Dec 22 11:03 ./f_src_linked2
111
$ echo abc >> f_src_linked
112
$ cp f_src_linked copied
113
-$ ls -li ../r?/f_src_linked* ./f_src_linked* ./copied
114
-17 -rw-r--r-- 2 jro jro 2 Dec 22 11:03 ../ro/f_src_linked
115
-17 -rw-r--r-- 2 jro jro 2 Dec 22 11:03 ../ro/f_src_linked2
116
-36 -rw-r--r-- 1 jro jro 6 Dec 22 11:03 ../rw/f_src_linked
117
-53 -rw-r--r-- 1 jro jro 6 Dec 22 11:03 ./copied
118
-23 -rw-r--r-- 2 jro jro 6 Dec 22 11:03 ./f_src_linked
119
-23 -rw-r--r-- 2 jro jro 6 Dec 22 11:03 ./f_src_linked2
120
+$ ls \-li ../r?/f_src_linked* ./f_src_linked* ./copied
121
+17 \-rw\-r\-\-r\-\- 2 jro jro 2 Dec 22 11:03 ../ro/f_src_linked
122
+17 \-rw\-r\-\-r\-\- 2 jro jro 2 Dec 22 11:03 ../ro/f_src_linked2
123
+36 \-rw\-r\-\-r\-\- 1 jro jro 6 Dec 22 11:03 ../rw/f_src_linked
124
+53 \-rw\-r\-\-r\-\- 1 jro jro 6 Dec 22 11:03 ./copied
125
+23 \-rw\-r\-\-r\-\- 2 jro jro 6 Dec 22 11:03 ./f_src_linked
126
+23 \-rw\-r\-\-r\-\- 2 jro jro 6 Dec 22 11:03 ./f_src_linked2
127
$ cmp copied f_src_linked2
128
cmp: EOF on f_src_linked2
132
# for i in $branches_you_want_to_hide
134
-> mount -n --bind $d $i
135
+> mount \-n \-\-bind $d $i
143
-# umount -n $branches_you_want_to_unbound
144
+# umount \-n $branches_you_want_to_unbound
147
If you use FUSE filesystem as an aufs branch which supports hardlink,
148
@@ -1394,9 +1394,9 @@
149
# sudo mount /dev/sdaXX /ro_branch
151
# sudo mount /dev/sdbXX /ro_branch/$d
152
-# mkdir -p /rw_branch/$d
153
-# sudo mount -t aufs -o br:/rw_branch:/ro_branch none /aufs
154
-# sudo mount -t aufs -o br:/rw_branch/${d}:/ro_branch/${d} none /aufs/another/$d
155
+# mkdir \-p /rw_branch/$d
156
+# sudo mount \-t aufs \-o br:/rw_branch:/ro_branch none /aufs
157
+# sudo mount \-t aufs \-o br:/rw_branch/${d}:/ro_branch/${d} none /aufs/another/$d
160
There are several characters which are not allowed to use in a branch
161
@@ -1420,9 +1420,9 @@
162
tells you some of the filesystem were not unmounted cleanly, try these
163
procedure when you shutdown your system.
165
-# mount -no remount,ro /
166
+# mount \-no remount,ro /
167
# for i in $writable_branches
168
-# do mount -no remount,ro $i
169
+# do mount \-no remount,ro $i
172
If your xino file is on a hard drive, you also need to specify
173
@@ -1450,9 +1450,9 @@
177
-# mount -v -t aufs br:/day0:/base none /u
178
+# mount \-v \-t aufs br:/day0:/base none /u
179
none on /u type aufs (rw,xino=/day0/.aufs.xino,br:/day0=rw:/base=ro)
180
-# mount -v -o remount,\\
181
+# mount \-v \-o remount,\\
185
@@ -1462,11 +1462,11 @@
189
-# mount -t aufs br:/rw none /u
190
-# mount -o remount,append:/ro /u
191
+# mount \-t aufs br:/rw none /u
192
+# mount \-o remount,append:/ro /u
193
different uid/gid/permission, /ro
194
-# mount -o remount,del:/ro /u
195
-# mount -o remount,nowarn_perm,append:/ro /u
196
+# mount \-o remount,del:/ro /u
197
+# mount \-o remount,nowarn_perm,append:/ro /u
199
(there is no warning)
added
removed
debian/patches/09_fixmanpage.dpatch
