[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[OSSTEST PATCH 09/12] target setup refactoring: Move target_kernkind_console_inittab


  • To: <xen-devel@xxxxxxxxxxxxxxxxxxxx>
  • From: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
  • Date: Tue, 25 Aug 2020 12:40:38 +0100
  • Authentication-results: esa6.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none
  • Cc: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
  • Delivery-date: Tue, 25 Aug 2020 11:40:54 +0000
  • Ironport-sdr: rx2bRs+MM7BNmbNgKWlkOJxBxXgnnJmWDW28qwxANextgJ+PnUu9uCJUhTsP6am/sRAFJBW53a 0larcz3rlf9tJ50uo3ivYUlhD4CG3D7rTWXWqEEYohiiNqAw1EWTikCD8pHKtZZQQZ6gNDQiDM rUYfsZ3QprTV8fDNWKS/tqfIhAyJbkUbw7zoncxk7+3FqoA15uWeWrhG4FYnJ32QuDQGQUVOpR JfknKoyGD9an7DeYoOKGTSxN12C809Se0WlvR4AuCJcbWbiD6nvrDXZhQTSvZKrWg1HxJRf2XM y9U=
  • List-id: Xen developer discussion <xen-devel.lists.xenproject.org>

We move this earlier.  This is OK because it depends only on the
console runvar (inside the sub; this is set by target_kernkind_check),
$ho and $gho (which are set by this point); and $mountpoint$ (which is
set by access().

No functional change.

Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 ts-debian-fixup | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ts-debian-fixup b/ts-debian-fixup
index 34051137..2184212b 100755
--- a/ts-debian-fixup
+++ b/ts-debian-fixup
@@ -79,10 +79,9 @@ END
 }
 
 our $extra;
+our $console;
 
 sub console () {
-    my $console=
-        target_kernkind_console_inittab($ho,$gho,"$mountpoint");
     return unless length $console;
     
     my $xextra= "console=$console earlyprintk=xen";
@@ -211,6 +210,7 @@ savecfg();
 ether();
 access();
 target_kernkind_check($gho);
+$console = target_kernkind_console_inittab($ho,$gho,"$mountpoint");
 
 debian_overlays($ho, \&overlay);
 target_cmd_root($ho, <<END.debian_overlays_fixup_cmd($ho, $mountpoint));
-- 
2.20.1




 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.