projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updating to standards 3.8.0.
[live-boot-grml.git]
/
scripts
/
live
diff --git
a/scripts/live
b/scripts/live
index
3428cca
..
b6762bc
100755
(executable)
--- a/
scripts/live
+++ b/
scripts/live
@@
-479,7
+479,7
@@
matches_uuid ()
path="${1}"
uuid="$(cat /conf/uuid.conf)"
path="${1}"
uuid="$(cat /conf/uuid.conf)"
- for try_uuid_file in "${mountpoint}/.disk/
casper
-uuid"*
+ for try_uuid_file in "${mountpoint}/.disk/
live
-uuid"*
do
[ -e "${try_uuid_file}" ] || continue
do
[ -e "${try_uuid_file}" ] || continue
@@
-498,7
+498,7
@@
get_backing_device ()
{
case "${1}" in
*.squashfs|*.ext2|*.ext3|*.jffs2)
{
case "${1}" in
*.squashfs|*.ext2|*.ext3|*.jffs2)
- echo $(setup_loop "${1}" "loop" "/sys/block/loop*" '0' "${LIVE_MEDIA_ENCRYPTION}")
+ echo $(setup_loop "${1}" "loop" "/sys/block/loop*" '0' "${LIVE_MEDIA_ENCRYPTION}"
"${2}"
)
;;
*.dir)
;;
*.dir)
@@
-965,7
+965,7
@@
setup_unionfs ()
rofslist="${image} ${rofslist}"
elif [ -f "${image}" ]
then
rofslist="${image} ${rofslist}"
elif [ -f "${image}" ]
then
- backdev=$(get_backing_device "${image}")
+ backdev=$(get_backing_device "${image}"
"-r"
)
fstype=$(get_fstype "${backdev}")
if [ "${fstype}" = "unknown" ]
fstype=$(get_fstype "${backdev}")
if [ "${fstype}" = "unknown" ]