Revision 8d0132dc

b/Makefile.am
1 1
osname=$(subst ganeti-instance-,,$(PACKAGE))
2 2

  
3 3
osdir=$(OS_DIR)/$(osname)
4
variantsdir="$(DESTDIR)${sysconfdir}/ganeti/instance-debootstrap/variants"
4
variantsdir="$(DESTDIR)${sysconfdir}/ganeti/instance-image/variants"
5 5

  
6 6
dist_os_SCRIPTS = create import export rename
7 7
dist_os_DATA = ganeti_api_version variants.list
b/common.sh.in
17 17
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
18 18
# 02110-1301, USA.
19 19

  
20
AWK="@AWK@"
21
DUMP="@DUMP@"
22
LOSETUP="@LOSETUP@"
23
KPARTX="@KPARTX@"
24
SFDISK="@SFDISK@"
25
MKDIR_P="@MKDIR_P@"
26

  
20 27
CLEANUP=( )
21 28

  
22 29
log_error() {
......
91 98
  # some versions of sfdisk need manual specification of 
92 99
  # head/sectors for devices such as drbd which don't 
93 100
  # report geometry
94
  sfdisk -H 255 -S 63 --quiet --Linux "$1" <<EOF
101
  $SFDISK -H 255 -S 63 --quiet --Linux "$1" <<EOF
95 102
0,,L,*
96 103
EOF
97 104
}
98 105

  
99 106
map_disk0() {
100 107
  blockdev="$1"
101
  filesystem_dev_base=`kpartx -l -p- $blockdev | \
108
  filesystem_dev_base=`$KPARTX -l -p- $blockdev | \
102 109
                       grep -m 1 -- "-1.*$blockdev" | \
103
                       awk '{print $1}'`
110
                       $AWK '{print $1}'`
104 111
  if [ -z "$filesystem_dev_base" ]; then
105 112
    log_error "Cannot interpret kpartx output and get partition mapping"
106 113
    exit 1
107 114
  fi
108
  kpartx -a -p- $blockdev > /dev/null
115
  $KPARTX -a -p- $blockdev > /dev/null
109 116
  filesystem_dev="/dev/mapper/$filesystem_dev_base"
110 117
  if [ ! -b "$filesystem_dev" ]; then
111 118
    log_error "Can't find kpartx mapped partition: $filesystem_dev"
......
115 122
}
116 123

  
117 124
unmap_disk0() {
118
  kpartx -d -p- $1
125
  $KPARTX -d -p- $1
119 126
}
120 127

  
121 128
cleanup() {
b/configure.ac
1 1
AC_PREREQ(2.59)
2
AC_INIT(ganeti-instance-debootstrap, 0.7, ganeti@googlegroups.com)
2
AC_INIT(ganeti-instance-image, 0.1, lance@osuosl.org)
3 3

  
4 4
AC_CONFIG_AUX_DIR(autotools)
5 5
AC_CONFIG_SRCDIR(configure)
......
19 19
# Check common programs
20 20
AC_PROG_INSTALL
21 21
AC_PROG_LN_S
22
AC_PROG_AWK
23
AC_PROG_MKDIR_P
22 24

  
23
AC_CONFIG_FILES([ Makefile ])
25
AC_PATH_PROG(DUMP, [dump])
26
if test -z "$DUMP" ; then
27
  AC_MSG_ERROR([dump not found in $PATH])
28
fi
29

  
30
AC_PATH_PROG(LOSETUP, [losetup])
31
if test -z "$LOSETUP" ; then
32
  AC_MSG_ERROR([losetup not found in $PATH])
33
fi
34

  
35
AC_PATH_PROG(KPARTX, [kpartx])
36
if test -z "$KPARTX" ; then
37
  AC_MSG_ERROR([kpartx not found in $PATH])
38
fi
39

  
40
AC_PATH_PROG(SFDISK, [sfdisk])
41
if test -z "$SFDISK" ; then
42
  AC_MSG_ERROR([sfdisk not found in $PATH])
43
fi
44

  
45
AC_CONFIG_FILES([
46
    Makefile
47
    common.sh
48
])
24 49

  
25 50
AC_OUTPUT
b/create
22 22
. common.sh
23 23

  
24 24
if [ "$GENERATE_CACHE" = "yes" -a ! -d "$CACHE_DIR" ]; then
25
  mkdir -p "$CACHE_DIR"
25
  $MKDIR "$CACHE_DIR"
26 26
fi
27 27

  
28 28
DPKG_ARCH=${ARCH:-`dpkg --print-architecture`}
......
32 32
# This is needed for file disks.
33 33
if [ ! -b $blockdev ]; then
34 34
  ORIGINAL_BLOCKDEV=$blockdev
35
  blockdev=$(losetup -sf $blockdev)
36
  CLEANUP+=("losetup -d $blockdev")
35
  blockdev=$($LOSETUP -sf $blockdev)
36
  CLEANUP+=("$LOSETUP -d $blockdev")
37 37
fi
38 38

  
39 39
if [ "$PARTITION_STYLE" = "none" ]; then
b/export
25 25
# This is needed for file disks.
26 26
if [ ! -b $blockdev ]; then
27 27
  ORIGINAL_BLOCKDEV=$blockdev
28
  blockdev=$(losetup -sf $blockdev)
29
  CLEANUP+=("losetup -d $blockdev")
28
  blockdev=$($LOSETUP -sf $blockdev)
29
  CLEANUP+=("$LOSETUP -d $blockdev")
30 30
fi
31 31

  
32 32
if [ "$PARTITION_STYLE" = "none" ]; then
......
42 42
vol_type=$($VOL_TYPE $filesystem_dev)
43 43

  
44 44
if [ "$vol_type" = "ext3" -o "$vol_type" = "ext2" ]; then
45
  dump -0 -q -f - "$filesystem_dev"
45
  $DUMP -0 -q -f - "$filesystem_dev"
46 46
fi
47 47

  
48 48
# execute cleanups
b/import
25 25
# This is needed for file disks.
26 26
if [ ! -b $blockdev ]; then
27 27
  ORIGINAL_BLOCKDEV=$blockdev
28
  blockdev=$(losetup -sf $blockdev)
29
  CLEANUP+=("losetup -d $blockdev")
28
  blockdev=$($LOSETUP -sf $blockdev)
29
  CLEANUP+=("$LOSETUP -d $blockdev")
30 30
fi
31 31

  
32 32
if [ "$PARTITION_STYLE" = "none" ]; then
b/rename
28 28
# This is needed for file disks.
29 29
if [ ! -b $blockdev ]; then
30 30
  ORIGINAL_BLOCKDEV=$blockdev
31
  blockdev=$(losetup -sf $blockdev)
32
  CLEANUP+=("losetup -d $blockdev")
31
  blockdev=$($LOSETUP -sf $blockdev)
32
  CLEANUP+=("$LOSETUP -d $blockdev")
33 33
fi
34 34

  
35 35
if [ "$PARTITION_STYLE" = "none" ]; then

Also available in: Unified diff