This is pending review. On Fri, Jan 24, 2014 at 10:26:21AM +0100, Jose A. Lopes wrote: > This fixes issue 690. > > Signed-off-by: Jose A. Lopes <[email protected]> > --- > create | 2 +- > export | 2 +- > import | 2 +- > rename | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/create b/create > index c276b04..6565176 100755 > --- a/create > +++ b/create > @@ -36,7 +36,7 @@ CACHE_FILE="$CACHE_DIR/cache-${SUITE}-${DPKG_ARCH}.tar" > # This is needed for file disks. > if [ ! -b $blockdev ]; then > ORIGINAL_BLOCKDEV=$blockdev > - blockdev=$(losetup -sf $blockdev) > + blockdev=$(losetup --show -f $blockdev) > CLEANUP+=("losetup -d $blockdev") > fi > > diff --git a/export b/export > index 46aa74c..8941621 100755 > --- a/export > +++ b/export > @@ -25,7 +25,7 @@ set -e > # This is needed for file disks. > if [ ! -b $blockdev ]; then > ORIGINAL_BLOCKDEV=$blockdev > - blockdev=$(losetup -sf $blockdev) > + blockdev=$(losetup --show -f $blockdev) > CLEANUP+=("losetup -d $blockdev") > fi > > diff --git a/import b/import > index 2d9b58e..a69759d 100755 > --- a/import > +++ b/import > @@ -25,7 +25,7 @@ set -e > # This is needed for file disks. > if [ ! -b $blockdev ]; then > ORIGINAL_BLOCKDEV=$blockdev > - blockdev=$(losetup -sf $blockdev) > + blockdev=$(losetup --show -f $blockdev) > CLEANUP+=("losetup -d $blockdev") > fi > > diff --git a/rename b/rename > index 652d6b7..81bf8dd 100755 > --- a/rename > +++ b/rename > @@ -28,7 +28,7 @@ CLEANUP+=("rmdir $TMPDIR") > # This is needed for file disks. > if [ ! -b $blockdev ]; then > ORIGINAL_BLOCKDEV=$blockdev > - blockdev=$(losetup -sf $blockdev) > + blockdev=$(losetup --show -f $blockdev) > CLEANUP+=("losetup -d $blockdev") > fi > > -- > 1.8.5.3 >
-- Jose Antonio Lopes Ganeti Engineering Google Germany GmbH Dienerstr. 12, 80331, München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores Steuernummer: 48/725/00206 Umsatzsteueridentifikationsnummer: DE813741370
