[Pkg-ganeti-devel] [SCM] Instance debootstrap packaging branch, upstream, updated. upstream/0.9-2-g9416139

[Iustin Pop]

The following commit has been merged in the upstream branch:
commit f0cf4793626a9652aa28ec772b63ea1f5160288a
Author: Iustin Pop <iustin at debian.org>
Date:   Wed May 9 03:25:25 2012 +0200

    Imported Upstream version 0.10

diff --git a/NEWS b/NEWS
index e78e76f..9284be9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+Version 0.10
+------------
+
+This add supports for ext4 file-systems and changes the default
+distribution from Lenny to Squeeze.
+
+Additionally, new hooks were added:
+
+- setting the password for the root user
+- setting the timezone
+- setting SSH keys for a given user
+
 Version 0.9
 -----------
 
diff --git a/common.sh.in b/common.sh.in
index a72fc9f..7ce75a5 100644
--- a/common.sh.in
+++ b/common.sh.in
@@ -1,6 +1,6 @@
 #
 
-# Copyright (C) 2007, 2008, 2009 Google Inc.
+# Copyright (C) 2007, 2008, 2009, 2012 Google Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -88,8 +88,8 @@ get_api10_arguments() {
 
 format_disk0() {
   # Create one big partition, and make it bootable
-  # some versions of sfdisk need manual specification of 
-  # head/sectors for devices such as drbd which don't 
+  # some versions of sfdisk need manual specification of
+  # head/sectors for devices such as drbd which don't
   # report geometry
   sfdisk -H 255 -S 63 --quiet --Linux "$1" <<EOF
 0,,L,*
@@ -142,7 +142,7 @@ fi
 # will use it, this declaration is to make sure the variable is set
 : ${MIRROR:=""}
 : ${PROXY:=""}
-: ${SUITE:="lenny"}
+: ${SUITE:="squeeze"}
 : ${ARCH:=""}
 : ${EXTRA_PKGS:=""}
 : ${CUSTOMIZE_DIR:="@sysconfdir@/ganeti/instance-debootstrap/hooks"}
@@ -211,4 +211,3 @@ if [ -n "$OS_VARIANT" ]; then
     exit 1
   fi
 fi
-
diff --git a/configure b/configure
index 75d75fe..f0ee45e 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.65 for ganeti-instance-debootstrap 0.9.
+# Generated by GNU Autoconf 2.65 for ganeti-instance-debootstrap 0.10.
 #
 # 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.9'
-PACKAGE_STRING='ganeti-instance-debootstrap 0.9'
+PACKAGE_VERSION='0.10'
+PACKAGE_STRING='ganeti-instance-debootstrap 0.10'
 PACKAGE_BUGREPORT='ganeti at googlegroups.com'
 PACKAGE_URL=''
 
@@ -1171,7 +1171,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.9 to adapt to many kinds of systems.
+\`configure' configures ganeti-instance-debootstrap 0.10 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1238,7 +1238,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ganeti-instance-debootstrap 0.9:";;
+     short | recursive ) echo "Configuration of ganeti-instance-debootstrap 0.10:";;
    esac
   cat <<\_ACEOF
 
@@ -1311,7 +1311,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ganeti-instance-debootstrap configure 0.9
+ganeti-instance-debootstrap configure 0.10
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -1328,7 +1328,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.9, which was
+It was created by ganeti-instance-debootstrap $as_me 0.10, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -2139,7 +2139,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='ganeti-instance-debootstrap'
- VERSION='0.9'
+ VERSION='0.10'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2832,7 +2832,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.9, which was
+This file was extended by ganeti-instance-debootstrap $as_me 0.10, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -2885,7 +2885,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.9
+ganeti-instance-debootstrap config.status 0.10
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 3f1adc1..796adce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT(ganeti-instance-debootstrap, 0.9, ganeti at googlegroups.com)
+AC_INIT(ganeti-instance-debootstrap, 0.10, ganeti at googlegroups.com)
 
 AC_CONFIG_AUX_DIR(autotools)
 AC_CONFIG_SRCDIR(configure)
diff --git a/export b/export
index fccf4b0..d0afa68 100755
--- a/export
+++ b/export
@@ -41,7 +41,7 @@ fi
 
 vol_type=$($VOL_TYPE $filesystem_dev)
 
-if [ "$vol_type" = "ext3" -o "$vol_type" = "ext2" ]; then
+if [ "${vol_type:0:3}" = "ext" ]; then
   dump -0 -q -f - "$filesystem_dev"
 fi
 

-- 
Instance debootstrap packaging