Author: glen
Date: Wed May 14 19:57:28 2008
New Revision: 9750
Modified:
geninitrd/trunk/geninitrd
Log:
- notify if lvm2 is not present
- copy resume dev with complete path
Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd (original)
+++ geninitrd/trunk/geninitrd Wed May 14 19:57:28 2008
@@ -632,6 +632,11 @@
return 0
fi
+ if [ ! -x /sbin/lvm ]; then
+ debug "LVM check: no lvm2 tools present to check"
+ return 0
+ fi
+
/sbin/lvm lvdisplay "$node" > /dev/null 2>&1
rc=$?
if [ $rc -gt 127 ]; then
@@ -993,7 +998,8 @@
fi
resume_dev="$(awk '/^resume device =/ { print $4 } ' /etc/suspend.conf)"
mknod $DESTDIR/dev/snapshot c 10 231
- inst $resume_dev /dev
+ mkdir -p $DESTDIR${resume_dev%/*}
+ inst $resume_dev $resume_dev
inst /etc/suspend.conf /etc/suspend.conf
if [ -x /usr/${_lib}/suspend/resume ]; then
inst /usr/${_lib}/suspend/resume /bin/resume
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
