projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Skipped some runtime duplicated execution.
[live-boot-grml.git]
/
scripts
/
live-helpers
diff --git
a/scripts/live-helpers
b/scripts/live-helpers
index
e1f69dd
..
0b9bd5f
100644
(file)
--- a/
scripts/live-helpers
+++ b/
scripts/live-helpers
@@
-1,4
+1,3
@@
-#!/bin/sh
# live-initramfs helper functions, used by live-initramfs on boot and by live-snapshot
if [ ! -x "/bin/fstype" ]
# live-initramfs helper functions, used by live-initramfs on boot and by live-snapshot
if [ ! -x "/bin/fstype" ]
@@
-33,6
+32,12
@@
is_supported_fs ()
{
fstype="${1}"
{
fstype="${1}"
+ # Validate input first
+ if [ -z "${fstype}" ]
+ then
+ return 1
+ fi
+
# Try to look if it is already supported by the kernel
if grep -q ${fstype} /proc/filesystems
then
# Try to look if it is already supported by the kernel
if grep -q ${fstype} /proc/filesystems
then
@@
-72,7
+77,7
@@
get_fstype ()
return
fi
return
fi
- eval $(fstype < ${1})
+ eval $(fstype < ${1}
2>/dev/null
)
if [ "${FSTYPE}" != "unknown" ]
then
if [ "${FSTYPE}" != "unknown" ]
then
@@
-184,7
+189,15
@@
setup_loop ()
local readonly=${6}
modprobe -q -b "${module}"
local readonly=${6}
modprobe -q -b "${module}"
- udevsettle
+
+ if [ -x /sbin/udevadm ]
+ then
+ # lenny
+ udevadm settle
+ else
+ # etch
+ udevsettle
+ fi
for loopdev in ${pattern}
do
for loopdev in ${pattern}
do
@@
-256,6
+269,7
@@
try_mount ()
dev="${1}"
mountp="${2}"
opts="${3}"
dev="${1}"
mountp="${2}"
opts="${3}"
+ fstype="${4}"
old_mountp="$(where_is_mounted ${dev})"
old_mountp="$(where_is_mounted ${dev})"
@@
-264,7
+278,11
@@
try_mount ()
mount -o remount,"${opts}" "${dev}" "${old_mountp}" || panic "Remounting ${dev} ${opts} on ${old_mountp} failed"
mount -o bind "${old_mountp}" "${mountp}" || panic "Cannot bind-mount ${old_mountp} on ${mountp}"
else
mount -o remount,"${opts}" "${dev}" "${old_mountp}" || panic "Remounting ${dev} ${opts} on ${old_mountp} failed"
mount -o bind "${old_mountp}" "${mountp}" || panic "Cannot bind-mount ${old_mountp} on ${mountp}"
else
- mount -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
}
fi
}
@@
-323,7
+341,7
@@
find_files ()
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"
+ try_mount "${devname}" "${snap_backing}" "ro"
${devfstype}
for filename in ${filenames}
do
for filename in ${filenames}
do