projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
07_support_findiso: remove upstream-applied parts
[live-boot-grml.git]
/
scripts
/
live
diff --git
a/scripts/live
b/scripts/live
index
1b5c89e
..
584193e
100755
(executable)
--- a/
scripts/live
+++ b/
scripts/live
@@
-536,7
+536,7
@@
is_nice_device ()
PATH_ID="/sbin/udevadm test-builtin path_id"
fi
PATH_ID="/sbin/udevadm test-builtin path_id"
fi
- if
"${PATH_ID}"
"${sysfs_path}" | egrep -q "ID_PATH=(usb|pci-[^-]*-(ide|sas|scsi|usb|virtio)|platform-sata_mv|platform-orion-ehci|platform-mmc|platform-mxsdhci)"
+ if
${PATH_ID}
"${sysfs_path}" | egrep -q "ID_PATH=(usb|pci-[^-]*-(ide|sas|scsi|usb|virtio)|platform-sata_mv|platform-orion-ehci|platform-mmc|platform-mxsdhci)"
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]$'
@@
-1952,6
+1952,7
@@
mountroot ()
then
# We found a memdisk, set up phram
modprobe phram phram=memdisk,${MEMDISK}
then
# We found a memdisk, set up phram
modprobe phram phram=memdisk,${MEMDISK}
+ modprobe phram phram=memdisk,${MEMDISK}
# Load mtdblock, the memdisk will be /dev/mtdblock0
modprobe mtdblock
# Load mtdblock, the memdisk will be /dev/mtdblock0
modprobe mtdblock