projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Applying patch from Michael Prokop <mika@grml.org> to support udev >= 0.140.
[live-boot-grml.git]
/
scripts
/
live-helpers
diff --git
a/scripts/live-helpers
b/scripts/live-helpers
index
70c7f34
..
59bdb4f
100644
(file)
--- a/
scripts/live-helpers
+++ b/
scripts/live-helpers
@@
-6,10
+6,19
@@
then
export PATH="${PATH}:/usr/lib/klibc/bin"
fi
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}
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 ()
}
subdevices ()
@@
-77,7
+86,7
@@
get_fstype ()
return
fi
return
fi
- eval $(fstype
< ${1}
)
+ eval $(fstype
${1} 2>/dev/null
)
if [ "${FSTYPE}" != "unknown" ]
then
if [ "${FSTYPE}" != "unknown" ]
then
@@
-146,7
+155,7
@@
fs_size ()
mountp="/mnt/tmp_fs_size"
mkdir -p "${mountp}"
mountp="/mnt/tmp_fs_size"
mkdir -p "${mountp}"
- mount -
n -t $(get_fstype "${dev}") -o ro "${dev}" "
${mountp}"
+ mount -
t $(get_fstype "${dev}") -o ro "${dev}" "${mountp}" || log_warning_msg "cannot mount -t $(get_fstype ${dev}) -o ro ${dev}
${mountp}"
doumount=1
fi
doumount=1
fi
@@
-163,7
+172,7
@@
fs_size ()
if [ -n "${doumount}" ]
then
if [ -n "${doumount}" ]
then
- umount "${mountp}"
+ umount "${mountp}"
|| log_warning_msg "cannot umount ${mountp}"
rmdir "${mountp}"
fi
rmdir "${mountp}"
fi
@@
-206,7
+215,7
@@
setup_loop ()
dev=$(sys2dev "${loopdev}")
options=''
dev=$(sys2dev "${loopdev}")
options=''
- if [ -n
${readonly}
]
+ if [ -n
"${readonly}"
]
then
if losetup --help 2>&1 | grep -q -- "-r\b"
then
then
if losetup --help 2>&1 | grep -q -- "-r\b"
then
@@
-269,22
+278,42
@@
try_mount ()
dev="${1}"
mountp="${2}"
opts="${3}"
dev="${1}"
mountp="${2}"
opts="${3}"
+ fstype="${4}"
old_mountp="$(where_is_mounted ${dev})"
if [ -n "${old_mountp}" ]
then
old_mountp="$(where_is_mounted ${dev})"
if [ -n "${old_mountp}" ]
then
- mount -n -o remount,"${opts}" "${dev}" "${old_mountp}" || panic "Remounting ${dev} ${opts} on ${old_mountp} failed"
- mount -n -o bind "${old_mountp}" "${mountp}" || panic "Cannot bind-mount ${old_mountp} on ${mountp}"
+ 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
else
- mount -n -t $(get_fstype "${dev}") -o "${opts}" "${dev}" "${mountp}" || panic "Cannot mount ${dev} on ${mountp}"
+ if [ -z "${fstype}" ]
+ then
+ fstype=$(get_fstype "${dev}")
+ fi
+ mount -t "${fstype}" -o "${opts}" "${dev}" "${mountp}" || panic "Cannot mount ${dev} on ${mountp}, fstype=${fstype}, options=${opts}"
fi
}
find_cow_device ()
{
fi
}
find_cow_device ()
{
+ # Returns a device containing a partition labeled "${pers_label}" or containing a file named the same way
+ # in the latter case the partition containing the file is left mounted
+ # if is not in black_listed_devices
pers_label="${1}"
cow_backing="/${pers_label}-backing"
pers_label="${1}"
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 sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v fd)
do
@@
-292,20
+321,36
@@
find_cow_device ()
do
devname=$(sys2dev "${dev}")
do
devname=$(sys2dev "${dev}")
+ if echo "${black_listed_devices}" | grep -q "${devname}"
+ then
+ # skip this device enterely
+ break
+ fi
+
if [ "$(/lib/udev/vol_id -l ${devname} 2>/dev/null)" = "${pers_label}" ]
then
echo "${devname}"
return
fi
if [ "$(/lib/udev/vol_id -l ${devname} 2>/dev/null)" = "${pers_label}" ]
then
echo "${devname}"
return
fi
+ if [ "${PERSISTENT}" = "nofiles" ]
+ then
+ # do not mount the device to find for image files
+ # just skip this
+ break
+ fi
+
case "$(get_fstype ${devname})" in
case "$(get_fstype ${devname})" in
- vfat|ext2|ext3|jffs2)
+ vfat|ext2|ext3|
ext4|
jffs2)
mkdir -p "${cow_backing}"
mkdir -p "${cow_backing}"
- try_mount "${devname}" "${cow_backing}" "rw"
+ if ! try_mount "${devname}" "${cow_backing}" "rw"
+ then
+ break
+ fi
- if [ -f "${
cow_backing}/${pers_label
}" ]
+ if [ -f "${
pers_fpath
}" ]
then
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}
return 0
else
umount ${cow_backing}
@@
-320,11
+365,12
@@
find_cow_device ()
find_files ()
{
find_files ()
{
- # return the
first of ${filenames} found on vfat and ext2/ext3 devices
+ # return the
a string composed by device name, mountpoint an the first of ${filenames} found on a supported partition
# FIXME: merge with above function
filenames="${1}"
snap_backing="/snap-backing"
# FIXME: merge with above function
filenames="${1}"
snap_backing="/snap-backing"
+ black_listed_devices="${2}"
for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v fd)
do
for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v fd)
do
@@
-333,19
+379,28
@@
find_files ()
devname=$(sys2dev "${dev}")
devfstype="$(get_fstype ${devname})"
devname=$(sys2dev "${dev}")
devfstype="$(get_fstype ${devname})"
+ if echo "${black_listed_devices}" | grep -q "${devname}"
+ then
+ # skip this device enterely
+ break
+ fi
+
if is_supported_fs ${devfstype}
then
mkdir -p "${snap_backing}"
if is_supported_fs ${devfstype}
then
mkdir -p "${snap_backing}"
- try_mount "${devname}" "${snap_backing}" "ro"
- for filename in ${filenames}
+ if try_mount "${devname}" "${snap_backing}" "ro" "${devfstype}"
+ then
+ for filename in ${filenames}
do
do
- if [ -f "${snap_backing}/${filename}" ]
- then
- echo "${devname} ${snap_backing} ${filename}"
- return 0
- fi
- done
+ if [ -f "${snap_backing}/${filename}" ]
+ then
+ echo "${devname} ${snap_backing} ${filename}"
+ umount ${snap_backing}
+ return 0
+ fi
+ done
+ fi
umount ${snap_backing}
fi
umount ${snap_backing}
fi