[Pkg-ganeti-devel] [instance-debootstrap] 02/06: Imported Upstream version 0.15
Apollon Oikonomopoulos
apoikos at moszumanska.debian.org
Fri Oct 23 15:09:52 UTC 2015
This is an automated email from the git hooks/post-receive script.
apoikos pushed a commit to branch master
in repository instance-debootstrap.
commit 084dd90373b6e606a30cfbc46194984f9c7be460
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date: Fri Oct 23 17:25:49 2015 +0300
Imported Upstream version 0.15
---
common.sh.in | 4 ++--
configure | 20 ++++++++++----------
configure.ac | 2 +-
create | 3 ++-
export | 2 +-
import | 2 +-
rename | 2 +-
7 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/common.sh.in b/common.sh.in
index a35eadd..dd786af 100644
--- a/common.sh.in
+++ b/common.sh.in
@@ -99,13 +99,13 @@ EOF
map_disk0() {
blockdev="$1"
filesystem_dev_base=`kpartx -l -p- $blockdev | \
- grep -m 1 -- "-1.*$blockdev" | \
+ grep -m 1 -- "-1 : .*$blockdev" | \
awk '{print $1}'`
if [ -z "$filesystem_dev_base" ]; then
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"
diff --git a/configure b/configure
index f7966a1..5e8027b 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for ganeti-instance-debootstrap 0.14.
+# Generated by GNU Autoconf 2.67 for ganeti-instance-debootstrap 0.15.
#
# Report bugs to <ganeti at googlegroups.com>.
#
@@ -551,8 +551,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='ganeti-instance-debootstrap'
PACKAGE_TARNAME='ganeti-instance-debootstrap'
-PACKAGE_VERSION='0.14'
-PACKAGE_STRING='ganeti-instance-debootstrap 0.14'
+PACKAGE_VERSION='0.15'
+PACKAGE_STRING='ganeti-instance-debootstrap 0.15'
PACKAGE_BUGREPORT='ganeti at googlegroups.com'
PACKAGE_URL=''
@@ -1172,7 +1172,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures ganeti-instance-debootstrap 0.14 to adapt to many kinds of systems.
+\`configure' configures ganeti-instance-debootstrap 0.15 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1239,7 +1239,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ganeti-instance-debootstrap 0.14:";;
+ short | recursive ) echo "Configuration of ganeti-instance-debootstrap 0.15:";;
esac
cat <<\_ACEOF
@@ -1312,7 +1312,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-ganeti-instance-debootstrap configure 0.14
+ganeti-instance-debootstrap configure 0.15
generated by GNU Autoconf 2.67
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1329,7 +1329,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by ganeti-instance-debootstrap $as_me 0.14, which was
+It was created by ganeti-instance-debootstrap $as_me 0.15, which was
generated by GNU Autoconf 2.67. Invocation command line was
$ $0 $@
@@ -2147,7 +2147,7 @@ fi
# Define the identity of the package.
PACKAGE='ganeti-instance-debootstrap'
- VERSION='0.14'
+ VERSION='0.15'
cat >>confdefs.h <<_ACEOF
@@ -2841,7 +2841,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by ganeti-instance-debootstrap $as_me 0.14, which was
+This file was extended by ganeti-instance-debootstrap $as_me 0.15, which was
generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2894,7 +2894,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-ganeti-instance-debootstrap config.status 0.14
+ganeti-instance-debootstrap config.status 0.15
configured by $0, generated by GNU Autoconf 2.67,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index ee4dc8e..f9adade 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ(2.59)
-AC_INIT(ganeti-instance-debootstrap, 0.14, ganeti at googlegroups.com)
+AC_INIT(ganeti-instance-debootstrap, 0.15, ganeti at googlegroups.com)
AC_CONFIG_AUX_DIR(autotools)
AC_CONFIG_SRCDIR(configure)
diff --git a/create b/create
index c276b04..08a2cb3 100755
--- a/create
+++ b/create
@@ -36,8 +36,9 @@ 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")
+ CLEANUP+=("udevadm settle")
fi
DEVICE_SIZE=$(blockdev --getsize64 $blockdev)
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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/instance-debootstrap.git
More information about the Pkg-ganeti-devel
mailing list