- rpm != redhat

- symlink may need a target directory

Changed files:
    create-target-dir-for-symlink.patch -> 1.1
    dracut.spec -> 1.6
    no-rh.patch -> 1.1

diff --git a/create-target-dir-for-symlink.patch b/create-target-dir-for-symlink.patch
new file mode 100644 (file)
index 0000000..faf296f
--- /dev/null
+++ b/create-target-dir-for-symlink.patch
@@ -0,0 +1,16 @@
+--- dracut/dracut-functions.sh~        2012-02-24 15:38:08.000000000 +0100
++++ dracut/dracut-functions.sh 2012-03-21 15:03:12.440030577 +0100
+@@ -540,7 +540,12 @@
+             inst "$_realsrc"
+         fi
+     fi
+-    [[ -d ${_target%/*} ]] && _target=$(readlink -f ${_target%/*})/${_target##*/}
++    if [[ -d ${_target%/*} ]]; then
++        if ! [[ -d "$initdir/${_target%/*}" ]]; then
++            inst_dir "${_target%/*}"
++        fi
++        _target=$(readlink -f ${_target%/*})/${_target##*/}
++    fi
+     ln -sfn $(convert_abs_rel "${_target}" "${_realsrc}") "$initdir/$_target"
+ }
+ 

diff --git a/dracut.spec b/dracut.spec
index d5e8e7951159997a884c55fd5d75d876436e35de..4bd5834ca9bc65f9ffc95d929743ab92d9ad50be 100644 (file)
--- a/dracut.spec
+++ b/dracut.spec
@@ -7,6 +7,8 @@ Group:          Base
 Source0:       ftp://www.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz
 # Source0-md5: 8c966954cd973b5abbd7193368f1d5cc
 Source1:       pld.conf
+Patch0:                no-rh.patch
+Patch1:                create-target-dir-for-symlink.patch
 URL:           https://dracut.wiki.kernel.org/
 BuildRequires: docbook-style-xsl
 BuildRequires: libxslt-progs
@@ -91,6 +93,8 @@ configuration.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 %{__make}

diff --git a/no-rh.patch b/no-rh.patch
new file mode 100644 (file)
index 0000000..1e89e08
--- /dev/null
+++ b/no-rh.patch
@@ -0,0 +1,11 @@
+--- dracut-017/modules.d/10rpmversion/module-setup.sh~ 2012-02-24 15:38:08.000000000 +0100
++++ dracut-017/modules.d/10rpmversion/module-setup.sh  2012-03-21 14:06:18.113626194 +0100
+@@ -4,7 +4,7 @@
+ 
+ check() {
+     [[ "$mount_needs" ]] && return 1
+-    [ -f /etc/redhat-release ]
++    [ -x /bin/rpm ]
+ }
+ 
+ depends() {