e9260f
update to latest git
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
From e4d85a77aad660b7877a3af091921e73865bfce6 Mon Sep 17 00:00:00 2001
|
|
2
|
+
From: Harald Hoyer <harald@redhat.com>
|
|
3
|
+
Date: Thu, 26 Jan 2012 16:39:09 +0100
|
|
4
|
+
Subject: [PATCH] dracut.spec: create compat symlink, instead of %ghost
|
|
5
|
+
|
|
6
|
+
---
|
|
7
|
+
dracut.spec | 16 +++++-----------
|
|
8
|
+
1 files changed, 5 insertions(+), 11 deletions(-)
|
|
9
|
+
|
|
10
|
+
diff --git a/dracut.spec b/dracut.spec
|
|
11
|
+
index 4eb3ba3..10556d0 100644
|
|
12
|
+
--- a/dracut.spec
|
|
13
|
+
+++ b/dracut.spec
|
|
14
|
+
@@ -197,25 +197,19 @@ rm $RPM_BUILD_ROOT%{_bindir}/lsinitrd
|
|
15
|
+
mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
|
|
16
|
+
install -m 0644 dracut.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/dracut_log
|
|
17
|
+
|
|
18
|
+
-# create the ghosts
|
|
19
|
+
-mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT/sbin
|
|
20
|
+
-ln -s ../bin/dracut $RPM_BUILD_ROOT%{_sbindir}/dracut
|
|
21
|
+
-ln -s ../usr/bin/dracut $RPM_BUILD_ROOT/sbin/dracut
|
|
22
|
+
+# create compat symlink
|
|
23
|
+
+mkdir -p $RPM_BUILD_ROOT/sbin
|
|
24
|
+
+ln -s /usr/bin/dracut $RPM_BUILD_ROOT/sbin/dracut
|
|
25
|
+
|
|
26
|
+
%clean
|
|
27
|
+
rm -rf $RPM_BUILD_ROOT
|
|
28
|
+
|
|
29
|
+
-%post -p <lua>
|
|
30
|
+
-posix.symlink("../bin/dracut", "%{_sbindir}/dracut")
|
|
31
|
+
-posix.symlink("../usr/bin/dracut", "/sbin/dracut")
|
|
32
|
+
-return 0
|
|
33
|
+
-
|
|
34
|
+
%files
|
|
35
|
+
%defattr(-,root,root,0755)
|
|
36
|
+
%doc README HACKING TODO COPYING AUTHORS NEWS dracut.html dracut.png dracut.svg
|
|
37
|
+
%{_bindir}/dracut
|
|
38
|
+
-%ghost /sbin/dracut
|
|
39
|
+
-%ghost %{_sbindir}/dracut
|
|
40
|
+
+# compat symlink
|
|
41
|
+
+/sbin/dracut
|
|
42
|
+
%if 0%{?fedora} > 12 || 0%{?rhel} >= 6 || 0%{?suse_version} > 9999
|
|
43
|
+
%{_bindir}/mkinitrd
|
|
44
|
+
%{_bindir}/lsinitrd
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
|
|
11
11
|
Name: dracut
|
|
12
12
|
Version: 014
|
|
13
|
-
Release:
|
|
13
|
+
Release: 75.git20120126%{?dist}
|
|
14
14
|
|
|
15
15
|
Summary: Initramfs generator using udev
|
|
16
16
|
%if 0%{?fedora} || 0%{?rhel} > 6
|
|
@@ -97,6 +97,7 @@ Patch70: 0070-add-usrmove-module.patch
|
|
|
97
97
|
Patch71: 0071-dracut.spec-add-compat-symlinks-to-sbin.patch
|
|
98
98
|
Patch72: 0072-usrmove-install-missing-binaries-and-set-x-only-for-.patch
|
|
99
99
|
Patch73: 0073-30usrmove-usrmove-convert.sh-rename-duplicate-librar.patch
|
|
100
|
+
Patch74: 0074-dracut.spec-create-compat-symlink-instead-of-ghost.patch
|
|
100
101
|
|
|
101
102
|
|
|
102
103
|
BuildArch: noarch
|
|
@@ -271,25 +272,19 @@ rm $RPM_BUILD_ROOT%{_bindir}/lsinitrd
|
|
|
271
272
|
mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
|
|
272
273
|
install -m 0644 dracut.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/dracut_log
|
|
273
274
|
|
|
274
|
-
# create
|
|
275
|
-
mkdir -p $RPM_BUILD_ROOT
|
|
276
|
-
ln -s
|
|
275
|
+
# create compat symlink
|
|
276
|
+
mkdir -p $RPM_BUILD_ROOT/sbin
|
|
277
|
+
ln -s /usr/bin/dracut $RPM_BUILD_ROOT/sbin/dracut
|
|
277
|
-
ln -s ../usr/bin/dracut $RPM_BUILD_ROOT/sbin/dracut
|
|
278
278
|
|
|
279
279
|
%clean
|
|
280
280
|
rm -rf $RPM_BUILD_ROOT
|
|
281
281
|
|
|
282
|
-
%post -p <lua>
|
|
283
|
-
posix.symlink("../bin/dracut", "%{_sbindir}/dracut")
|
|
284
|
-
posix.symlink("../usr/bin/dracut", "/sbin/dracut")
|
|
285
|
-
return 0
|
|
286
|
-
|
|
287
282
|
%files
|
|
288
283
|
%defattr(-,root,root,0755)
|
|
289
284
|
%doc README HACKING TODO COPYING AUTHORS NEWS dracut.html dracut.png dracut.svg
|
|
290
285
|
%{_bindir}/dracut
|
|
291
|
-
|
|
292
|
-
|
|
286
|
+
# compat symlink
|
|
287
|
+
/sbin/dracut
|
|
293
288
|
%if 0%{?fedora} > 12 || 0%{?rhel} >= 6 || 0%{?suse_version} > 9999
|
|
294
289
|
%{_bindir}/mkinitrd
|
|
295
290
|
%{_bindir}/lsinitrd
|
|
@@ -387,6 +382,9 @@ return 0
|
|
|
387
382
|
%dir /var/lib/dracut/overlay
|
|
388
383
|
|
|
389
384
|
%changelog
|
|
385
|
+
* Thu Jan 26 2012 Harald Hoyer <harald@redhat.com> 014-75.git20120126
|
|
386
|
+
- update to latest git
|
|
387
|
+
|
|
390
388
|
* Thu Jan 26 2012 Harald Hoyer <harald@redhat.com> 014-74.git20120126
|
|
391
389
|
- update to latest git
|
|
392
390
|
|