X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=6af14c38c6aef2a31e40eabbd0f32ba82d765b2d;hb=5b69e4b92b73d30b9efedcc291cfb45e2ec10a37;hp=9bbf8beac425c668accfa781883899c81040bd54;hpb=5020118e6c6744ef26f01dab015295c7baadecaa;p=live-boot-grml.git diff --git a/scripts/live b/scripts/live index 9bbf8be..6af14c3 100755 --- a/scripts/live +++ b/scripts/live @@ -390,9 +390,9 @@ Arguments () 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 ifconfig eth0 down + [ "${NETBOOT}" ] || chroot /root ifconfig eth0 down umount /root/sys umount /root/proc @@ -621,7 +621,7 @@ is_nice_device () { 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]$'