projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding upstream version 1.154.6.
[live-boot-grml.git]
/
scripts
/
live-helpers
diff --git
a/scripts/live-helpers
b/scripts/live-helpers
index
f6b8b8b
..
8970834
100644
(file)
--- a/
scripts/live-helpers
+++ b/
scripts/live-helpers
@@
-77,7
+77,7
@@
get_fstype ()
return
fi
return
fi
- eval $(fstype
<
${1} 2>/dev/null)
+ eval $(fstype ${1} 2>/dev/null)
if [ "${FSTYPE}" != "unknown" ]
then
if [ "${FSTYPE}" != "unknown" ]
then
@@
-206,7
+206,7
@@
setup_loop ()
dev=$(sys2dev "${loopdev}")
options=''
dev=$(sys2dev "${loopdev}")
options=''
- if [ -n
${readonly}
]
+ if [ -n
"${readonly}"
]
then
if losetup --help 2>&1 | grep -q -- "-r\b"
then
then
if losetup --help 2>&1 | grep -q -- "-r\b"
then
@@
-299,6
+299,13
@@
find_cow_device ()
cow_backing="/${pers_label}-backing"
black_listed_devices="${2}"
cow_backing="/${pers_label}-backing"
black_listed_devices="${2}"
+ if [ -z "${PERSISTENT_PATH}" ]
+ then
+ pers_fpath=${cow_backing}/${pers_label}
+ else
+ pers_fpath=${cow_backing}/${PERSISTENT_PATH}/${pers_label}
+ fi
+
for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v fd)
do
for dev in $(subdevices "${sysblock}")
for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v fd)
do
for dev in $(subdevices "${sysblock}")
@@
-332,9
+339,9
@@
find_cow_device ()
break
fi
break
fi
- if [ -f "${
cow_backing}/${pers_label
}" ]
+ if [ -f "${
pers_fpath
}" ]
then
then
- echo $(setup_loop "${
cow_backing}/${pers_label
}" "loop" "/sys/block/loop*")
+ echo $(setup_loop "${
pers_fpath
}" "loop" "/sys/block/loop*")
return 0
else
umount ${cow_backing}
return 0
else
umount ${cow_backing}