add rd.device.timeout=<seconds> parameter

Harald Hoyer 2016-06-30 15:24:54 +02:00
parent ca64eeec79
commit ca46c751d1
2 changed files with 6 additions and 2 deletions

View File

@ -7,6 +7,7 @@ type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
generator_wait_for_dev()
{
local _name
local _timeout

_name="$(str_replace "$1" '/' '\x2f')"

@ -26,10 +27,11 @@ generator_wait_for_dev()
fi

if ! [ -f /run/systemd/generator/${_name}.device.d/timeout.conf ]; then
_timeout=$(getarg rd.device.timeout || printf "0")
mkdir -p /run/systemd/generator/${_name}.device.d
{
echo "[Unit]"
echo "JobTimeoutSec=0"
echo "JobTimeoutSec=$_timeout"
} > /run/systemd/generator/${_name}.device.d/timeout.conf
fi
}

View File

@ -887,6 +887,7 @@ wait_for_dev()
local _name
local _needreload
local _noreload
local _timeout

if [ "$1" = "-n" ]; then
_noreload=1
@ -913,10 +914,11 @@ wait_for_dev()
fi

if ! [ -f ${PREFIX}/etc/systemd/system/${_name}.device.d/timeout.conf ]; then
_timeout=$(getarg rd.device.timeout || printf "0")
mkdir -p ${PREFIX}/etc/systemd/system/${_name}.device.d
{
echo "[Unit]"
echo "JobTimeoutSec=0"
echo "JobTimeoutSec=$_timeout"
} > ${PREFIX}/etc/systemd/system/${_name}.device.d/timeout.conf
_needreload=1
fi