10rpmversion,dracut.spec: generate version file and install it

diff --git a/dracut.spec b/dracut.spec
index 194aa26e2393305bd212c9d5d84c0880d480cd80..c28ece5a93068ccbe75093fcde9c6d13e78b31ca 100644 (file)
--- a/dracut.spec
+++ b/dracut.spec
@@ -1,3 +1,4 @@
+%define gittag 5948b0c8
 %if 0%{?fedora} < 12
 %define with_switch_root 1
 %else
@@ -106,12 +107,13 @@ This package contains tools to assemble the local initrd and host configuration.
 %build
 make
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT sbindir=/sbin \
      sysconfdir=/etc mandir=%{_mandir}
 
+echo %{name}-%{version}-%{release} > $RPM_BUILD_ROOT/%{_datadir}/dracut/modules.d/10rpmversion/dracut-version
+
 %if ! 0%{?with_switch_root}
 rm -f $RPM_BUILD_ROOT/sbin/switch_root
 %endif

diff --git a/modules.d/10rpmversion/install b/modules.d/10rpmversion/install
index cbe61fcba9c1c82d021a0636ecfe5b365d90a37f..87faccee55220732d3ec053fe665087e95cbc8d0 100755 (executable)
--- a/modules.d/10rpmversion/install
+++ b/modules.d/10rpmversion/install
@@ -1,7 +1,12 @@
 
-dracut_rpm_version=$(rpm -qf --qf '%{name}-%{version}-%{release}\n' $(which $0) | { ver="";while read line;do ver=$line;done;echo $ver;} )
-if [ $? -eq 0 ]; then
-       echo $dracut_rpm_version > $initdir/$dracut_rpm_version
+if [ -e "$moddir/dracut-version" ]; then
+    dracut_rpm_version=$(cat "$moddir/dracut-version")
+    inst "$moddir/dracut-version" /$dracut_rpm_version
+else
+    dracut_rpm_version=$(rpm -qf --qf '%{name}-%{version}-%{release}\n' $(which $0) | { ver="";while read line;do ver=$line;done;echo $ver;} )
+    if [ $? -eq 0 ]; then
+        echo $dracut_rpm_version > $initdir/$dracut_rpm_version
+    fi
 fi
 
 inst_hook cmdline 01 "$moddir/version.sh"