X-Git-Url: http://git.equinoxoli.org/?p=ext%2Finstance-debootstrap.git;a=blobdiff_plain;f=common.sh.in;h=a35eadddc811a93567802790ddd60e7b89b593ab;hp=130201fd8361d01c9284b747ecfe1afb8c1b7842;hb=HEAD;hpb=455c48a4cb1e95f24a89c18e6607bdaefddbc2a1

diff --git a/common.sh.in b/common.sh.in
index 130201f..a35eadd 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
@@ -17,6 +17,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301, USA.
 
+CLEANUP=( )
 
 log_error() {
   echo "$@" >&2
@@ -87,11 +88,11 @@ 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,*
+  sfdisk -H 64 -S 32 -u S --quiet --Linux "$1" <<EOF
+${PARTITION_ALIGNMENT},,L,*
 EOF
 }
 
@@ -127,6 +128,8 @@ cleanup() {
   fi
 }
 
+trap cleanup EXIT
+
 DEFAULT_FILE="@sysconfdir@/default/ganeti-instance-debootstrap"
 if [ -f "$DEFAULT_FILE" ]; then
     . "$DEFAULT_FILE"
@@ -139,33 +142,42 @@ fi
 # will use it, this declaration is to make sure the variable is set
 : ${MIRROR:=""}
 : ${PROXY:=""}
-: ${SUITE:="lenny"}
+: ${SUITE:="wheezy"}
 : ${ARCH:=""}
 : ${EXTRA_PKGS:=""}
-: ${CUSTOMIZE_DIR:="@sysconfdir@/ganeti/instance-debootstrap.d"}
+: ${COMPONENTS:=""}
+: ${CUSTOMIZE_DIR:="@sysconfdir@/ganeti/instance-debootstrap/hooks"}
 : ${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
   DEFAULT_PARTITION_STYLE="msdos"
 fi
 : ${PARTITION_STYLE:=$DEFAULT_PARTITION_STYLE} # disk partition style
+: ${OSP_FILESYSTEM:="ext4"}
 
 CACHE_DIR="@localstatedir@/cache/ganeti-instance-debootstrap"
 
 SCRIPT_NAME=$(basename $0)
 
-for dir in /lib/udev /sbin; do
-  if [ -f $dir/vol_id -a -x $dir/vol_id ]; then
-    VOL_ID=$dir/vol_id
-  fi
-done
+if [ -f /sbin/blkid -a -x /sbin/blkid ]; then
+  VOL_ID="/sbin/blkid -o value -s UUID"
+  VOL_TYPE="/sbin/blkid -o value -s TYPE"
+else
+  for dir in /lib/udev /sbin; do
+    if [ -f $dir/vol_id -a -x $dir/vol_id ]; then
+      VOL_ID="$dir/vol_id -u"
+      VOL_TYPE="$dir/vol_id -t"
+    fi
+  done
+fi
 
 if [ -z "$VOL_ID" ]; then
-    log_error "vol_id not found, please install udev"
-    exit 1
+  log_error "vol_id or blkid not found, please install udev or util-linux"
+  exit 1
 fi
 
 if [ -z "$OS_API_VERSION" -o "$OS_API_VERSION" = "5" ]; then
@@ -173,7 +185,8 @@ if [ -z "$OS_API_VERSION" -o "$OS_API_VERSION" = "5" ]; then
   GETOPT_RESULT=`getopt -o o:n:i:b:s: -n '$0' -- "$@"`
   if [ $? != 0 ] ; then log_error "Terminating..."; exit 1 ; fi
   get_api5_arguments $GETOPT_RESULT
-elif [ "$OS_API_VERSION" = "10" ]; then
+elif [ "$OS_API_VERSION" = "10" -o "$OS_API_VERSION" = "15" -o \
+       "$OS_API_VERSION" = "20" ]; then
   get_api10_arguments
 else
   log_error "Unknown OS API VERSION $OS_API_VERSION"
@@ -186,8 +199,8 @@ if [ -n "$OS_VARIANT" ]; then
     exit 1
   fi
   VARIANT_CONFIG="$VARIANTS_DIR/$OS_VARIANT.conf"
-  if [ -f "$VARIANTS_CONFIG" ]; then
-    . "$VARIANTS_CONFIG"
+  if [ -f "$VARIANT_CONFIG" ]; then
+    . "$VARIANT_CONFIG"
   else
     if grep -qxF "$OS_VARIANT" variants.list; then
       log_error "ERROR: instance-debootstrap configuration error"
@@ -202,4 +215,3 @@ if [ -n "$OS_VARIANT" ]; then
     exit 1
   fi
 fi
-