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.131.
[live-boot-grml.git]
/
scripts
/
live
diff --git
a/scripts/live
b/scripts/live
index
8cff606
..
867d4f9
100755
(executable)
--- a/
scripts/live
+++ b/
scripts/live
@@
-154,6
+154,12
@@
Arguments ()
export LIVE_MEDIA_TIMEOUT
;;
export LIVE_MEDIA_TIMEOUT
;;
+ language=*|debian-installer/language=*)
+ language=${x#debian-installer/language=}
+ locale="$(lang2locale "$language")"
+ set_locale="true"
+ ;;
+
locale=*|debian-installer/locale=*)
LOCALE="${ARGUMENT#*=}"
export LOCALE
locale=*|debian-installer/locale=*)
LOCALE="${ARGUMENT#*=}"
export LOCALE
@@
-982,7
+988,7
@@
setup_unionfs ()
fi
mkdir -p "${croot}/${imagename}"
fi
mkdir -p "${croot}/${imagename}"
- echo "debug:
Can not mount backdev ${backdev} (image = ${image}) on croot/imagename ${croot}/${imagename}
"
+ echo "debug:
Mounting backdev \"${backdev}\" (image = ${image}) on croot/imagename \"${croot}/${imagename}\"
"
mount -t "${fstype}" -o ro,noatime "${backdev}" "${croot}/${imagename}" || panic "Can not mount ${backdev} (${image}) on ${croot}/${imagename}" && rofsstring="${croot}/${imagename}=${roopt}:${rofsstring}" && rofslist="${croot}/${imagename} ${rofslist}"
fi
done
mount -t "${fstype}" -o ro,noatime "${backdev}" "${croot}/${imagename}" || panic "Can not mount ${backdev} (${image}) on ${croot}/${imagename}" && rofsstring="${croot}/${imagename}=${roopt}:${rofsstring}" && rofslist="${croot}/${imagename} ${rofslist}"
fi
done
@@
-1205,7
+1211,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 -v loop | grep -v ram | grep -v 'dm-')
+ for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v 'dm-'
| grep -v fd
)
do
devname=$(sys2dev "${sysblock}")
fstype=$(get_fstype "${devname}")
do
devname=$(sys2dev "${sysblock}")
fstype=$(get_fstype "${devname}")
@@
-1261,6
+1267,8
@@
mountroot ()
exec 7>&2
exec > live.log
exec 2>&1
exec 7>&2
exec > live.log
exec 2>&1
+ tail -f live.log >&7 &
+ tailpid="${!}"
Arguments
Arguments
@@
-1342,5
+1350,6
@@
mountroot ()
exec 1>&6 6>&-
exec 2>&7 7>&-
exec 1>&6 6>&-
exec 2>&7 7>&-
+ kill ${tailpid}
cp live.log "${rootmnt}/var/log/"
}
cp live.log "${rootmnt}/var/log/"
}