]> git.ipfire.org Git - thirdparty/dracut.git/commitdiff
dracut.sh: source dracut-version.sh earlier than dracut-functions.sh
authorHarald Hoyer <harald@redhat.com>
Wed, 20 Aug 2014 08:21:43 +0000 (10:21 +0200)
committerHarald Hoyer <harald@redhat.com>
Wed, 20 Aug 2014 08:21:43 +0000 (10:21 +0200)
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

dracut.sh

index 0e9b2a54f1fe1b073b755a8de77fb413fc3f94da..cbccb7432aaddfa62ce8bc74619d5a84669e87fa 100755 (executable)
--- 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.'