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 33ff29a..8c35f70 100644 (file)
--- a/snf-image-host/xen-common.sh
+++ b/snf-image-host/xen-common.sh
@@ -1,35 +1,48 @@
+# 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
 }
 
-#create_mac() {
-#    # MAC address inside the range 00:16:3e:xx:xx:xx are reserved for Xen
-#    echo  "aa:$(cat /proc/interrupts | md5sum | sed -r 's/^(.{10}).*$/\1/; s/([0-9a-f]{2})/\1:/g; s/:$//;')"
-#}
-
 launch_helper() {
-    local name helperid rc blockdev floppy host_mac helper_mac
+    local name helperid rc blockdev floppy
 
     blockdev="$1"
     floppy="$2"
 
-       name=$(uuid)
+    name="snf-image-helper-$instance-$RANDOM"
 
     report_info "Starting customization VM..."
     echo "$($DATE +%Y:%m:%d-%H:%M:%S.%N) VM START" >&2
 
     xm create /dev/null \
-      kernel="$HELPER_DIR/kernel-xen" ramdisk="$HELPER_DIR/initrd-xen" \
-         root="/dev/xvda1" memory="256" boot="c" vcpus=1 name="$name" \
+      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 init=/usr/bin/snf-image-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
+       #add_cleanup xenstore-rm snf-image-helper
     fi
 
     helperid=$(xm domid "$name")
@@ -37,48 +50,37 @@ launch_helper() {
     add_cleanup xenstore-rm snf-image-helper/${helperid}
     xenstore-chmod snf-image-helper/${helperid} r0 w${helperid}
 
-    socat INTERFACE:vif${helperid}.0 EXEC:"./helper-monitor.py ${MONITOR_FD}" &
+    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 $name",pty STDOUT | sed -u 's|^|HELPER: |g'
-
     rc=$?
     set -e
 
     echo "$($DATE +%Y:%m:%d-%H:%M:%S.%N) VM STOP" >&2
-    if [ $rc -ne 0 ]; then
-        if [ $rc -eq 124 ];  then
-            log_error "Customization VM was terminated. Did not finish on time."
-            report_error "Image customization failed. Did not finish on time."
-        elif [ $rc -eq 137 ]; then # (128 + SIGKILL)
-            log_error "Customization VM was killed. Did not finish on time."
-            report_error "Image customization failed. Did not finish on time."
-        elif [ $rc -eq 141 ]; then # (128 + SIGPIPE)
-            log_error "Customization VM was terminated by a SIGPIPE."
-            log_error "Maybe progress monitor has died unexpectedly."
-        elif [ $rc -eq 125 ]; then
-            log_error "Internal Error. Image customization could not start."
-            log_error "timeout did not manage to run."
-        else
-            log_error "Customization VM died unexpectedly (return code $rc)."
-        fi
-        exit 1
-    else
-        report_info "Customization VM exited normally."
+
+    check_helper_rc "$rc"
+
+    set +e
+    wait "$monitor_pid"
+    monitor_rc=$?
+    set -e
+
+    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"
 
-    if [ "x$result" != "xSUCCESS" ]; then
-        log_error "Image customization failed."
-        report_error "Image customization failed."
-        exit 1
-    fi
+    check_helper_result "$result"
 }
 
 # vim: set sta sts=4 shiftwidth=4 sw=4 et ai :