diff options
| author | Daniel Baumann <daniel@debian.org> | 2009-03-12 07:12:21 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:48:04 +0100 |
| commit | f5302bcc273b3b7f557e3b30c6457d9c20d05b56 (patch) | |
| tree | 5dfd1efc2dfaac6f7d2192c83f0855b61c1c21d2 /scripts | |
| parent | 753beff823f1963bd98ab4057fb1c63eeb7712fe (diff) | |
| download | live-boot-f5302bcc273b3b7f557e3b30c6457d9c20d05b56.tar.gz live-boot-f5302bcc273b3b7f557e3b30c6457d9c20d05b56.zip | |
Respecting media timeout even when specificing media device manually.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/live | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/scripts/live b/scripts/live index eb04d27..5d5b978 100755 --- a/scripts/live +++ b/scripts/live @@ -1391,21 +1391,21 @@ find_livefs () { timeout="${1}" - # first look at the one specified in the command line - if [ ! -z "${LIVE_MEDIA}" ] + # don't start autodetection before timeout has expired + if [ -n "${LIVE_MEDIA_TIMEOUT}" ] then - if check_dev "null" "${LIVE_MEDIA}" "skip_uuid_check" + if [ "${timeout}" -lt "${LIVE_MEDIA_TIMEOUT}" ] then - return 0 + return 1 fi fi - # don't start autodetection before timeout has expired - if [ -n "${LIVE_MEDIA_TIMEOUT}" ] + # first look at the one specified in the command line + if [ ! -z "${LIVE_MEDIA}" ] then - if [ "${timeout}" -lt "${LIVE_MEDIA_TIMEOUT}" ] + if check_dev "null" "${LIVE_MEDIA}" "skip_uuid_check" then - return 1 + return 0 fi fi |