kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
master
Harald Hoyer 2014-08-20 10:21:43 +02:00
parent 8e3f653749
commit e27ecc9ae8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dracut.sh
View File

@ -863,6 +863,10 @@ if [[ $print_cmdline ]]; then
kmsgloglvl=0 kmsgloglvl=0
fi fi


if [[ -f $dracutbasedir/dracut-version.sh ]]; then
. $dracutbasedir/dracut-version.sh
fi

if [[ -f $dracutbasedir/dracut-functions.sh ]]; then if [[ -f $dracutbasedir/dracut-functions.sh ]]; then
. $dracutbasedir/dracut-functions.sh . $dracutbasedir/dracut-functions.sh
else else
@ -881,10 +885,6 @@ if ! [[ $print_cmdline ]]; then
rm -fr -- ${initdir}/* rm -fr -- ${initdir}/*
fi fi


if [[ -f $dracutbasedir/dracut-version.sh ]]; then
. $dracutbasedir/dracut-version.sh
fi

# Verify bash version, current minimum is 3.1 # Verify bash version, current minimum is 3.1
if (( BASH_VERSINFO[0] < 4 )); then if (( BASH_VERSINFO[0] < 4 )); then
dfatal 'You need at least Bash 4 to use dracut, sorry.' dfatal 'You need at least Bash 4 to use dracut, sorry.'