]> xenbits.xensource.com Git - people/iwj/osstest.git/commitdiff
Debian: Move FANCYTTY=0 setting from preseed_create to preseed_base
authorIan Campbell <ian.campbell@citrix.com>
Tue, 24 Nov 2015 15:47:09 +0000 (15:47 +0000)
committerIan Campbell <ian.campbell@citrix.com>
Wed, 25 Nov 2015 11:18:01 +0000 (11:18 +0000)
This makes the console logs of any HVM or debian-installer created
easier to parse by omitting the escape characters.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Osstest/Debian.pm

index 464f190eb5e465e7605a58e9f51cb4823cc0958d..76171c092d751b1e02f21c4701ae02d37105bc27 100644 (file)
@@ -807,6 +807,14 @@ in-target apt-get install -y sysvinit-core
 END
     }
 
+    preseed_hook_command($ho, 'late_command', $sfx, <<END);
+#!/bin/sh
+set -ex
+
+echo FANCYTTY=0 >> /target/etc/lsb-base-logging.sh
+END
+
+
     preseed_ssh($ho, $sfx);
 
     preseed_hook_command($ho, 'late_command', '', <<'END');
@@ -1056,13 +1064,6 @@ echo ===
 set +e
 ls -l /dev/sd*
 true
-END
-
-    preseed_hook_command($ho, 'late_command', $sfx, <<END);
-#!/bin/sh
-set -ex
-
-echo FANCYTTY=0 >> /target/etc/lsb-base-logging.sh
 END
 
     my $dtbs = "$d_i/dtbs.tar.gz";