init: Parse resolution after splash.conf

This commit is contained in:
MilhouseVH 2016-06-01 20:01:54 +01:00
parent b4f3545fd7
commit 4809df9715

View File

@ -433,6 +433,13 @@
fi fi
fi fi
# load splash
if [ -f /flash/oemsplash.png ]; then
SPLASHIMAGE="/flash/oemsplash.png"
elif [ -f /splash/splash.conf ]; then
. /splash/splash.conf
fi
# Select splash image based on current native resolution # Select splash image based on current native resolution
if [ -z "$SPLASHIMAGE" ]; then if [ -z "$SPLASHIMAGE" ]; then
vres="$(fbset | awk '/geometry/ { print $3 }')" vres="$(fbset | awk '/geometry/ { print $3 }')"
@ -443,13 +450,6 @@
fi fi
fi fi
# load splash
if [ -f /flash/oemsplash.png ]; then
SPLASHIMAGE="/flash/oemsplash.png"
elif [ -f /splash/splash.conf ]; then
. /splash/splash.conf
fi
ply-image $SPLASHIMAGE > /dev/null 2>&1 ply-image $SPLASHIMAGE > /dev/null 2>&1
fi fi
fi fi