[SCM] live-build branch, debian, updated. debian/3.0_a30-1-31-g468a41f
Daniel Baumann
daniel at debian.org
Wed Sep 7 15:43:11 UTC 2011
The following commit has been merged in the debian branch:
commit dfde086f354116443abf94d350073989aef19dcf
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Aug 27 20:50:19 2011 +0200
Only calling udevadm in losetup function when udev is installed on the host system.
diff --git a/functions/losetup.sh b/functions/losetup.sh
index 039ff3e..6089e09 100755
--- a/functions/losetup.sh
+++ b/functions/losetup.sh
@@ -21,7 +21,10 @@ Lodetach ()
# Changes to block devices result in uevents which trigger rules which in
# turn access the loop device (ex. udisks-part-id, blkid) which can cause
# a race condition. We call 'udevadm settle' to help avoid this.
- ${LB_ROOT_COMMAND} udevadm settle
+ if [ -x "$(which udevadm 2>/dev/null)" ]
+ then
+ ${LB_ROOT_COMMAND} udevadm settle
+ fi
# Loop back devices aren't the most reliable when it comes to writes.
# We sleep and sync for good measure - better than build failure.
--
live-build
More information about the debian-live-changes
mailing list