projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Calculating size for the whole media "/live/image/", not only the dir "/live/image...
[live-boot-grml.git]
/
scripts
/
boot
/
9990-misc-helpers.sh
diff --git
a/scripts/boot/9990-misc-helpers.sh
b/scripts/boot/9990-misc-helpers.sh
index
611d602
..
82099a4
100755
(executable)
--- a/
scripts/boot/9990-misc-helpers.sh
+++ b/
scripts/boot/9990-misc-helpers.sh
@@
-938,7
+938,7
@@
find_persistence_media ()
white_listed_devices="${2}"
ret=""
white_listed_devices="${2}"
ret=""
- black_listed_devices="$(what_is_mounted_on /live/medium)"
+ black_listed_devices="$(what_is_mounted_on /live/medium)
$(what_is_mounted_on /live/findiso) $(what_is_mounted_on /live/fromiso)
"
for dev in $(storage_devices "${black_listed_devices}" "${white_listed_devices}")
do
for dev in $(storage_devices "${black_listed_devices}" "${white_listed_devices}")
do
@@
-1293,7
+1293,7
@@
get_custom_mounts ()
continue
fi
continue
fi
- if [ -n "${DEBUG}" ] && [ -e "${include_list}" ]
+ if [ -n "${
LIVE_BOOT_
DEBUG}" ] && [ -e "${include_list}" ]
then
cp ${include_list} /live/persistence/${persistence_list}.${device_name}
fi
then
cp ${include_list} /live/persistence/${persistence_list}.${device_name}
fi