|
 |
18971c |
From 75bf5df4209bec34799fb412d4c5bdd2b03e244d Mon Sep 17 00:00:00 2001
|
|
|
18971c |
From: Harald Hoyer <harald@redhat.com>
|
|
|
18971c |
Date: Wed, 20 Aug 2014 10:21:43 +0200
|
|
|
18971c |
Subject: [PATCH] dracut.sh: source dracut-version.sh earlier than
|
|
|
18971c |
dracut-functions.sh
|
|
|
18971c |
|
|
|
18971c |
Otherwise dracut-logger.sh outputs an empty version on journal testing.
|
|
|
18971c |
|
|
|
18971c |
Aug 20 10:15:49 lenovo dracut[11144]: dracut-
|
|
|
18971c |
Aug 20 10:15:49 lenovo dracut[11148]: Executing: /sbin/dracut
|
|
|
18971c |
|
|
|
18971c |
Cherry-picked from: e27ecc9ae8352c98c206ea5165ab6b85d3d6cd3a
|
|
|
18971c |
Resolves: #1490777
|
|
|
18971c |
---
|
|
|
18971c |
dracut.sh | 8 ++++----
|
|
|
18971c |
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
18971c |
|
|
|
18971c |
diff --git a/dracut.sh b/dracut.sh
|
|
|
18971c |
index 1dd3eabd..b34edea2 100755
|
|
|
18971c |
--- a/dracut.sh
|
|
|
18971c |
+++ b/dracut.sh
|
|
|
18971c |
@@ -864,6 +864,10 @@ if [[ $print_cmdline ]]; then
|
|
|
18971c |
kmsgloglvl=0
|
|
|
18971c |
fi
|
|
|
18971c |
|
|
|
18971c |
+if [[ -f $dracutbasedir/dracut-version.sh ]]; then
|
|
|
18971c |
+ . $dracutbasedir/dracut-version.sh
|
|
|
18971c |
+fi
|
|
|
18971c |
+
|
|
|
18971c |
if [[ -f $dracutbasedir/dracut-init.sh ]]; then
|
|
|
18971c |
. $dracutbasedir/dracut-init.sh
|
|
|
18971c |
else
|
|
|
18971c |
@@ -882,10 +886,6 @@ if ! [[ $print_cmdline ]]; then
|
|
|
18971c |
rm -fr -- ${initdir}/*
|
|
|
18971c |
fi
|
|
|
18971c |
|
|
|
18971c |
-if [[ -f $dracutbasedir/dracut-version.sh ]]; then
|
|
|
18971c |
- . $dracutbasedir/dracut-version.sh
|
|
|
18971c |
-fi
|
|
|
18971c |
-
|
|
|
18971c |
# Verify bash version, current minimum is 3.1
|
|
|
18971c |
if (( BASH_VERSINFO[0] < 4 )); then
|
|
|
18971c |
dfatal 'You need at least Bash 4 to use dracut, sorry.'
|