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
8875248
..
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 ()
@@
-299,6
+308,13
@@
find_cow_device ()
cow_backing="/${pers_label}-backing"
black_listed_devices="${2}"
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}")
for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v fd)
do
for dev in $(subdevices "${sysblock}")
@@
-325,16
+341,16
@@
find_cow_device ()
fi
case "$(get_fstype ${devname})" in
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
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
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}