projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merging casper 1.153.
[live-boot-grml.git]
/
scripts
/
live
diff --git
a/scripts/live
b/scripts/live
index
846e10f
..
bf20ffc
100755
(executable)
--- a/
scripts/live
+++ b/
scripts/live
@@
-286,9
+286,9
@@
Arguments ()
export NOPROGRAMCRASHES
;;
export NOPROGRAMCRASHES
;;
- no
restrictedmanager
)
- NO
RESTRICTEDMANAGER
="Yes"
- export NO
RESTRICTEDMANAGER
+ no
jockey
)
+ NO
JOCKEY
="Yes"
+ export NO
JOCKEY
;;
nosudo)
;;
nosudo)
@@
-799,11
+799,13
@@
do_nfsmount ()
log_begin_msg "Trying nfsmount -o nolock -o ro ${NFSOPTS} ${NFSROOT} ${mountpoint}"
log_begin_msg "Trying nfsmount -o nolock -o ro ${NFSOPTS} ${NFSROOT} ${mountpoint}"
- # FIXME: This for loop is an ugly HACK round an nfs bug
- for i in 0 1 2 3 4 5 6 7 8 9 a b c d e f 10 11 12 13
+ # FIXME: This while loop is an ugly HACK round an nfs bug
+ i=0
+ while [ "$i" -lt 60 ]
do
nfsmount -o nolock -o ro ${NFSOPTS} "${NFSROOT}" "${mountpoint}" && rc=0 && break
sleep 1
do
nfsmount -o nolock -o ro ${NFSOPTS} "${NFSROOT}" "${mountpoint}" && rc=0 && break
sleep 1
+ i="$(($i + 1))"
done
return ${rc}
done
return ${rc}
@@
-1369,7
+1371,7
@@
find_livefs ()
fi
# or do the scan of block devices
fi
# or do the scan of block devices
- for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -vE "/(loop|ram|dm-|fd)"
+ for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -vE "/(loop|ram|dm-|fd)"
)
do
devname=$(sys2dev "${sysblock}")
fstype=$(get_fstype "${devname}")
do
devname=$(sys2dev "${sysblock}")
fstype=$(get_fstype "${devname}")
@@
-1461,7
+1463,8
@@
mountroot ()
livefs_root=${ROOT}
else
# Scan local devices for the image
livefs_root=${ROOT}
else
# Scan local devices for the image
- for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
+ i=0
+ while [ "$i" -lt 60 ]
do
livefs_root=$(find_livefs ${i})
do
livefs_root=$(find_livefs ${i})
@@
-1471,6
+1474,7
@@
mountroot ()
fi
sleep 1
fi
sleep 1
+ i="$(($i + 1))"
done
fi
fi
done
fi
fi