projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set default cow_mountopt where the other defaults are used.
[live-boot-grml.git]
/
scripts
/
live
diff --git
a/scripts/live
b/scripts/live
index
3f39c97
..
867efc0
100755
(executable)
--- a/
scripts/live
+++ b/
scripts/live
@@
-456,7
+456,7
@@
Arguments ()
if [ -z "${UNIONTYPE}" ]
then
if [ -z "${UNIONTYPE}" ]
then
- UNIONTYPE="
union
fs"
+ UNIONTYPE="
au
fs"
export UNIONTYPE
fi
}
export UNIONTYPE
fi
}
@@
-650,8
+650,16
@@
do_netmount ()
modprobe -q af_packet # For DHCP
modprobe -q af_packet # For DHCP
- udevtrigger
- udevsettle
+ if [ -x /sbin/udevadm ]
+ then
+ # lenny
+ udevadm trigger
+ udevadm settle
+ else
+ # etch
+ udevtrigger
+ udevsettle
+ fi
ipconfig ${DEVICE} | tee /netboot.config
ipconfig ${DEVICE} | tee /netboot.config
@@
-875,7
+883,7
@@
try_snap ()
fi
else
# cpio.gz snapshot
fi
else
# cpio.gz snapshot
- if ! (cd "${snap_mount}" && zcat "${snapback}/${snapfile}" | cpio -
i -u -d 2>/dev/null
)
+ if ! (cd "${snap_mount}" && zcat "${snapback}/${snapfile}" | cpio -
-extract --preserve-modification-time --no-absolute-filenames --sparse --unconditional --make-directories > /dev/null 2>&1
)
then
log_warning_msg "Impossible to include the ${snapfile} Snapshot"
return 1
then
log_warning_msg "Impossible to include the ${snapfile} Snapshot"
return 1
@@
-1008,7
+1016,12
@@
setup_unionfs ()
rofslist="${image} ${rofslist}"
elif [ -f "${image}" ]
then
rofslist="${image} ${rofslist}"
elif [ -f "${image}" ]
then
- backdev=$(get_backing_device "${image}" "-r")
+ if losetup --help 2>&1 | grep -q -- "-r\b"
+ then
+ backdev=$(get_backing_device "${image}" "-r")
+ else
+ backdev=$(get_backing_device "${image}")
+ fi
fstype=$(get_fstype "${backdev}")
if [ "${fstype}" = "unknown" ]
fstype=$(get_fstype "${backdev}")
if [ "${fstype}" = "unknown" ]
@@
-1036,8
+1049,16
@@
setup_unionfs ()
modprobe -q -b ${module}
done
modprobe -q -b ${module}
done
- udevtrigger
- udevsettle
+ if [ -x /sbin/udevadm ]
+ then
+ # lenny
+ udevadm trigger
+ udevadm settle
+ else
+ # etch
+ udevtrigger
+ udevsettle
+ fi
# For some reason, udevsettle does not block in this scenario,
# so we sleep for a little while.
# For some reason, udevsettle does not block in this scenario,
# so we sleep for a little while.
@@
-1059,10
+1080,12
@@
setup_unionfs ()
then
cowdevice=${cowprobe}
cow_fstype=$(get_fstype "${cowprobe}")
then
cowdevice=${cowprobe}
cow_fstype=$(get_fstype "${cowprobe}")
+ cow_mountopt="rw,noatime"
else
[ "${quiet}" != "y" ] && log_warning_msg "Unable to find the persistent medium"
cowdevice="tmpfs"
cow_fstype="tmpfs"
else
[ "${quiet}" != "y" ] && log_warning_msg "Unable to find the persistent medium"
cowdevice="tmpfs"
cow_fstype="tmpfs"
+ cow_mountopt="rw,noatime,mode=755"
fi
elif [ -n "${NFS_COW}" ] && [ -z "${NOPERSISTENT}" ]
then
fi
elif [ -n "${NFS_COW}" ] && [ -z "${NOPERSISTENT}" ]
then
@@
-1086,6
+1109,7
@@
setup_unionfs ()
else
cowdevice="tmpfs"
cow_fstype="tmpfs"
else
cowdevice="tmpfs"
cow_fstype="tmpfs"
+ cow_mountopt="rw,noatime,mode=755"
fi
if [ "${cow_fstype}" = "nfs" ]
fi
if [ "${cow_fstype}" = "nfs" ]
@@
-1095,7
+1119,7
@@
setup_unionfs ()
nfsmount ${nfs_cow_opts} ${cowdevice} /cow || \
panic "Can not mount ${cowdevice} (n: ${cow_fstype}) on /cow"
else
nfsmount ${nfs_cow_opts} ${cowdevice} /cow || \
panic "Can not mount ${cowdevice} (n: ${cow_fstype}) on /cow"
else
- mount -t ${cow_fstype} -o
rw,noatime
${cowdevice} /cow || \
+ mount -t ${cow_fstype} -o
${cow_mountopt}
${cowdevice} /cow || \
panic "Can not mount ${cowdevice} (o: ${cow_fstype}) on /cow"
fi
panic "Can not mount ${cowdevice} (o: ${cow_fstype}) on /cow"
fi
@@
-1187,12
+1211,6
@@
check_dev ()
devname=$(sys2dev "${sysdev}")
fi
devname=$(sys2dev "${sysdev}")
fi
- if [ -n "${LIVE_MEDIA_OFFSET}" ]
- then
- loopdevname=$(setup_loop "${devname}" "loop" "/sys/block/loop*" "${LIVE_MEDIA_OFFSET}" '')
- devname="${loopdevname}"
- fi
-
if [ -d "${devname}" ]
then
mount -o bind "${devname}" $mountpoint || continue
if [ -d "${devname}" ]
then
mount -o bind "${devname}" $mountpoint || continue
@@
-1206,6
+1224,12
@@
check_dev ()
fi
fi
fi
fi
+ if [ -n "${LIVE_MEDIA_OFFSET}" ]
+ then
+ loopdevname=$(setup_loop "${devname}" "loop" "/sys/block/loop*" "${LIVE_MEDIA_OFFSET}" '')
+ devname="${loopdevname}"
+ fi
+
fstype=$(get_fstype "${devname}")
if is_supported_fs ${fstype}
fstype=$(get_fstype "${devname}")
if is_supported_fs ${fstype}