rename Proxmox::Install::Setup to Proxmox::Install::Env

slightly better fit

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/Proxmox/Install/Env.pm b/Proxmox/Install/Env.pm
new file mode 100644 (file)
index 0000000..42e8213
--- /dev/null
+++ b/Proxmox/Install/Env.pm
@@ -0,0 +1,72 @@
+package Proxmox::Install::Env;
+
+use strict;
+use warnings;
+
+use base qw(Exporter);
+our @EXPORT = qw(is_test_mode);
+
+my $product_cfg = {
+    pve => {
+       fullname => 'Proxmox VE',
+       port => '8006',
+       enable_btrfs => 1,
+       bridged_network => 1,
+    },
+    pmg => {
+       fullname => 'Proxmox Mail Gateway',
+       port => '8006',
+       enable_btrfs => 0,
+       bridged_network => 0,
+    },
+    pbs => {
+       fullname => 'Proxmox Backup Server',
+       port => '8007',
+       enable_btrfs => 0,
+       bridged_network => 0,
+    },
+};
+
+sub setup {
+    my $cd_info = get_cd_info();
+    my $product = $cd_info->{product};
+
+    my $setup_info = $product_cfg->{$product};
+    die "unknown product '$product'\n" if !$setup_info;
+
+    $setup_info->{product} = $product;
+
+    return ($setup_info, $cd_info);
+}
+
+sub get_cd_info {
+    my $info_fn = '/.cd-info'; # default place in the ISO environment
+    if (!-f $info_fn && -f "cd-info.test") {
+       $info_fn = "cd-info.test"; # use from CWD for test mode
+    }
+
+    open(my $fh, '<', $info_fn) or die "Could not open CD info file '$info_fn' $!";
+
+    my $cd_info = {};
+    while (my $line = <$fh>) {
+       chomp $line;
+       if ($line =~ /^(\S+)=['"]?(.+?)['"]?$/) { # we control cd-info content, so good enough.
+           $cd_info->{lc($1)} = $2;
+       }
+    }
+    close ($fh);
+
+    die "CD-info is missing required key 'product'!\n" if !defined $cd_info->{product};
+
+    return $cd_info;
+}
+
+my $test_mode;
+sub enable_test_mode {
+    $test_mode = 1;
+}
+sub is_test_mode {
+    return !!$test_mode;
+}
+
+1;

diff --git a/Proxmox/Install/Setup.pm b/Proxmox/Install/Setup.pm
deleted file mode 100644 (file)
index c1118cf..0000000
--- a/Proxmox/Install/Setup.pm
+++ /dev/null
@@ -1,72 +0,0 @@
-package Proxmox::Install::Setup;
-
-use strict;
-use warnings;
-
-use base qw(Exporter);
-our @EXPORT = qw(is_test_mode);
-
-my $product_cfg = {
-    pve => {
-       fullname => 'Proxmox VE',
-       port => '8006',
-       enable_btrfs => 1,
-       bridged_network => 1,
-    },
-    pmg => {
-       fullname => 'Proxmox Mail Gateway',
-       port => '8006',
-       enable_btrfs => 0,
-       bridged_network => 0,
-    },
-    pbs => {
-       fullname => 'Proxmox Backup Server',
-       port => '8007',
-       enable_btrfs => 0,
-       bridged_network => 0,
-    },
-};
-
-sub setup {
-    my $cd_info = get_cd_info();
-    my $product = $cd_info->{product};
-
-    my $setup_info = $product_cfg->{$product};
-    die "unknown product '$product'\n" if !$setup_info;
-
-    $setup_info->{product} = $product;
-
-    return ($setup_info, $cd_info);
-}
-
-sub get_cd_info {
-    my $info_fn = '/.cd-info'; # default place in the ISO environment
-    if (!-f $info_fn && -f "cd-info.test") {
-       $info_fn = "cd-info.test"; # use from CWD for test mode
-    }
-
-    open(my $fh, '<', $info_fn) or die "Could not open CD info file '$info_fn' $!";
-
-    my $cd_info = {};
-    while (my $line = <$fh>) {
-       chomp $line;
-       if ($line =~ /^(\S+)=['"]?(.+?)['"]?$/) { # we control cd-info content, so good enough.
-           $cd_info->{lc($1)} = $2;
-       }
-    }
-    close ($fh);
-
-    die "CD-info is missing required key 'product'!\n" if !defined $cd_info->{product};
-
-    return $cd_info;
-}
-
-my $test_mode;
-sub enable_test_mode {
-    $test_mode = 1;
-}
-sub is_test_mode {
-    return !!$test_mode;
-}
-
-1;

diff --git a/Proxmox/Makefile b/Proxmox/Makefile
index fa80a0349de62f1e7466dfbfd65cc8dba0f75e5f..4c87a9ba6221dc7dd71eac2e84b51f7ce9e3f444 100644 (file)
--- a/Proxmox/Makefile
+++ b/Proxmox/Makefile
@@ -6,7 +6,7 @@ PERL5DIR=$(DESTDIR)/usr/share/perl5/Proxmox
 
 #PERL_MODULES=$(shell git ls-files . | grep '.pm$')
 PERL_MODULES=\
-    Install/Setup.pm \
+    Install/Env.pm \
     Log.pm \
     Sys/Command.pm \
     Sys/File.pm \

diff --git a/Proxmox/Sys/Command.pm b/Proxmox/Sys/Command.pm
index c48827d728eba1cab158170ebf69133b40154326..48b3db4b464fe918f0642170c557320510d7d95c 100644 (file)
--- a/Proxmox/Sys/Command.pm
+++ b/Proxmox/Sys/Command.pm
@@ -9,7 +9,7 @@ use IPC::Open3;
 use IO::Select;
 use String::ShellQuote;
 
-use Proxmox::Install::Setup;
+use Proxmox::Install::Env;
 use Proxmox::Log;
 
 use base qw(Exporter);

diff --git a/proxinstall b/proxinstall
index 39d167c90b6cd44ce1885a7aaa8af5285b8a7224..d8faa347f9c6e0fc243aa94a92b07046a1c17e42 100755 (executable)
--- a/proxinstall
+++ b/proxinstall
@@ -19,7 +19,7 @@ use File::Path;
 use Time::HiRes;
 use POSIX ":sys_wait_h";
 
-use Proxmox::Install::Setup;
+use Proxmox::Install::Env;
 use Proxmox::Log;
 use Proxmox::Sys::Command qw(run_command syscmd);
 use Proxmox::Sys::File qw(file_read_firstline file_read_all file_write_all);
@@ -34,11 +34,11 @@ GetOptions(
     'test-image|t=s' => \$test_image
 ) or die "usage error\n";
 
-Proxmox::Install::Setup::enable_test_mode() if $test_image;
+Proxmox::Install::Env::enable_test_mode() if $test_image;
 
 $ENV{'LVM_SUPPRESS_FD_WARNINGS'} = '1';
 
-my ($setup, $cd_info) = Proxmox::Install::Setup::setup();
+my ($setup, $cd_info) = Proxmox::Install::Env::setup();
 
 my $zfstestpool = "test_rpool";
 my $zfspoolname = is_test_mode() ? $zfstestpool : 'rpool';