| Message ID | 20200825114041.16290-10-ian.jackson@eu.citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Miscellaneous cleanups | expand |
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));
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@eu.citrix.com> --- ts-debian-fixup | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)