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
fcaf1ec
..
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
- udevadm trigger
- 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
@@
-1008,7
+1016,7
@@
setup_unionfs ()
rofslist="${image} ${rofslist}"
elif [ -f "${image}" ]
then
rofslist="${image} ${rofslist}"
elif [ -f "${image}" ]
then
- if
/sbin/
losetup --help 2>&1 | grep -q -- "-r\b"
+ if losetup --help 2>&1 | grep -q -- "-r\b"
then
backdev=$(get_backing_device "${image}" "-r")
else
then
backdev=$(get_backing_device "${image}" "-r")
else
@@
-1041,8
+1049,16
@@
setup_unionfs ()
modprobe -q -b ${module}
done
modprobe -q -b ${module}
done
- udevadm trigger
- 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.
@@
-1093,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" ]