Revision a1d894c5 host/common.sh.in

b/host/common.sh.in
105 105
}
106 106

  
107 107
get_api20_arguments() {
108
    get_api_10_arguments
109
    if [ -z "$OSP_IMG_ID"]; then
108
    get_api10_arguments
109
    if [ -z "$OSP_IMG_ID" ]; then
110 110
        log_error "Missing OS API Parameter: OSP_IMG_ID"
111 111
        exit 1
112 112
    fi
113
    if [ -z "$OSP_IMG_FORMAT"]; then
113
    if [ -z "$OSP_IMG_FORMAT" ]; then
114 114
        log_error "Missing OS API Parameter: OSP_IMG_FORMAT"
115 115
        exit 1
116 116
    fi
117
    if [ -z "$OSP_IMG_PASSWD"]; then
117
    if [ -z "$OSP_IMG_PASSWD" ]; then
118 118
        log_error "Missing OS API Parameter: OSP_IMG_PASSWD"
119 119
        exit 1
120 120
    fi
......
123 123
    IMG_FORMAT=$OSP_IMG_FORMAT
124 124
    IMG_PASSWD=$OSP_IMG_PASSWD
125 125
}
126
er
126

  
127 127
map_disk0() {
128 128
    blockdev="$1"
129
    filesystem_dev_base=`$KPARTX -l -p- $blockdev | \
129
    filesystem_dev_base=$($KPARTX -l -p- $blockdev | \
130 130
                            grep -m 1 -- "-1.*$blockdev" | \
131
                            $AWK '{print $1}'`
131
                            $AWK '{print $1}')
132 132
    if [ -z "$filesystem_dev_base" ]; then
133 133
        log_error "Cannot interpret kpartx output and get partition mapping"
134 134
        exit 1
......
165 165
create_floppy() {
166 166
    local img=$1
167 167

  
168
    local target=`mktemp -d` || exit 1
168
    local target=$(mktemp -d) || exit 1
169 169
    CLEANUP+=("rmdir $target")
170 170

  
171 171
    dd bs=512 count=2880 if=/dev/zero of=$img
172 172
    mkfs.ext2 -F $img > /dev/null
173 173
    mount $img $target -o loop
174
    sed \
175
         -e 's|@IMAGE_TYPE[@]|$(IMAGE_TYPE)|g' \
176
         -e 's|@PASSWORD[@]|$(IMG_PASSWD)|g' \
177
         -e 's|@HOSTNAME[@]|$(instance)|g' \
178
         -e 's|@SSH_KEY[@]|$(IMG_SSH_KEY)|g' \
179
         rules.template > $target/rules
180

  
174
    set|egrep ^snf_export_\\w+|sed -e 's/^snf_export_/GANETI_/' > $target/rules
181 175
    umount $target
182 176
}
183 177

  
......
198 192
    . "$DEFAULT_FILE"
199 193
fi
200 194

  
201
: ${ARCH:="x86_64}
195
: ${ARCH:="x86_64"}
202 196
: ${CUSTOMIZE_DIR:="@sysconfdir@/ganeti/snf-image/hooks"}
203 197
: ${VARIANTS_DIR:="@sysconfdir@/ganeti/snf-image/variants"}
204 198
: ${IMAGE_DIR:="@localstatedir@/lib/snf-image"}

Also available in: Unified diff