From: Harald Hoyer <harald@redhat.com>
Date: Wed, 16 Sep 2009 09:18:22 +0000 (+0200)
Subject: 10rpmversion/install: fix non-rpm install
X-Git-Tag: 002~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7dbaf59ccfcf46d913cb651304ae4f4e1743f56a;p=thirdparty%2Fdracut.git

10rpmversion/install: fix non-rpm install
---

diff --git a/modules.d/10rpmversion/install b/modules.d/10rpmversion/install
index 87faccee5..afb06c895 100755
--- a/modules.d/10rpmversion/install
+++ b/modules.d/10rpmversion/install
@@ -1,13 +1,11 @@
-
 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
+    if rpm -qf $(which $0) &>/dev/null; then
+        dracut_rpm_version=$(rpm -qf --qf '%{name}-%{version}-%{release}\n' $(which $0) | { ver="";while read line;do ver=$line;done;echo $ver;} )
         echo $dracut_rpm_version > $initdir/$dracut_rpm_version
     fi
 fi
-
 inst_hook cmdline 01 "$moddir/version.sh"