export PATH="${PATH}:/usr/lib/klibc/bin"
fi
+# handle upgrade path from old udev (using udevinfo) to
+# recent versions of udev (using udevadm info)
+if [ -x /sbin/udevadm ]
+then
+ udevinfo='/sbin/udevadm info'
+else
+ udevinfo='udevinfo'
+fi
+
sys2dev ()
{
sysdev=${1#/sys}
- echo "/dev/$(udevinfo -q name -p ${sysdev} 2>/dev/null|| echo ${sysdev##*/})"
+ echo "/dev/$($udevinfo -q name -p ${sysdev} 2>/dev/null|| echo ${sysdev##*/})"
}
subdevices ()
return
fi
- eval $(fstype < ${1} 2>/dev/null)
+ eval $(fstype ${1} 2>/dev/null)
if [ "${FSTYPE}" != "unknown" ]
then
dev=$(sys2dev "${loopdev}")
options=''
- if [ -n ${readonly} ]
+ if [ -n "${readonly}" ]
then
if losetup --help 2>&1 | grep -q -- "-r\b"
then
if [ -n "${old_mountp}" ]
then
- mount -o remount,"${opts}" "${dev}" "${old_mountp}" || panic "Remounting ${dev} ${opts} on ${old_mountp} failed"
+ if [ "${opts}" != "ro" ]
+ then
+ mount -o remount,"${opts}" "${dev}" "${old_mountp}" || panic "Remounting ${dev} ${opts} on ${old_mountp} failed"
+ fi
+
mount -o bind "${old_mountp}" "${mountp}" || panic "Cannot bind-mount ${old_mountp} on ${mountp}"
else
if [ -z "${fstype}" ]
cow_backing="/${pers_label}-backing"
black_listed_devices="${2}"
+ if [ -z "${PERSISTENT_PATH}" ]
+ then
+ pers_fpath=${cow_backing}/${pers_label}
+ else
+ pers_fpath=${cow_backing}/${PERSISTENT_PATH}/${pers_label}
+ fi
+
for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v fd)
do
for dev in $(subdevices "${sysblock}")
fi
case "$(get_fstype ${devname})" in
- vfat|ext2|ext3|jffs2)
+ vfat|ext2|ext3|ext4|jffs2)
mkdir -p "${cow_backing}"
if ! try_mount "${devname}" "${cow_backing}" "rw"
then
break
fi
- if [ -f "${cow_backing}/${pers_label}" ]
+ if [ -f "${pers_fpath}" ]
then
- echo $(setup_loop "${cow_backing}/${pers_label}" "loop" "/sys/block/loop*")
+ echo $(setup_loop "${pers_fpath}" "loop" "/sys/block/loop*")
return 0
else
umount ${cow_backing}