From: Harald Hoyer <harald@redhat.com>
Date: Wed, 20 Aug 2014 08:21:43 +0000 (+0200)
Subject: dracut.sh: source dracut-version.sh earlier than dracut-functions.sh
X-Git-Tag: 039~29
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e27ecc9ae8352c98c206ea5165ab6b85d3d6cd3a;p=thirdparty%2Fdracut.git

dracut.sh: source dracut-version.sh earlier than dracut-functions.sh

Otherwise dracut-logger.sh outputs an empty version on journal testing.

Aug 20 10:15:49 lenovo dracut[11144]: dracut-
Aug 20 10:15:49 lenovo dracut[11148]: Executing: /sbin/dracut
---

diff --git a/dracut.sh b/dracut.sh
index 0e9b2a54f..cbccb7432 100755
--- a/dracut.sh
+++ b/dracut.sh
@@ -863,6 +863,10 @@ if [[ $print_cmdline ]]; then
     kmsgloglvl=0
 fi
 
+if [[ -f $dracutbasedir/dracut-version.sh ]]; then
+    . $dracutbasedir/dracut-version.sh
+fi
+
 if [[ -f $dracutbasedir/dracut-functions.sh ]]; then
     . $dracutbasedir/dracut-functions.sh
 else
@@ -881,10 +885,6 @@ if ! [[ $print_cmdline ]]; then
     rm -fr -- ${initdir}/*
 fi
 
-if [[ -f $dracutbasedir/dracut-version.sh ]]; then
-    . $dracutbasedir/dracut-version.sh
-fi
-
 # Verify bash version, current minimum is 3.1
 if (( BASH_VERSINFO[0] < 4 )); then
     dfatal 'You need at least Bash 4 to use dracut, sorry.'