From: Wei Liu <wei.liu2@citrix.com>
Date: Fri, 13 Oct 2017 12:14:16 +0000 (+0100)
Subject: ts-debian-fixup: append noresume
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=5b64dbc9521dabee0341d4f872cd7af7c99bf6a0;p=people%2Fiwj%2Fosstest.git

ts-debian-fixup: append noresume

See code comment for explanation.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---

diff --git a/ts-debian-fixup b/ts-debian-fixup
index 478dc2af..a07d57c2 100755
--- a/ts-debian-fixup
+++ b/ts-debian-fixup
@@ -178,6 +178,16 @@ sub otherfixupcfg () {
         $extra .= " iommu=soft";
     }
 
+    # There might be stale entries in /etc/initramfs-tools/conf.d/resume which
+    # get stored in the initramfs. That introduces delay in guest booting which
+    # might cause tests to fail.
+    #
+    # This is particularly prominent in stretch when it tries to scan for the
+    # inexistent device(s) for a long time. See also Debian bug #784810.
+    #
+    # Append noresume to fix the issue.
+    $extra .= " noresume";
+
     if ($cfg =~ m/extra\s*=\s*['"](.*)['"]/) {
 	$cfg =~ s/extra\s*=\s*['"](.*)['"]/extra = '$1 $extra'/;
     } else {