[Pkg-ganeti-devel] [SCM] Instance debootstrap packaging branch, master, updated. debian/0.9-3-8-g9221ec8
Iustin Pop
iustin at debian.org
Wed May 9 20:19:35 UTC 2012
The following commit has been merged in the master branch:
commit 4b6fbe36672d95e950a066cbdc20cfbd4e5e7eea
Author: Iustin Pop <iustin at debian.org>
Date: Wed May 9 21:04:07 2012 +0200
Imported Upstream version 0.11
diff --git a/NEWS b/NEWS
index 9284be9..316e3e3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,21 @@
+Version 0.11
+------------
+
+The partition alignment offset is now configurable (using the
+PARTITION_ALIGNMENT configuration setting, in sectors) and the
+distribution names and packages in the defaults file have been updated.
+
+Furthermore, the grub example hook has been improved a bit:
+
+- automatically uses the defined proxy, so that package installation
+ uses the same method as the main install
+- debconf frontend set to non-interactive, to prevent an debconf
+ question loop
+
+However, there still seem to be issues related to this hook (recent grub
+versions fail to run correctly "grub-install" or "update-grub" and
+complain about device mappings); help is welcome.
+
Version 0.10
------------
@@ -88,7 +106,7 @@ Note that the cache file is no longer stored in the same directory as
the OS definition files, but (again depending on ./configure options)
usually under /var/cache/ganeti-instance-debootstrap.
-There are many other customuizable settings added in this version, for
+There are many other customizable settings added in this version, for
example the actual OS to be installed (no longer always installing
Debian Etch), whether to use a proxy or not, etc. See the README and the
'defaults' files.
diff --git a/common.sh.in b/common.sh.in
index 7ce75a5..04d339f 100644
--- a/common.sh.in
+++ b/common.sh.in
@@ -91,8 +91,8 @@ format_disk0() {
# 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,*
+ sfdisk -H 64 -S 32 -u S --quiet --Linux "$1" <<EOF
+${PARTITION_ALIGNMENT},,L,*
EOF
}
@@ -149,6 +149,7 @@ fi
: ${VARIANTS_DIR:="@sysconfdir@/ganeti/instance-debootstrap/variants"}
: ${GENERATE_CACHE:="yes"}
: ${CLEAN_CACHE:="14"} # number of days to keep a cache file
+: ${PARTITION_ALIGNMENT:=2048} # sectors to align partition (1Mib default)
if [ -z "$OS_API_VERSION" -o "$OS_API_VERSION" = "5" ]; then
DEFAULT_PARTITION_STYLE="none"
else
diff --git a/configure b/configure
index f0ee45e..56e9cb1 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.10.
+# Generated by GNU Autoconf 2.65 for ganeti-instance-debootstrap 0.11.
#
# 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.10'
-PACKAGE_STRING='ganeti-instance-debootstrap 0.10'
+PACKAGE_VERSION='0.11'
+PACKAGE_STRING='ganeti-instance-debootstrap 0.11'
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.10 to adapt to many kinds of systems.
+\`configure' configures ganeti-instance-debootstrap 0.11 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.10:";;
+ short | recursive ) echo "Configuration of ganeti-instance-debootstrap 0.11:";;
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.10
+ganeti-instance-debootstrap configure 0.11
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.10, which was
+It was created by ganeti-instance-debootstrap $as_me 0.11, 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.10'
+ VERSION='0.11'
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.10, which was
+This file was extended by ganeti-instance-debootstrap $as_me 0.11, 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.10
+ganeti-instance-debootstrap config.status 0.11
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 796adce..19748a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ(2.59)
-AC_INIT(ganeti-instance-debootstrap, 0.10, ganeti at googlegroups.com)
+AC_INIT(ganeti-instance-debootstrap, 0.11, ganeti at googlegroups.com)
AC_CONFIG_AUX_DIR(autotools)
AC_CONFIG_SRCDIR(configure)
diff --git a/create b/create
index 1f3c0bd..072905c 100755
--- a/create
+++ b/create
@@ -1,6 +1,6 @@
#!/bin/bash
-# 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
@@ -75,6 +75,7 @@ if [ -f "$CACHE_FILE" ]; then
else
if [ "$PROXY" ]; then
export http_proxy="$PROXY"
+ export https_proxy="$PROXY"
fi
# INCLUDE will be empty if EXTRA_PKGS is null/empty, otherwise we
# build the full parameter format from it
diff --git a/defaults b/defaults
index 72d41ac..19df420 100644
--- a/defaults
+++ b/defaults
@@ -4,10 +4,12 @@
# on the next instance, customize this file before the instance
# installation
-# PROXY: if non-null, use this as an http-proxy in order to speed up
-# non-cached installs; not that if not set, debootstrap might still
-# use a system-wide proxy setting if it is exported in the
-# ganeti-noded daemon environment
+# PROXY: if non-null, use this as an http(s)-proxy in order to speed
+# up non-cached installs or provide internet access if not directly
+# possible; not that if not set, debootstrap might still use a
+# system-wide proxy setting if it is exported in the ganeti-noded
+# daemon environment (but the node daemon environment is cleaned up
+# and not exported starting with Ganeti 2.5)
# PROXY="http://proxy.example.com:3128/"
# MIRROR: do not customize MIRROR if you want to be able to install
@@ -22,18 +24,20 @@
# SUITE: change suite to any of the ones supported by deboostrap; this
# could be unstable, etch, etc.:
-# SUITE="lenny"
+# SUITE="wheezy"
# EXTRA_PKGS: depending on the suite and architecture you are using, different
# extra packages are needed for different hypervisors. For example:
#
-# Xen, for etch/lenny i386:
+# Xen, for squeeze i386:
# EXTRA_PKGS="linux-image-xen-686,libc6-xen"
-# Xen, for etch/lenny amd64:
+# Xen, for wheezy i386:
+# EXTRA_PKGS="libc6-xen"
+# Xen, for squeeze amd64:
# EXTRA_PKGS="linux-image-xen-amd64"
-# KVM, for lenny i386:
+# KVM, for squeeze/wheezy i386:
# EXTRA_PKGS="acpi-support-base,console-tools,udev,linux-image-686"
-# KVM, for lenny amd64:
+# KVM, for squeeze/wheezy amd64:
# EXTRA_PKGS="acpi-support-base,console-tools,udev,linux-image-amd64"
#
@@ -61,3 +65,10 @@ CLEAN_CACHE="14"
# The default is "msdos" from ganeti 2.0 onwards, but none if installing under
# Ganeti 1.2 (os api version 5)
# PARTITION_STYLE="none"
+
+# PARTITION_ALIGNMENT: the alignment of the partitions in sectors
+# (512B); this defaults to 1MiB to give grub enough space for
+# embedding and for better alignment with modern media (HDDs and
+# SSDs), feel free to increase it if your media has even bigger
+# allocation blocks
+# PARTITION_ALIGNMENT=2048
diff --git a/examples/hooks/grub b/examples/hooks/grub
index c93dcf5..c242df5 100755
--- a/examples/hooks/grub
+++ b/examples/hooks/grub
@@ -1,17 +1,11 @@
#!/bin/bash
#
# This is an example script that install and configure grub after installation.
-# To use it put it in your CUSTOMIZE_DIR, make it executable, and edit EXTRAPKGS
-# of your $sysconfdir/default/ganeti-instance-debootstrap.
+# To use it put it in your CUSTOMIZE_DIR and make it executable.
#
-# Xen, for etch/lenny i386:
-# EXTRA_PKGS="linux-image-xen-686,libc6-xen"
-# Xen, for etch/lenny amd64:
-# EXTRA_PKGS="linux-image-xen-amd64"
-# KVM:
-# no extra packages needed besides the normal suggested ones
-#
-# Do not include grub in EXTRA_PKGS because it will cause error of debootstrap.
+# Do not include grub in EXTRA_PKGS of
+# $sysconfdir/default/ganeti-instance-debootstrap because it will
+# cause error of debootstrap.
set -e
@@ -27,7 +21,12 @@ if [ -z "$TARGET" -o ! -d "$TARGET" ]; then
fi
# install grub
-LANG=C
+export LANG=C
+if [ "$PROXY" ]; then
+ export http_proxy="$PROXY"
+ export https_proxy="$PROXY"
+fi
+export DEBIAN_FRONTEND=noninteractive
chroot "$TARGET" apt-get -y --force-yes install grub grub-common
# make /dev/sda
--
Instance debootstrap packaging
More information about the Pkg-ganeti-devel
mailing list