[Pkg-ganeti-devel] [instance-debootstrap] 04/06: Drop patches, merged upstream

[Apollon Oikonomopoulos]

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

apoikos pushed a commit to branch master
in repository instance-debootstrap.

commit c591f277cc80bb4531e7d49c02d3a4e5647c8552
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Fri Oct 23 17:26:00 2015 +0300

    Drop patches, merged upstream
---
 ...se-sync-kpartx-mode-when-creating-devices.patch | 33 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 34 deletions(-)

diff --git a/debian/patches/0001-Use-sync-kpartx-mode-when-creating-devices.patch b/debian/patches/0001-Use-sync-kpartx-mode-when-creating-devices.patch
deleted file mode 100644
index 71b22fa..0000000
--- a/debian/patches/0001-Use-sync-kpartx-mode-when-creating-devices.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 5a8a67b7579d89488a9de4c2f44a15d61a5eee2b Mon Sep 17 00:00:00 2001
-From: Apollon Oikonomopoulos <apoikos at gmail.com>
-Date: Mon, 24 Mar 2014 22:28:15 +0200
-Subject: [PATCH] Use sync kpartx mode when creating devices
-
-Pass the -s (sync) flag to kpartx in map_disk0(). Without the -s flag,
-kpartx will return directly after signaling the device mapper to create
-the partition devices, however it is not guaranteed that the devices
-will have appeared in userspace by the time map_disk0 will look for
-them. With -s, kpartx will wait until the devices have been created.
-
-Signed-off-by: Apollon Oikonomopoulos <apoikos at gmail.com>
-Reviewed-by: Klaus Aehlig <aehlig at google.com>
----
- common.sh.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/common.sh.in b/common.sh.in
-index a35eadd..8d5bcc0 100644
---- a/common.sh.in
-+++ b/common.sh.in
-@@ -105,7 +105,7 @@ map_disk0() {
-     log_error "Cannot interpret kpartx output and get partition mapping"
-     exit 1
-   fi
--  kpartx -a -p- $blockdev > /dev/null
-+  kpartx -a -s -p- $blockdev > /dev/null
-   filesystem_dev="/dev/mapper/$filesystem_dev_base"
-   if [ ! -b "$filesystem_dev" ]; then
-     log_error "Can't find kpartx mapped partition: $filesystem_dev"
--- 
-2.0.0.rc2
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index efa4b4a..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Use-sync-kpartx-mode-when-creating-devices.patch

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