projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Dropping helper function used in one place only which can be replaced with a simple...
[live-boot-grml.git]
/
components
/
9990-misc-helpers.sh
diff --git
a/components/9990-misc-helpers.sh
b/components/9990-misc-helpers.sh
index
194b871
..
245e9da
100755
(executable)
--- a/
components/9990-misc-helpers.sh
+++ b/
components/9990-misc-helpers.sh
@@
-2,17
+2,12
@@
#set -e
#set -e
-file_pattern_matches()
-{
- [ -e "$1" ]
-}
-
is_live_path()
{
DIRECTORY="${1}/${LIVE_MEDIA_PATH}"
for FILESYSTEM in squashfs ext2 ext3 ext4 xfs dir jffs
do
is_live_path()
{
DIRECTORY="${1}/${LIVE_MEDIA_PATH}"
for FILESYSTEM in squashfs ext2 ext3 ext4 xfs dir jffs
do
- if
file_pattern_matches "${DIRECTORY}/"*.${FILESYSTEM}
+ if
ls "${DIRECTORY}/"*.${FILESYSTEM} > /dev/null 2>&1
then
return 0
fi
then
return 0
fi
@@
-199,9
+194,9
@@
check_dev ()
if is_supported_fs ${fstype}
then
devuid=$(blkid -o value -s UUID "$devname")
if is_supported_fs ${fstype}
then
devuid=$(blkid -o value -s UUID "$devname")
- [ -n "$devuid" ] && grep -qs "\<$devuid\>"
$tried
&& continue
+ [ -n "$devuid" ] && grep -qs "\<$devuid\>"
/var/lib/live/boot/devices-already-tried-to-mount
&& continue
mount -t ${fstype} -o ro,noatime "${devname}" ${mountpoint} || continue
mount -t ${fstype} -o ro,noatime "${devname}" ${mountpoint} || continue
- [ -n "$devuid" ] && echo "$devuid" >>
$tried
+ [ -n "$devuid" ] && echo "$devuid" >>
/var/lib/live/boot/devices-already-tried-to-mount
if [ -n "${FINDISO}" ]
then
if [ -n "${FINDISO}" ]
then
@@
-1286,9
+1281,6
@@
get_custom_mounts ()
if [ -r "${backing}/${persistence_list}" ]
then
include_list="${backing}/${persistence_list}"
if [ -r "${backing}/${persistence_list}" ]
then
include_list="${backing}/${persistence_list}"
- elif [ -r "${backing}/${old_persistence_list}" ]
- then
- include_list="${backing}/${old_persistence_list}"
else
continue
fi
else
continue
fi