projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merging casper 1.172.
[live-boot-grml.git]
/
scripts
/
live
diff --git
a/scripts/live
b/scripts/live
index
9bbf8be
..
6af14c3
100755
(executable)
--- a/
scripts/live
+++ b/
scripts/live
@@
-390,9
+390,9
@@
Arguments ()
mount -o bind /dev /root/dev
mkdir -p /root/var/run/network
mount -o bind /dev /root/dev
mkdir -p /root/var/run/network
- chroot /root dhclient eth0
+
[ "${NETBOOT}" ] ||
chroot /root dhclient eth0
chroot /root wget -P /tmp "${location}"
chroot /root wget -P /tmp "${location}"
- chroot /root ifconfig eth0 down
+
[ "${NETBOOT}" ] ||
chroot /root ifconfig eth0 down
umount /root/sys
umount /root/proc
umount /root/sys
umount /root/proc
@@
-621,7
+621,7
@@
is_nice_device ()
{
sysfs_path="${1#/sys}"
{
sysfs_path="${1#/sys}"
- if /lib/udev/path_id "${sysfs_path}" | grep -E -q "ID_PATH=(usb|pci-)"
+ if /lib/udev/path_id "${sysfs_path}" | grep -E -q "ID_PATH=(usb|pci-
|platform-mmc
)"
then
return 0
elif echo "${sysfs_path}" | grep -q '^/block/vd[a-z]$'
then
return 0
elif echo "${sysfs_path}" | grep -q '^/block/vd[a-z]$'