98731e
update to latest git
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
From fe51c4ab3c5e153b6d2e56873c7e64a8818df056 Mon Sep 17 00:00:00 2001
|
|
2
|
+
From: Harald Hoyer <harald@redhat.com>
|
|
3
|
+
Date: Mon, 30 Jan 2012 14:06:39 +0100
|
|
4
|
+
Subject: [PATCH] 30usrmove/usrmove-convert.sh: do not force selinux
|
|
5
|
+
autorelabel
|
|
6
|
+
|
|
7
|
+
---
|
|
8
|
+
modules.d/30usrmove/usrmove-convert.sh | 4 ++--
|
|
9
|
+
1 files changed, 2 insertions(+), 2 deletions(-)
|
|
10
|
+
|
|
11
|
+
diff --git a/modules.d/30usrmove/usrmove-convert.sh b/modules.d/30usrmove/usrmove-convert.sh
|
|
12
|
+
index cb93993..8aa8588 100755
|
|
13
|
+
--- a/modules.d/30usrmove/usrmove-convert.sh
|
|
14
|
+
+++ b/modules.d/30usrmove/usrmove-convert.sh
|
|
15
|
+
@@ -153,7 +153,7 @@ set +e
|
|
16
|
+
|
|
17
|
+
echo "Run ldconfig."
|
|
18
|
+
ldconfig -r "$ROOT"
|
|
19
|
+
-echo "Set autorelabel flag."
|
|
20
|
+
-> "$ROOT/.autorelabel"
|
|
21
|
+
+#echo "Set autorelabel flag."
|
|
22
|
+
+#> "$ROOT/.autorelabel"
|
|
23
|
+
echo "Done."
|
|
24
|
+
exit 0
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
From dfbb922ddbeceb90f09e4fe20e86a02be7d58fbc Mon Sep 17 00:00:00 2001
|
|
2
|
+
From: Harald Hoyer <harald@redhat.com>
|
|
3
|
+
Date: Thu, 2 Feb 2012 18:25:49 +0100
|
|
4
|
+
Subject: [PATCH] dracut-functions: install nosegneg libs additionally to
|
|
5
|
+
standard ones
|
|
6
|
+
|
|
7
|
+
---
|
|
8
|
+
dracut-functions | 12 +++++-------
|
|
9
|
+
1 files changed, 5 insertions(+), 7 deletions(-)
|
|
10
|
+
|
|
11
|
+
diff --git a/dracut-functions b/dracut-functions
|
|
12
|
+
index e04b16d..b6ac9ac 100755
|
|
13
|
+
--- a/dracut-functions
|
|
14
|
+
+++ b/dracut-functions
|
|
15
|
+
@@ -464,18 +464,16 @@ inst_binary() {
|
|
16
|
+
|
|
17
|
+
# See if we are loading an optimized version of a shared lib.
|
|
18
|
+
if [[ $_file =~ $_lib_regex ]]; then
|
|
19
|
+
- _tlibdir=${BASH_REMATCH[1]}
|
|
20
|
+
- _base=${_file##*/}
|
|
21
|
+
- # Prefer nosegneg libs to unoptimized ones.
|
|
22
|
+
+ _tlibdir=${BASH_REMATCH[1]}
|
|
23
|
+
+ _base=${_file##*/}
|
|
24
|
+
+ # Prefer nosegneg libs to unoptimized ones.
|
|
25
|
+
for _f in "$_tlibdir/i686/nosegneg" "$_tlibdir"; do
|
|
26
|
+
[[ -e $_f/$_base ]] || continue
|
|
27
|
+
- _file=$_f/$_base
|
|
28
|
+
+ inst_library $_f/$_base
|
|
29
|
+
break
|
|
30
|
+
done
|
|
31
|
+
- inst_library "$_file" "$_tlibdir/$_base"
|
|
32
|
+
- else
|
|
33
|
+
- inst_library "$_file"
|
|
34
|
+
fi
|
|
35
|
+
+ inst_library "$_file"
|
|
36
|
+
done
|
|
37
|
+
|
|
38
|
+
# Install the binary if it wasn't handled in the above loop.
|
|
@@ -0,0 +1,453 @@
|
|
|
1
|
+
From 2cf328ad0ae7fb5ee7de8fac5652e4cd58adca1a Mon Sep 17 00:00:00 2001
|
|
2
|
+
From: Harald Hoyer <harald@redhat.com>
|
|
3
|
+
Date: Thu, 2 Feb 2012 18:50:26 +0100
|
|
4
|
+
Subject: [PATCH] renamed usrmove to convertfs
|
|
5
|
+
|
|
6
|
+
---
|
|
7
|
+
modules.d/30convertfs/convertfs.sh | 176 ++++++++++++++++++++++++++++++++
|
|
8
|
+
modules.d/30convertfs/do-convertfs.sh | 11 ++
|
|
9
|
+
modules.d/30convertfs/module-setup.sh | 20 ++++
|
|
10
|
+
modules.d/30usrmove/do-usrmove.sh | 11 --
|
|
11
|
+
modules.d/30usrmove/module-setup.sh | 20 ----
|
|
12
|
+
modules.d/30usrmove/usrmove-convert.sh | 159 ----------------------------
|
|
13
|
+
6 files changed, 207 insertions(+), 190 deletions(-)
|
|
14
|
+
create mode 100755 modules.d/30convertfs/convertfs.sh
|
|
15
|
+
create mode 100755 modules.d/30convertfs/do-convertfs.sh
|
|
16
|
+
create mode 100755 modules.d/30convertfs/module-setup.sh
|
|
17
|
+
delete mode 100755 modules.d/30usrmove/do-usrmove.sh
|
|
18
|
+
delete mode 100755 modules.d/30usrmove/module-setup.sh
|
|
19
|
+
delete mode 100755 modules.d/30usrmove/usrmove-convert.sh
|
|
20
|
+
|
|
21
|
+
diff --git a/modules.d/30convertfs/convertfs.sh b/modules.d/30convertfs/convertfs.sh
|
|
22
|
+
new file mode 100755
|
|
23
|
+
index 0000000..6c76a4c
|
|
24
|
+
--- /dev/null
|
|
25
|
+
+++ b/modules.d/30convertfs/convertfs.sh
|
|
26
|
+
|
|
27
|
+
+#!/bin/bash
|
|
28
|
+
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
|
|
29
|
+
+# ex: ts=8 sw=4 sts=4 et filetype=sh
|
|
30
|
+
+
|
|
31
|
+
+ROOT="$1"
|
|
32
|
+
+
|
|
33
|
+
+if [[ ! -d "$ROOT" ]]; then
|
|
34
|
+
+ echo "Usage: $0 <rootdir>"
|
|
35
|
+
+ exit 1
|
|
36
|
+
+fi
|
|
37
|
+
+
|
|
38
|
+
+if [[ "$ROOT" -ef / ]]; then
|
|
39
|
+
+ echo "Can't convert the running system."
|
|
40
|
+
+ echo "Please boot with 'rd.convertfs' on the kernel command line,"
|
|
41
|
+
+ echo "to update with the help of the initramfs,"
|
|
42
|
+
+ echo "or run this script from a rescue system."
|
|
43
|
+
+ exit 1
|
|
44
|
+
+fi
|
|
45
|
+
+
|
|
46
|
+
+while [[ "$ROOT" != "${ROOT%/}" ]]; do
|
|
47
|
+
+ ROOT=${ROOT%/}
|
|
48
|
+
+done
|
|
49
|
+
+
|
|
50
|
+
+needconvert() {
|
|
51
|
+
+ for dir in "$ROOT/bin" "$ROOT/sbin" "$ROOT/lib" "$ROOT/lib64"; do
|
|
52
|
+
+ if [[ -e "$dir" ]]; then
|
|
53
|
+
+ [[ -L "$dir" ]] || return 0
|
|
54
|
+
+ fi
|
|
55
|
+
+ done
|
|
56
|
+
+ return 1
|
|
57
|
+
+}
|
|
58
|
+
+
|
|
59
|
+
+if ! needconvert; then
|
|
60
|
+
+ echo "Your system is already converted."
|
|
61
|
+
+ exit 0
|
|
62
|
+
+fi
|
|
63
|
+
+
|
|
64
|
+
+testfile="$ROOT/.usrmovecheck$$"
|
|
65
|
+
+rm -f "$testfile"
|
|
66
|
+
+> "$testfile"
|
|
67
|
+
+if [[ ! -e "$testfile" ]]; then
|
|
68
|
+
+ echo "Cannot write to $ROOT/"
|
|
69
|
+
+ exit 1
|
|
70
|
+
+fi
|
|
71
|
+
+rm -f "$testfile"
|
|
72
|
+
+
|
|
73
|
+
+testfile="$ROOT/usr/.usrmovecheck$$"
|
|
74
|
+
+rm -f "$testfile"
|
|
75
|
+
+> "$testfile"
|
|
76
|
+
+if [[ ! -e "$testfile" ]]; then
|
|
77
|
+
+ echo "Cannot write to $ROOT/usr/"
|
|
78
|
+
+ exit 1
|
|
79
|
+
+fi
|
|
80
|
+
+rm -f "$testfile"
|
|
81
|
+
+
|
|
82
|
+
+ismounted() {
|
|
83
|
+
+ while read a m a; do
|
|
84
|
+
+ [[ "$m" = "$1" ]] && return 0
|
|
85
|
+
+ done < /proc/mounts
|
|
86
|
+
+ return 1
|
|
87
|
+
+}
|
|
88
|
+
+
|
|
89
|
+
+# clean up after ourselves no matter how we die.
|
|
90
|
+
+cleanup() {
|
|
91
|
+
+ echo "Something failed. Move back to the original state"
|
|
92
|
+
+ for dir in "$ROOT/bin" "$ROOT/sbin" "$ROOT/lib" "$ROOT/lib64" \
|
|
93
|
+
+ "$ROOT/usr/bin" "$ROOT/usr/sbin" "$ROOT/usr/lib" \
|
|
94
|
+
+ "$ROOT/usr/lib64"; do
|
|
95
|
+
+ [[ -d "${dir}.usrmove-new" ]] && rm -fr "${dir}.usrmove-new"
|
|
96
|
+
+ if [[ -d "${dir}.usrmove-old" ]]; then
|
|
97
|
+
+ mv "$dir" "${dir}.del~"
|
|
98
|
+
+ mv "${dir}.usrmove-old" "$dir"
|
|
99
|
+
+ rm -fr "${dir}.del~"
|
|
100
|
+
+ fi
|
|
101
|
+
+ done
|
|
102
|
+
+}
|
|
103
|
+
+
|
|
104
|
+
+trap 'ret=$?; [[ $ret -ne 0 ]] && cleanup;exit $ret;' EXIT
|
|
105
|
+
+trap 'exit 1;' SIGINT
|
|
106
|
+
+
|
|
107
|
+
+ismounted "$ROOT/usr" || CP_HARDLINK="-l"
|
|
108
|
+
+
|
|
109
|
+
+set -e
|
|
110
|
+
+
|
|
111
|
+
+# merge / and /usr in new dir in /usr
|
|
112
|
+
+for dir in bin sbin lib lib64; do
|
|
113
|
+
+ rm -rf "$ROOT/usr/${dir}.usrmove-new"
|
|
114
|
+
+ [[ -L "$ROOT/$dir" ]] && continue
|
|
115
|
+
+ [[ -d "$ROOT/$dir" ]] || continue
|
|
116
|
+
+ echo "Make a copy of \`$ROOT/usr/$dir'."
|
|
117
|
+
+ [[ -d "$ROOT/usr/$dir" ]] \
|
|
118
|
+
+ && cp -ax $CP_HARDLINK "$ROOT/usr/$dir" "$ROOT/usr/${dir}.usrmove-new"
|
|
119
|
+
+ echo "Merge the copy with \`$ROOT/$dir'."
|
|
120
|
+
+ [[ -d "$ROOT/usr/${dir}.usrmove-new" ]] \
|
|
121
|
+
+ || mkdir -p "$ROOT/usr/${dir}.usrmove-new"
|
|
122
|
+
+ cp -axT $CP_HARDLINK --backup --suffix=.usrmove~ "$ROOT/$dir" "$ROOT/usr/${dir}.usrmove-new"
|
|
123
|
+
+ echo "Clean up duplicates in \`$ROOT/usr/$dir'."
|
|
124
|
+
+ # delete all symlinks that have been backed up
|
|
125
|
+
+ find "$ROOT/usr/${dir}.usrmove-new" -type l -name '*.usrmove~' -delete || :
|
|
126
|
+
+ # replace symlink with backed up binary
|
|
127
|
+
+ find "$ROOT/usr/${dir}.usrmove-new" \
|
|
128
|
+
+ -name '*.usrmove~' \
|
|
129
|
+
+ -type f \
|
|
130
|
+
+ -exec bash -c 'p="{}";o=${p%%%%.usrmove~};
|
|
131
|
+
+ [[ -L "$o" ]] && mv -f "$p" "$o"' ';' || :
|
|
132
|
+
+done
|
|
133
|
+
+# switch over merged dirs in /usr
|
|
134
|
+
+for dir in bin sbin lib lib64; do
|
|
135
|
+
+ [[ -d "$ROOT/usr/${dir}.usrmove-new" ]] || continue
|
|
136
|
+
+ echo "Switch to new \`$ROOT/usr/$dir'."
|
|
137
|
+
+ rm -fr "$ROOT/usr/${dir}.usrmove-old"
|
|
138
|
+
+ mv "$ROOT/usr/$dir" "$ROOT/usr/${dir}.usrmove-old"
|
|
139
|
+
+ mv "$ROOT/usr/${dir}.usrmove-new" "$ROOT/usr/$dir"
|
|
140
|
+
+done
|
|
141
|
+
+
|
|
142
|
+
+# replace dirs in / with links to /usr
|
|
143
|
+
+for dir in bin sbin lib lib64; do
|
|
144
|
+
+ [[ -L "$ROOT/$dir" ]] && continue
|
|
145
|
+
+ [[ -d "$ROOT/$dir" ]] || continue
|
|
146
|
+
+ echo "Create \`$ROOT/$dir' symlink."
|
|
147
|
+
+ rm -rf "$ROOT/${dir}.usrmove-old" || :
|
|
148
|
+
+ mv "$ROOT/$dir" "$ROOT/${dir}.usrmove-old"
|
|
149
|
+
+ ln -sfn usr/$dir "$ROOT/$dir"
|
|
150
|
+
+done
|
|
151
|
+
+
|
|
152
|
+
+echo "Clean up backup files."
|
|
153
|
+
+# everything seems to work; cleanup
|
|
154
|
+
+for dir in bin sbin lib lib64; do
|
|
155
|
+
+ # if we get killed in the middle of "rm -rf", ensure not to leave
|
|
156
|
+
+ # an incomplete directory, which is moved back by cleanup()
|
|
157
|
+
+ [[ -d "$ROOT/usr/${dir}.usrmove-old" ]] \
|
|
158
|
+
+ && mv "$ROOT/usr/${dir}.usrmove-old" "$ROOT/usr/${dir}.usrmove-old~"
|
|
159
|
+
+ [[ -d "$ROOT/${dir}.usrmove-old" ]] \
|
|
160
|
+
+ && mv "$ROOT/${dir}.usrmove-old" "$ROOT/${dir}.usrmove-old~"
|
|
161
|
+
+done
|
|
162
|
+
+
|
|
163
|
+
+for dir in bin sbin lib lib64; do
|
|
164
|
+
+ [[ -d "$ROOT/usr/${dir}.usrmove-old~" ]] \
|
|
165
|
+
+ && rm -rf "$ROOT/usr/${dir}.usrmove-old~" || :
|
|
166
|
+
+ [[ -d "$ROOT/${dir}.usrmove-old~" ]] \
|
|
167
|
+
+ && rm -rf "$ROOT/${dir}.usrmove-old~" || :
|
|
168
|
+
+done
|
|
169
|
+
+
|
|
170
|
+
+for dir in lib lib64; do
|
|
171
|
+
+ [[ -d "$ROOT/$dir" ]] || continue
|
|
172
|
+
+ for lib in "$ROOT"/usr/${dir}/lib*.so*.usrmove~; do
|
|
173
|
+
+ [[ -f $lib ]] || continue
|
|
174
|
+
+ mv $lib ${lib/.so/_so}
|
|
175
|
+
+ done
|
|
176
|
+
+done
|
|
177
|
+
+
|
|
178
|
+
+set +e
|
|
179
|
+
+
|
|
180
|
+
+echo "Run ldconfig."
|
|
181
|
+
+ldconfig -r "$ROOT"
|
|
182
|
+
+
|
|
183
|
+
+. $ROOT/etc/selinux/config
|
|
184
|
+
+if [ "$SELINUX" != "disabled" ] && [ -f /etc/selinux/${SELINUXTYPE}/contexts/files/file_contexts ]; then
|
|
185
|
+
+ echo "Fixing SELinux labels"
|
|
186
|
+
+ /usr/sbin/setfiles -r $ROOT -p /etc/selinux/${SELINUXTYPE}/contexts/files/file_contexts $ROOT/sbin $ROOT/bin $ROOT/lib $ROOT/lib64 $ROOT/usr/lib $ROOT/usr/lib64 $ROOT/etc/ld.so.cache $ROOT/var/cache/ldconfig || :
|
|
187
|
+
+fi
|
|
188
|
+
+
|
|
189
|
+
+if [ -d $ROOT/var/run ]; then
|
|
190
|
+
+ echo "Converting /var/run to symlink"
|
|
191
|
+
+ mv -f $ROOT/var/run $ROOT/var/run.runmove~
|
|
192
|
+
+ ln -sfn ../run $ROOT/var/run
|
|
193
|
+
+fi
|
|
194
|
+
+
|
|
195
|
+
+if [ -d $ROOT/var/lock ]; then
|
|
196
|
+
+ echo "Converting /var/lock to symlink"
|
|
197
|
+
+ mv -f $ROOT/var/lock $ROOT/var/lock.lockmove~
|
|
198
|
+
+ ln -sfn ../run/lock $ROOT/var/lock
|
|
199
|
+
+fi
|
|
200
|
+
+
|
|
201
|
+
+echo "Done."
|
|
202
|
+
+exit 0
|
|
203
|
+
diff --git a/modules.d/30convertfs/do-convertfs.sh b/modules.d/30convertfs/do-convertfs.sh
|
|
204
|
+
new file mode 100755
|
|
205
|
+
index 0000000..99738e3
|
|
206
|
+
--- /dev/null
|
|
207
|
+
+++ b/modules.d/30convertfs/do-convertfs.sh
|
|
208
|
+
|
|
209
|
+
+#!/bin/bash
|
|
210
|
+
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
|
|
211
|
+
+# ex: ts=8 sw=4 sts=4 et filetype=sh
|
|
212
|
+
+
|
|
213
|
+
+if getargbool 0 rd.convertfs; then
|
|
214
|
+
+ if getargbool 0 rd.debug; then
|
|
215
|
+
+ bash -x convertfs "$NEWROOT" 2>&1 | vinfo
|
|
216
|
+
+ else
|
|
217
|
+
+ convertfs "$NEWROOT" 2>&1 | vinfo
|
|
218
|
+
+ fi
|
|
219
|
+
+fi
|
|
220
|
+
diff --git a/modules.d/30convertfs/module-setup.sh b/modules.d/30convertfs/module-setup.sh
|
|
221
|
+
new file mode 100755
|
|
222
|
+
index 0000000..48ffa3e
|
|
223
|
+
--- /dev/null
|
|
224
|
+
+++ b/modules.d/30convertfs/module-setup.sh
|
|
225
|
+
|
|
226
|
+
+#!/bin/bash
|
|
227
|
+
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
|
|
228
|
+
+# ex: ts=8 sw=4 sts=4 et filetype=sh
|
|
229
|
+
+
|
|
230
|
+
+check() {
|
|
231
|
+
+ [[ $mount_needs ]] && return 1
|
|
232
|
+
+ return 255
|
|
233
|
+
+}
|
|
234
|
+
+
|
|
235
|
+
+depends() {
|
|
236
|
+
+ return 0
|
|
237
|
+
+}
|
|
238
|
+
+
|
|
239
|
+
+install() {
|
|
240
|
+
+ dracut_install bash
|
|
241
|
+
+ dracut_install find ldconfig mv rm cp ln
|
|
242
|
+
+ inst_hook pre-pivot 99 "$moddir/do-convertfs.sh"
|
|
243
|
+
+ inst "$moddir/convertfs.sh" /usr/bin/convertfs
|
|
244
|
+
+}
|
|
245
|
+
+
|
|
246
|
+
diff --git a/modules.d/30usrmove/do-usrmove.sh b/modules.d/30usrmove/do-usrmove.sh
|
|
247
|
+
deleted file mode 100755
|
|
248
|
+
index 6596a68..0000000
|
|
249
|
+
--- a/modules.d/30usrmove/do-usrmove.sh
|
|
250
|
+
+++ /dev/null
|
|
251
|
+
|
|
252
|
+
-#!/bin/bash
|
|
253
|
+
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
|
|
254
|
+
-# ex: ts=8 sw=4 sts=4 et filetype=sh
|
|
255
|
+
-
|
|
256
|
+
-if getargbool 0 rd.usrmove; then
|
|
257
|
+
- if getargbool 0 rd.debug; then
|
|
258
|
+
- bash -x usrmove-convert "$NEWROOT" 2>&1 | vinfo
|
|
259
|
+
- else
|
|
260
|
+
- usrmove-convert "$NEWROOT" 2>&1 | vinfo
|
|
261
|
+
- fi
|
|
262
|
+
-fi
|
|
263
|
+
diff --git a/modules.d/30usrmove/module-setup.sh b/modules.d/30usrmove/module-setup.sh
|
|
264
|
+
deleted file mode 100755
|
|
265
|
+
index 04b44ca..0000000
|
|
266
|
+
--- a/modules.d/30usrmove/module-setup.sh
|
|
267
|
+
+++ /dev/null
|
|
268
|
+
|
|
269
|
+
-#!/bin/bash
|
|
270
|
+
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
|
|
271
|
+
-# ex: ts=8 sw=4 sts=4 et filetype=sh
|
|
272
|
+
-
|
|
273
|
+
-check() {
|
|
274
|
+
- [[ $mount_needs ]] && return 1
|
|
275
|
+
- return 255
|
|
276
|
+
-}
|
|
277
|
+
-
|
|
278
|
+
-depends() {
|
|
279
|
+
- return 0
|
|
280
|
+
-}
|
|
281
|
+
-
|
|
282
|
+
-install() {
|
|
283
|
+
- dracut_install bash
|
|
284
|
+
- dracut_install find ldconfig mv rm cp ln
|
|
285
|
+
- inst_hook pre-pivot 99 "$moddir/do-usrmove.sh"
|
|
286
|
+
- inst "$moddir/usrmove-convert.sh" /usr/bin/usrmove-convert
|
|
287
|
+
-}
|
|
288
|
+
-
|
|
289
|
+
diff --git a/modules.d/30usrmove/usrmove-convert.sh b/modules.d/30usrmove/usrmove-convert.sh
|
|
290
|
+
deleted file mode 100755
|
|
291
|
+
index 8aa8588..0000000
|
|
292
|
+
--- a/modules.d/30usrmove/usrmove-convert.sh
|
|
293
|
+
+++ /dev/null
|
|
294
|
+
|
|
295
|
+
-#!/bin/bash
|
|
296
|
+
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
|
|
297
|
+
-# ex: ts=8 sw=4 sts=4 et filetype=sh
|
|
298
|
+
-
|
|
299
|
+
-ROOT="$1"
|
|
300
|
+
-
|
|
301
|
+
-if [[ ! -d "$ROOT" ]]; then
|
|
302
|
+
- echo "Usage: $0 <rootdir>"
|
|
303
|
+
- exit 1
|
|
304
|
+
-fi
|
|
305
|
+
-
|
|
306
|
+
-if [[ "$ROOT" -ef / ]]; then
|
|
307
|
+
- echo "Can't convert the running system."
|
|
308
|
+
- echo "Please boot with 'usrmove' on the kernel command line,"
|
|
309
|
+
- echo "to update with the help of the initramfs,"
|
|
310
|
+
- echo "or run this script from a rescue system."
|
|
311
|
+
- exit 1
|
|
312
|
+
-fi
|
|
313
|
+
-
|
|
314
|
+
-while [[ "$ROOT" != "${ROOT%/}" ]]; do
|
|
315
|
+
- ROOT=${ROOT%/}
|
|
316
|
+
-done
|
|
317
|
+
-
|
|
318
|
+
-needconvert() {
|
|
319
|
+
- for dir in "$ROOT/bin" "$ROOT/sbin" "$ROOT/lib" "$ROOT/lib64"; do
|
|
320
|
+
- if [[ -e "$dir" ]]; then
|
|
321
|
+
- [[ -L "$dir" ]] || return 0
|
|
322
|
+
- fi
|
|
323
|
+
- done
|
|
324
|
+
- return 1
|
|
325
|
+
-}
|
|
326
|
+
-
|
|
327
|
+
-if ! needconvert; then
|
|
328
|
+
- echo "Your system is already converted."
|
|
329
|
+
- exit 0
|
|
330
|
+
-fi
|
|
331
|
+
-
|
|
332
|
+
-testfile="$ROOT/.usrmovecheck$$"
|
|
333
|
+
-rm -f "$testfile"
|
|
334
|
+
-> "$testfile"
|
|
335
|
+
-if [[ ! -e "$testfile" ]]; then
|
|
336
|
+
- echo "Cannot write to $ROOT/"
|
|
337
|
+
- exit 1
|
|
338
|
+
-fi
|
|
339
|
+
-rm -f "$testfile"
|
|
340
|
+
-
|
|
341
|
+
-testfile="$ROOT/usr/.usrmovecheck$$"
|
|
342
|
+
-rm -f "$testfile"
|
|
343
|
+
-> "$testfile"
|
|
344
|
+
-if [[ ! -e "$testfile" ]]; then
|
|
345
|
+
- echo "Cannot write to $ROOT/usr/"
|
|
346
|
+
- exit 1
|
|
347
|
+
-fi
|
|
348
|
+
-rm -f "$testfile"
|
|
349
|
+
-
|
|
350
|
+
-ismounted() {
|
|
351
|
+
- while read a m a; do
|
|
352
|
+
- [[ "$m" = "$1" ]] && return 0
|
|
353
|
+
- done < /proc/mounts
|
|
354
|
+
- return 1
|
|
355
|
+
-}
|
|
356
|
+
-
|
|
357
|
+
-# clean up after ourselves no matter how we die.
|
|
358
|
+
-cleanup() {
|
|
359
|
+
- echo "Something failed. Move back to the original state"
|
|
360
|
+
- for dir in "$ROOT/bin" "$ROOT/sbin" "$ROOT/lib" "$ROOT/lib64" \
|
|
361
|
+
- "$ROOT/usr/bin" "$ROOT/usr/sbin" "$ROOT/usr/lib" \
|
|
362
|
+
- "$ROOT/usr/lib64"; do
|
|
363
|
+
- [[ -d "${dir}.usrmove-new" ]] && rm -fr "${dir}.usrmove-new"
|
|
364
|
+
- if [[ -d "${dir}.usrmove-old" ]]; then
|
|
365
|
+
- mv "$dir" "${dir}.del~"
|
|
366
|
+
- mv "${dir}.usrmove-old" "$dir"
|
|
367
|
+
- rm -fr "${dir}.del~"
|
|
368
|
+
- fi
|
|
369
|
+
- done
|
|
370
|
+
-}
|
|
371
|
+
-
|
|
372
|
+
-trap 'ret=$?; [[ $ret -ne 0 ]] && cleanup;exit $ret;' EXIT
|
|
373
|
+
-trap 'exit 1;' SIGINT
|
|
374
|
+
-
|
|
375
|
+
-ismounted "$ROOT/usr" || CP_HARDLINK="-l"
|
|
376
|
+
-
|
|
377
|
+
-set -e
|
|
378
|
+
-
|
|
379
|
+
-# merge / and /usr in new dir in /usr
|
|
380
|
+
-for dir in bin sbin lib lib64; do
|
|
381
|
+
- rm -rf "$ROOT/usr/${dir}.usrmove-new"
|
|
382
|
+
- [[ -L "$ROOT/$dir" ]] && continue
|
|
383
|
+
- [[ -d "$ROOT/$dir" ]] || continue
|
|
384
|
+
- echo "Make a copy of \`$ROOT/usr/$dir'."
|
|
385
|
+
- [[ -d "$ROOT/usr/$dir" ]] \
|
|
386
|
+
- && cp -ax $CP_HARDLINK "$ROOT/usr/$dir" "$ROOT/usr/${dir}.usrmove-new"
|
|
387
|
+
- echo "Merge the copy with \`$ROOT/$dir'."
|
|
388
|
+
- [[ -d "$ROOT/usr/${dir}.usrmove-new" ]] \
|
|
389
|
+
- || mkdir -p "$ROOT/usr/${dir}.usrmove-new"
|
|
390
|
+
- cp -axT $CP_HARDLINK --backup --suffix=.usrmove~ "$ROOT/$dir" "$ROOT/usr/${dir}.usrmove-new"
|
|
391
|
+
- echo "Clean up duplicates in \`$ROOT/usr/$dir'."
|
|
392
|
+
- # delete all symlinks that have been backed up
|
|
393
|
+
- find "$ROOT/usr/${dir}.usrmove-new" -type l -name '*.usrmove~' -delete || :
|
|
394
|
+
- # replace symlink with backed up binary
|
|
395
|
+
- find "$ROOT/usr/${dir}.usrmove-new" \
|
|
396
|
+
- -name '*.usrmove~' \
|
|
397
|
+
- -type f \
|
|
398
|
+
- -exec bash -c 'p="{}";o=${p%%%%.usrmove~};
|
|
399
|
+
- [[ -L "$o" ]] && mv -f "$p" "$o"' ';' || :
|
|
400
|
+
-done
|
|
401
|
+
-# switch over merged dirs in /usr
|
|
402
|
+
-for dir in bin sbin lib lib64; do
|
|
403
|
+
- [[ -d "$ROOT/usr/${dir}.usrmove-new" ]] || continue
|
|
404
|
+
- echo "Switch to new \`$ROOT/usr/$dir'."
|
|
405
|
+
- rm -fr "$ROOT/usr/${dir}.usrmove-old"
|
|
406
|
+
- mv "$ROOT/usr/$dir" "$ROOT/usr/${dir}.usrmove-old"
|
|
407
|
+
- mv "$ROOT/usr/${dir}.usrmove-new" "$ROOT/usr/$dir"
|
|
408
|
+
-done
|
|
409
|
+
-
|
|
410
|
+
-# replace dirs in / with links to /usr
|
|
411
|
+
-for dir in bin sbin lib lib64; do
|
|
412
|
+
- [[ -L "$ROOT/$dir" ]] && continue
|
|
413
|
+
- [[ -d "$ROOT/$dir" ]] || continue
|
|
414
|
+
- echo "Create \`$ROOT/$dir' symlink."
|
|
415
|
+
- rm -rf "$ROOT/${dir}.usrmove-old" || :
|
|
416
|
+
- mv "$ROOT/$dir" "$ROOT/${dir}.usrmove-old"
|
|
417
|
+
- ln -sfn usr/$dir "$ROOT/$dir"
|
|
418
|
+
-done
|
|
419
|
+
-
|
|
420
|
+
-echo "Clean up backup files."
|
|
421
|
+
-# everything seems to work; cleanup
|
|
422
|
+
-for dir in bin sbin lib lib64; do
|
|
423
|
+
- # if we get killed in the middle of "rm -rf", ensure not to leave
|
|
424
|
+
- # an incomplete directory, which is moved back by cleanup()
|
|
425
|
+
- [[ -d "$ROOT/usr/${dir}.usrmove-old" ]] \
|
|
426
|
+
- && mv "$ROOT/usr/${dir}.usrmove-old" "$ROOT/usr/${dir}.usrmove-old~"
|
|
427
|
+
- [[ -d "$ROOT/${dir}.usrmove-old" ]] \
|
|
428
|
+
- && mv "$ROOT/${dir}.usrmove-old" "$ROOT/${dir}.usrmove-old~"
|
|
429
|
+
-done
|
|
430
|
+
-
|
|
431
|
+
-for dir in bin sbin lib lib64; do
|
|
432
|
+
- [[ -d "$ROOT/usr/${dir}.usrmove-old~" ]] \
|
|
433
|
+
- && rm -rf "$ROOT/usr/${dir}.usrmove-old~" || :
|
|
434
|
+
- [[ -d "$ROOT/${dir}.usrmove-old~" ]] \
|
|
435
|
+
- && rm -rf "$ROOT/${dir}.usrmove-old~" || :
|
|
436
|
+
-done
|
|
437
|
+
-
|
|
438
|
+
-for dir in lib lib64; do
|
|
439
|
+
- [[ -d "$ROOT/$dir" ]] || continue
|
|
440
|
+
- for lib in "$ROOT"/usr/${dir}/lib*.so*.usrmove~; do
|
|
441
|
+
- [[ -f $lib ]] || continue
|
|
442
|
+
- mv $lib ${lib/.so/_so}
|
|
443
|
+
- done
|
|
444
|
+
-done
|
|
445
|
+
-
|
|
446
|
+
-set +e
|
|
447
|
+
-
|
|
448
|
+
-echo "Run ldconfig."
|
|
449
|
+
-ldconfig -r "$ROOT"
|
|
450
|
+
-#echo "Set autorelabel flag."
|
|
451
|
+
-#> "$ROOT/.autorelabel"
|
|
452
|
+
-echo "Done."
|
|
453
|
+
-exit 0
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
|
|
11
11
|
Name: dracut
|
|
12
12
|
Version: 014
|
|
13
|
-
Release:
|
|
13
|
+
Release: 80.git20120202%{?dist}
|
|
14
14
|
|
|
15
15
|
Summary: Initramfs generator using udev
|
|
16
16
|
%if 0%{?fedora} || 0%{?rhel} > 6
|
|
@@ -100,6 +100,9 @@ Patch73: 0073-30usrmove-usrmove-convert.sh-rename-duplicate-librar.patch
|
|
|
100
100
|
Patch74: 0074-dracut.spec-create-compat-symlink-instead-of-ghost.patch
|
|
101
101
|
Patch75: 0075-fix-kernel-modules-search-for-s390.patch
|
|
102
102
|
Patch76: 0076-fix-kernel-modules-search-for-s390.patch
|
|
103
|
+
Patch77: 0077-30usrmove-usrmove-convert.sh-do-not-force-selinux-au.patch
|
|
104
|
+
Patch78: 0078-dracut-functions-install-nosegneg-libs-additionally-.patch
|
|
105
|
+
Patch79: 0079-renamed-usrmove-to-convertfs.patch
|
|
103
106
|
|
|
104
107
|
|
|
105
108
|
BuildArch: noarch
|
|
@@ -309,7 +312,7 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
309
312
|
%{dracutlibdir}/modules.d/05busybox
|
|
310
313
|
%{dracutlibdir}/modules.d/10i18n
|
|
311
314
|
%{dracutlibdir}/modules.d/10rpmversion
|
|
312
|
-
%{dracutlibdir}/modules.d/
|
|
315
|
+
%{dracutlibdir}/modules.d/30convertfs
|
|
313
316
|
%{dracutlibdir}/modules.d/50plymouth
|
|
314
317
|
%{dracutlibdir}/modules.d/90btrfs
|
|
315
318
|
%{dracutlibdir}/modules.d/90crypt
|
|
@@ -384,6 +387,9 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
384
387
|
%dir /var/lib/dracut/overlay
|
|
385
388
|
|
|
386
389
|
%changelog
|
|
390
|
+
* Thu Feb 02 2012 Harald Hoyer <harald@redhat.com> 014-80.git20120202
|
|
391
|
+
- update to latest git
|
|
392
|
+
|
|
387
393
|
* Thu Jan 26 2012 Harald Hoyer <harald@redhat.com> 014-77.git20120126.1
|
|
388
394
|
- rebuild for rawhide
|
|
389
395
|
|