Page MenuHomeGRNET
Files F1614691

gnt_deboo_losetup.patch
No OneTemporary
Actions

File Metadata

Created
Sat, Mar 21, 2:42 AM

gnt_deboo_losetup.patch
View Options

From: Jose A. Lopes <jabolopes@google.com>
Date: Fri, 24 Jan 2014 09:23:01 +0000 (+0100)
Subject: Replace 'losetup' flag '-s' with '--show'
X-Git-Tag: v0.15~4
X-Git-Url: http://git.ganeti.org/?p=instance-debootstrap.git;a=commitdiff_plain;h=913c6e4222969470796729cf188bb79a78635d8a
Replace 'losetup' flag '-s' with '--show'
This fixes issue 690.
Signed-off-by: Jose A. Lopes <jabolopes@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>
---
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

Event Timeline