projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'live-systems/debian' into debian
[live-boot-grml.git]
/
components
/
9990-misc-helpers.sh
diff --git
a/components/9990-misc-helpers.sh
b/components/9990-misc-helpers.sh
index
2a3e6ad
..
c656f23
100755
(executable)
--- a/
components/9990-misc-helpers.sh
+++ b/
components/9990-misc-helpers.sh
@@
-76,7
+76,7
@@
is_nice_device ()
{
sysfs_path="${1#/sys}"
{
sysfs_path="${1#/sys}"
- if udevadm
test-builtin 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 udevadm
info --query=all --path="${sysfs_path}" | egrep -q "DEVTYPE=disk
"
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]$'
@@
-161,7
+161,7
@@
check_dev ()
# Adding lvm support
if [ -x /scripts/local-top/lvm2 ]
then
# Adding lvm support
if [ -x /scripts/local-top/lvm2 ]
then
- ROOT="$device" resume="" /scripts/local-top/lvm2
+ ROOT="$device" resume="" /scripts/local-top/lvm2
>>/boot.log
fi
;;
fi
;;
@@
-169,10
+169,10
@@
check_dev ()
# Adding raid support
if [ -x /scripts/local-top/mdadm ]
then
# Adding raid support
if [ -x /scripts/local-top/mdadm ]
then
- cp /conf/conf.d/md /conf/conf.d/md.orig
+
[ -r /conf/conf.d/md ] &&
cp /conf/conf.d/md /conf/conf.d/md.orig
echo "MD_DEVS=$device " >> /conf/conf.d/md
echo "MD_DEVS=$device " >> /conf/conf.d/md
- /scripts/local-top/mdadm
- mv /conf/conf.d/md.orig /conf/conf.d/md
+ /scripts/local-top/mdadm
>>/boot.log
+
[ -r /conf/conf.d/md.orig ] &&
mv /conf/conf.d/md.orig /conf/conf.d/md
fi
;;
esac
fi
;;
esac