[SCM] live-build branch, debian-next, updated. debian/3.0_a10-1-2-g44a50e5
Daniel Baumann
daniel at debian.org
Tue Dec 14 18:58:24 UTC 2010
The following commit has been merged in the debian-next branch:
commit 44a50e5799f16380bc1bd2b6a2bb36c0181c9a91
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Dec 14 19:58:14 2010 +0100
Updating losetup-lukshome example hook to use blkid where available, thanks to Clint Adams <clint at gnu.org> (Closes: #607108).
diff --git a/examples/hooks/all_chroot_losetup-lukshome.sh b/examples/hooks/all_chroot_losetup-lukshome.sh
index 95d3c05..b5e3726 100755
--- a/examples/hooks/all_chroot_losetup-lukshome.sh
+++ b/examples/hooks/all_chroot_losetup-lukshome.sh
@@ -333,27 +333,7 @@ do
esac
done
-# search for a partition labeled "lukshome" or $LUKSPART
-for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v fd)
-do
- for dev in $(subdevices "${sysblock}")
- do
- devname=$(sys2dev "${dev}")
- # find partition name and filesystem type
- if [ "$(/lib/udev/vol_id -l ${devname} 2>/dev/null)" = "${LUKSPART}" ]
- then
- # found one partition with correct label
- CRYPTHOME="${devname}"
- # don't search further
- break
- fi
- done
- # if already found, don't search further
- if [ -n "${CRYPTHOME}" ]
- then
- break
- fi
-done
+CRYPTHOME=$(/sbin/blkid -L ${LUKSPART})
# if no partition found, exit
if [ -z "${CRYPTHOME}" ]
--
live-build
More information about the debian-live-changes
mailing list