[Pkg-ganeti-devel] [instance-debootstrap] 01/02: Replace losetup -s with losetup --show

[Apollon Oikonomopoulos]

This is an automated email from the git hooks/post-receive script.

apoikos pushed a commit to annotated tag debian/0.14-2+deb8u1
in repository instance-debootstrap.

commit 2bd44f8b921900385854183203915f60289cb3ee
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Fri Dec 23 10:46:21 2016 +0200

    Replace losetup -s with losetup --show
    
    Backport upstream commit 913c6e42, which replaces all occurrences of
    `losetup -s' with `losetup --show'
    
    Closes: #834404
---
 .../0002-Replace-losetup-flag-s-with-show.patch    | 71 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 72 insertions(+)

diff --git a/debian/patches/0002-Replace-losetup-flag-s-with-show.patch b/debian/patches/0002-Replace-losetup-flag-s-with-show.patch
new file mode 100644
index 0000000..b2ceee8
--- /dev/null
+++ b/debian/patches/0002-Replace-losetup-flag-s-with-show.patch
@@ -0,0 +1,71 @@
+From 913c6e4222969470796729cf188bb79a78635d8a Mon Sep 17 00:00:00 2001
+From: "Jose A. Lopes" <jabolopes at google.com>
+Date: Fri, 24 Jan 2014 10:23:01 +0100
+Subject: [PATCH] Replace 'losetup' flag '-s' with '--show'
+
+This fixes issue 690.
+
+Signed-off-by: Jose A. Lopes <jabolopes at google.com>
+Reviewed-by: Klaus Aehlig <aehlig at google.com>
+---
+ 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
+ 
+-- 
+2.10.2
+
diff --git a/debian/patches/series b/debian/patches/series
index efa4b4a..10b8e75 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Use-sync-kpartx-mode-when-creating-devices.patch
+0002-Replace-losetup-flag-s-with-show.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/instance-debootstrap.git