{
directory="${1}"
rootmnt="${2}"
- mac="$3"
+ mac="${3}"
if match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.squashfs" ||
match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.ext3" ||
match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.dir"
then
- [ -n "$mac" ] && adddirectory="$directory/${LIVE_MEDIA_PATH}/${mac}"
+ [ -n "${mac}" ] && adddirectory="${directory}/${LIVE_MEDIA_PATH}/${mac}"
setup_unionfs "${directory}/${LIVE_MEDIA_PATH}" "${rootmnt}" "${adddirectory}"
else
:
{
image_directory="${1}"
rootmnt="${2}"
- addimage_directory="$3"
+ addimage_directory="${3}"
modprobe -q -b ${UNIONTYPE}
# run-init can't deal with images in a subdir, but we're going to
done
done
- if [ -n "${addimage_directory}" -a -d "${addimage_directory}" ]; then
- for FILESYSTEM in squashfs ext2 ext3 xfs dir
- do
- for IMAGE in "${addimage_directory}"/*."${FILESYSTEM}"
- do
- if [ -e "${IMAGE}" ]
- then
- image_string="${image_string} ${IMAGE}"
- fi
- done
- done
- fi
+ if [ -n "${addimage_directory}" ] && [ -d "${addimage_directory}" ]
+ then
+ for FILESYSTEM in squashfs ext2 ext3 xfs dir
+ do
+ for IMAGE in "${addimage_directory}"/*."${FILESYSTEM}"
+ do
+ if [ -e "${IMAGE}" ]
+ then
+ image_string="${image_string} ${IMAGE}"
+ fi
+ done
+ done
+ fi
# Now sort the list
image_string="$(echo ${image_string} | sed -e 's/ /\n/g' | sort )"
nfs_cow_opts="-o nolock"
nfs_cow=${NFS_COW}
fi
- mac=$(get_mac)
+ mac="$(get_mac)"
if [ -n "${mac}" ]
then
cowdevice=$(echo ${nfs_cow}|sed "s/client_mac_address/${mac}/")
then
setup_unionfs "${livefs_root}" "${rootmnt}"
else
- mac=$(get_mac)
- mac=$(echo ${mac}|sed "s/-//g")
+ mac="$(get_mac)"
+ mac="$(echo ${mac} | sed 's/-//g')"
mount_images_in_directory "${livefs_root}" "${rootmnt}" "${mac}"
fi
get_mac ()
{
- mac=""
- for adaptor in /sys/class/net/*;do
- status=$(cat ${adaptor}/iflink)
- if [ ${status} -eq 2 ];
- then
- mac=$(cat ${adaptor}/address)
- mac=$(echo ${mac}|sed 's/:/-/g'|tr '[a-z]' '[A-Z]')
- fi
- done
- echo $mac
+ mac=""
+
+ for adaptor in /sys/class/net/*
+ do
+ status="$(cat ${adaptor}/iflink)"
+
+ if [ "${status}" -eq 2 ]
+ then
+ mac="$(cat ${adaptor}/address)"
+ mac="$(echo ${mac} | sed 's/:/-/g' | tr '[a-z]' '[A-Z]')"
+ fi
+ done
+
+ echo ${mac}
}