From 3854710095b261578abb24364ea77d440736624b Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 14 Dec 2010 19:58:14 +0100 Subject: Updating losetup-lukshome example hook to use blkid where available, thanks to Clint Adams (Closes: #607108). --- examples/hooks/all_chroot_losetup-lukshome.sh | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/examples/hooks/all_chroot_losetup-lukshome.sh b/examples/hooks/all_chroot_losetup-lukshome.sh index 95d3c053a..b5e372638 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}" ] -- cgit v1.2.3