Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

This commit is contained in:
Michael Tremer
2014-02-27 13:14:02 +01:00
9 changed files with 519 additions and 261 deletions

View File

@@ -10,23 +10,25 @@ case "$1" in
start)
if [ "$ENABLESETONBOOT" == "on" ]; then
boot_mesg -n "Setting time on boot..."
if [ ! -e /var/ipfire/red/active ]; then
boot_mesg ""
boot_mesg -n "Wait for online connection"
for (( i=30; i>1; i-- )) do
if [ -e /var/ipfire/red/active ]; then
break;
fi
boot_mesg -n "."
sleep 1
done
sleep 5
if [ $(pidof wpa_supplicant) ]; then
if [ ! -e /var/ipfire/red/active ]; then
boot_mesg ""
boot_mesg -n "Wait for wlan"
for (( i=30; i>1; i-- )) do
if [ -e /var/ipfire/red/active ]; then
break;
fi
boot_mesg -n "."
sleep 2
done
sleep 5
fi
fi
if [ -e /var/ipfire/red/active ]; then
boot_mesg ""
loadproc /usr/local/bin/settime $(cat /var/ipfire/time/settime.conf)
else
boot_mesg " not online!"
boot_mesg " ERROR! Not online!"
echo_warning
fi
fi