projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding proper code comments about vol_id removal.
[live-boot-grml.git]
/
scripts
/
live
diff --git
a/scripts/live
b/scripts/live
index
d162f75
..
96ab63a
100755
(executable)
--- a/
scripts/live
+++ b/
scripts/live
@@
-762,16
+762,8
@@
do_netmount ()
modprobe -q af_packet # For DHCP
modprobe -q af_packet # For DHCP
- if [ -x /sbin/udevadm ]
- then
- # lenny
- udevadm trigger
- udevadm settle
- else
- # etch
- udevtrigger
- udevsettle
- fi
+ udevadm trigger
+ udevadm settle
ipconfig ${DEVICE} | tee /netboot.config
ipconfig ${DEVICE} | tee /netboot.config
@@
-996,7
+988,7
@@
find_snap ()
if [ "${PERSISTENT}" != "nofiles" ]
then
# search for image files
if [ "${PERSISTENT}" != "nofiles" ]
then
# search for image files
- snapdata=$(find_files "${
snap_label}.squashfs ${snap_label}.cpio.gz ${snap_label}.ext2 ${snap_label}.ext3 ${snap_label}.ext4
${snap_label}.jffs2")
+ snapdata=$(find_files "${
PERSISTENT_PATH}${snap_label}.squashfs ${PERSISTENT_PATH}${snap_label}.cpio.gz ${PERSISTENT_PATH}${snap_label}.ext2 ${PERSISTENT_PATH}${snap_label}.ext3 ${PERSISTENT_PATH}${snap_label}.ext4 ${PERSISTENT_PATH}
${snap_label}.jffs2")
fi
if [ -z "${snapdata}" ]
fi
if [ -z "${snapdata}" ]
@@
-1232,16
+1224,8
@@
setup_unionfs ()
modprobe -q -b ${module}
done
modprobe -q -b ${module}
done
- if [ -x /sbin/udevadm ]
- then
- # lenny
- udevadm trigger
- udevadm settle
- else
- # etch
- udevtrigger
- udevsettle
- fi
+ udevadm trigger
+ udevadm settle
# 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.