summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
d93e867)
mount_images_in_directory() had is own logic for checking if this is a live
path which was redundant, so I used is_live_path().
-match_files_in_dir ()
-{
- # Does any files match pattern ${1} ?
- local pattern
- pattern="${1}"
-
- if [ "$(echo ${pattern})" != "${pattern}" ]
- then
- return 0
- fi
-
- return 1
-}
-
mount_images_in_directory ()
{
directory="${1}"
rootmnt="${2}"
mac="${3}"
mount_images_in_directory ()
{
directory="${1}"
rootmnt="${2}"
mac="${3}"
- if match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.squashfs" ||
- match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.ext2" ||
- match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.ext3" ||
- match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.ext4" ||
- match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.jffs2" ||
- match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.dir"
+ if is_live_path "${directory}"
then
[ -n "${mac}" ] && adddirectory="${directory}/${LIVE_MEDIA_PATH}/${mac}"
setup_unionfs "${directory}/${LIVE_MEDIA_PATH}" "${rootmnt}" "${adddirectory}"
then
[ -n "${mac}" ] && adddirectory="${directory}/${LIVE_MEDIA_PATH}/${mac}"
setup_unionfs "${directory}/${LIVE_MEDIA_PATH}" "${rootmnt}" "${adddirectory}"