move dracut version file to /lib/dracut/dracut-$version

diff --git a/lsinitrd b/lsinitrd
index 6e2d82b8f105d858aa72efdca2f3a7e13be76e03..906946dbe2f2d0fddb98e2999a1adddd0f261164 100755 (executable)
--- a/lsinitrd
+++ b/lsinitrd
@@ -40,7 +40,7 @@ fi
 
 echo "$1:"
 echo "========================================================================"
-$CAT $1 | cpio --extract --verbose --quiet --to-stdout 'dracut-*' 2>/dev/null
+$CAT $1 | cpio --extract --verbose --quiet --to-stdout 'lib/dracut/dracut-*' 2>/dev/null
 echo "========================================================================"
 $CAT $1 | cpio --extract --verbose --quiet --list
 echo "========================================================================"

diff --git a/modules.d/10rpmversion/module-setup.sh b/modules.d/10rpmversion/module-setup.sh
index e26d7852c6114895a97ca6fdb200cd34da37f414..60a8d891e3598dd4988d48696b967b23f38c6f52 100755 (executable)
--- a/modules.d/10rpmversion/module-setup.sh
+++ b/modules.d/10rpmversion/module-setup.sh
@@ -13,11 +13,12 @@ depends() {
 install() {
     if [ -e "$moddir/dracut-version" ]; then
         dracut_rpm_version=$(cat "$moddir/dracut-version")
-        inst "$moddir/dracut-version" /$dracut_rpm_version
+        inst "$moddir/dracut-version" /lib/dracut/$dracut_rpm_version
     else
         if rpm -qf $(type -P $0) &>/dev/null; then
             dracut_rpm_version=$(rpm -qf --qf '%{name}-%{version}-%{release}\n' $(type -P $0) | { ver="";while read line;do ver=$line;done;echo $ver;} )
-            echo $dracut_rpm_version > $initdir/$dracut_rpm_version
+            mkdir -m 0755 -p $initdir/lib $initdir/lib/dracut
+            echo $dracut_rpm_version > $initdir/lib/dracut/$dracut_rpm_version
         fi
     fi
     inst_hook cmdline 01 "$moddir/version.sh"