projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Release new version 3.0~b8-1+grml.1
[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
3455045
..
ace130b
100755
(executable)
--- a/
scripts/boot/9990-misc-helpers.sh
+++ b/
scripts/boot/9990-misc-helpers.sh
@@
-940,7
+940,7
@@
find_persistence_media ()
local white_listed_devices="${2}"
local ret=""
local white_listed_devices="${2}"
local ret=""
- local black_listed_devices="$(what_is_mounted_on /live/
image
)"
+ local black_listed_devices="$(what_is_mounted_on /live/
medium
)"
for dev in $(storage_devices "${black_listed_devices}" "${white_listed_devices}")
do
for dev in $(storage_devices "${black_listed_devices}" "${white_listed_devices}")
do
@@
-1258,9
+1258,14
@@
get_custom_mounts ()
continue
fi
continue
fi
- local include_list
="${backing}/${persistence_list}"
- if [
! -r "${includ
e_list}" ]
+ local include_list
+ if [
-r "${backing}/${persistenc
e_list}" ]
then
then
+ include_list="${backing}/${persistence_list}"
+ elif [ -r "${backing}/${old_persistence_list}" ]
+ then
+ include_list="${backing}/${old_persistence_list}"
+ else
continue
fi
continue
fi