proxmox-mirrors/pve-installer
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-installer synced 2025-04-29 02:45:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

low-level: avoid open-coding config reading, parsing and merging

Browse Source 
Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
This commit is contained in:
Christoph Heiss 2023-11-10 15:17:25 +01:00 committed by Thomas Lamprecht
parent c0517345f6
commit 04b0033cd9
1 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
proxmox-low-level-installer
View File

@ -53,6 +53,22 @@ sub usage {
exit($cmd ne 'help' ? 1 : 0); exit($cmd ne 'help' ? 1 : 0);
} }
sub read_and_merge_config {
my $config_raw;
while (my $line = <>) {
if ($line =~ /^\s*\{/) {
$config_raw = $line;
last;
}
}
my $config = eval { from_json($config_raw, { utf8 => 1 }) };
die "failed to parse config from stdin - $@\n" if $@;
Proxmox::Install::Config::merge($config);
log_info("got installation config: ". to_json(Proxmox::Install::Config::get(), { utf8 => 1, canonical => 1 }) ."\n");
}
my $cmd = shift; my $cmd = shift;
if (!$cmd || $cmd eq 'help' || !exists($commands->{$cmd})) { if (!$cmd || $cmd eq 'help' || !exists($commands->{$cmd})) {
usage($cmd // ''); usage($cmd // '');
@ -87,19 +103,7 @@ if ($cmd eq 'dump-env') {
file_write_all($run_env_file, $run_env_serialized); file_write_all($run_env_file, $run_env_serialized);
} elsif ($cmd eq 'start-session') { } elsif ($cmd eq 'start-session') {
Proxmox::UI::init_stdio({}, $env); Proxmox::UI::init_stdio({}, $env);
read_and_merge_config();
my $config_raw;
while (my $line = <>) {
if ($line =~ /^\s*\{/) {
$config_raw = $line;
last;
}
}
my $config = eval { from_json($config_raw, { utf8 => 1 }) };
die "failed to parse config from stdin - $@\n" if $@;
Proxmox::Install::Config::merge($config);
log_info("got installation config: ". to_json(Proxmox::Install::Config::get(), { utf8 => 1, canonical => 1 }) ."\n");
eval { Proxmox::Install::extract_data() }; eval { Proxmox::Install::extract_data() };
if (my $err = $@) { if (my $err = $@) {
@ -119,20 +123,7 @@ if ($cmd eq 'dump-env') {
} }
} elsif ($cmd eq 'start-session-test') { } elsif ($cmd eq 'start-session-test') {
Proxmox::UI::init_stdio({}, $env); Proxmox::UI::init_stdio({}, $env);
read_and_merge_config();
my $config_raw;
while (my $line = <>) {
if ($line =~ /^\s*\{/) {
$config_raw = $line;
last;
}
}
my $config = eval { from_json($config_raw, { utf8 => 1 }) };
die "failed to parse config from stdin - $@\n" if $@;
Proxmox::Install::Config::merge($config);
print STDERR "got config: ". to_json(Proxmox::Install::Config::get(), { utf8 => 1, canonical => 1 }) ."\n";
my $res = Proxmox::UI::prompt("Reply anything?") ? 'ok' : 'not ok'; my $res = Proxmox::UI::prompt("Reply anything?") ? 'ok' : 'not ok';
Proxmox::UI::message("Test Message - got $res"); Proxmox::UI::message("Test Message - got $res");