Check in MountImage task if /etc/fstab is present

[snf-image] / snf-image-host / xen-common.sh

diff --git a/snf-image-host/xen-common.sh b/snf-image-host/xen-common.sh
index f9a3cc1..8c35f70 100644 (file)
--- a/snf-image-host/xen-common.sh
+++ b/snf-image-host/xen-common.sh
@@ -1,46 +1,86 @@
-snf_export_DEV=/dev/xvdb
-HELPER_KERNEL=${HELPER_KERNEL}-xen
-HELPER_INITRD=${HELPER_INITRD}-xen
-
-mk_snapshot() {
-
-    cp "$HELPER_IMG" "$snapshot"
+# Copyright (C) 2013 GRNET S.A.
+#
+# 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
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
 
+get_img_dev() {
+       echo /dev/xvdb
 }
 
 launch_helper() {
+    local name helperid rc blockdev floppy
+
+    blockdev="$1"
+    floppy="$2"
+
+    name="snf-image-helper-$instance-$RANDOM"
+
+    report_info "Starting customization VM..."
+    echo "$($DATE +%Y:%m:%d-%H:%M:%S.%N) VM START" >&2
 
-    helper_name=helper$$
     xm create /dev/null \
-      kernel="$HELPER_KERNEL" ramdisk="$HELPER_INITRD" \
-      extra="console=hvc0 hypervisor=$HYPERVISOR snf_image_activate_helper" \
-      disk="file:$snapshot,xvda,w" \
-      disk="phy:$blockdev,xvdb,w" \
-      disk="file:$floppy,xvdc1,w" \
-      vif="mac=aa:00:00:00:00:11,bridge=$XEN_BRIDGE" \
-      memory="256" root="/dev/xvda1 quiet ro boot=local" boot="c" vcpus=1 \
-      name="$helper_name"
-
-    if [ ! $(xenstore-exists helper) ]; then
-        xenstore-write helper ""
+      kernel="$HELPER_DIR/kernel" ramdisk="$HELPER_DIR/initrd" \
+      root="/dev/xvda1" memory="$HELPER_MEMORY" boot="c" vcpus=1 name="$name" \
+      extra="console=hvc0 hypervisor=$HYPERVISOR snf_image_activate_helper \
+         ipv6.disable=1 rules_dev=/dev/xvdc ro boot=local helper_ip=10.0.0.1 \
+          monitor_port=48888 init=/usr/bin/snf-image-helper" \
+      disk="file:$HELPER_DIR/image,xvda,r" disk="phy:$blockdev,xvdb,w" \
+      disk="file:$floppy,xvdc,r" vif="script=${XEN_SCRIPTS_DIR}/vif-snf-image"
+    add_cleanup suppress_errors xm destroy "$name"
+
+    if ! xenstore-exists snf-image-helper; then
+        xenstore-write snf-image-helper ""
+       #add_cleanup xenstore-rm snf-image-helper
     fi
-    helperid=$(xm domid $helper_name)
-    xenstore-write helper/$helperid ""
-    xenstore-chmod helper/$helperid r0 w$helperid
 
-    brctl delif xenbr vif$helperid.0
+    helperid=$(xm domid "$name")
+    xenstore-write snf-image-helper/${helperid} ""
+    add_cleanup xenstore-rm snf-image-helper/${helperid}
+    xenstore-chmod snf-image-helper/${helperid} r0 w${helperid}
 
-    socat EXEC:"./helper-monitor.py ${MONITOR_FD}" INTERFACE:vif$helperid.0 &
+    filter='udp and dst port 48888 and dst host 10.0.0.255 and src host 10.0.0.1'
+    $TIMEOUT -k $HELPER_HARD_TIMEOUT $HELPER_SOFT_TIMEOUT \
+      ./helper-monitor.py -i "vif${helperid}.0" -f "$filter" ${MONITOR_FD} &
+    monitor_pid=$!
 
+    set +e
     $TIMEOUT -k $HELPER_HARD_TIMEOUT $HELPER_SOFT_TIMEOUT \
-      socat EXEC:"xm console $helper_name",pty STDOUT \
-    | sed -u 's|^|HELPER: |g'
+      socat EXEC:"xm console $name",pty STDOUT | sed -u 's|^|HELPER: |g'
+    rc=$?
+    set -e
 
-}
+    echo "$($DATE +%Y:%m:%d-%H:%M:%S.%N) VM STOP" >&2
+
+    check_helper_rc "$rc"
 
-get_helper_result() {
+    set +e
+    wait "$monitor_pid"
+    monitor_rc=$?
+    set -e
 
-    result=$(xenstore-read helper/$helperid)
-    xenstore-rm helper/$helperid
+    if [ $monitor_rc -ne 0 ]; then
+       log_error "Helper VM monitoring failed"
+       report_error "Helper VM monitoring failed"
+       exit 1
+    fi
+
+    report_info "Checking customization status..."
+    result=$(xenstore-read snf-image-helper/$helperid)
+    report_info "Customization status is: $result"
 
+    check_helper_result "$result"
 }
+
+# vim: set sta sts=4 shiftwidth=4 sw=4 et ai :