Kaydet (Commit) 31134ec5 authored tarafından Your Name's avatar Your Name

fix findiso bug

üst 0206804e
...@@ -63,7 +63,7 @@ live_config(){ ...@@ -63,7 +63,7 @@ live_config(){
} }
live_boot(){ live_boot(){
[ "${sfs}" == "" ] && sfs="/main.sfs" [ "${sfs}" == "" ] && sfs="/main.sfs"
if [ "${findiso}" =! "" ] ; then if ! [ "${findiso}" == "" ] ; then
msg "findiso variable available." msg "findiso variable available."
sfs2="${sfs}" sfs2="${sfs}"
sfs="${findiso}" sfs="${findiso}"
...@@ -85,7 +85,8 @@ live_boot(){ ...@@ -85,7 +85,8 @@ live_boot(){
mkdir /output mkdir /output
mkdir /source mkdir /source
mount -t auto $root /output || fallback_shell mount -t auto $root /output || fallback_shell
if [ "$findiso" =! "" ] ; then if ! [ "$findiso" == "" ] ; then
mkdir -p /iso-source || true
mount /output/${sfs} /iso-source || fallback_shell mount /output/${sfs} /iso-source || fallback_shell
mount /iso-source/${sfs2} /source || fallback_shell mount /iso-source/${sfs2} /source || fallback_shell
else else
...@@ -142,13 +143,13 @@ classic_boot(){ ...@@ -142,13 +143,13 @@ classic_boot(){
} }
wait_device(){ wait_device(){
msg "Waiting for $device" msg "Waiting for $device"
tmp=$(mktemp) tmp=$(mktemp)
rm -f $tmp rm -f $tmp
mkdir $tmp mkdir $tmp
while ! mount -t auto -o defaults,ro $root $tmp ; do while ! mount -t auto -o defaults,ro $root $tmp ; do
sleep 0.1 sleep 0.1
done done
umount -lf $tmp umount -lf $tmp
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment