proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-15 03:58:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

check for ext5 dir to avoid missing directory errors

Browse Source 
As we, for now, default to exclude ext5 from our build it's better
to make an check if its directory exists, and only then allow to
load from it. Else we can get errors on proxy startup, and when
someone passes the ext5 parameter.

Also make a indent/whitespace cleanup.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2015-09-28 10:28:03 +02:00 committed by Dietmar Maurer
parent bd42715148
commit 2ebf4aecf9
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
PVE/Service/pveproxy.pm
View File

@ -40,6 +40,8 @@ my %daemon_options = (
my $daemon = __PACKAGE__->new('pveproxy', $cmdline, %daemon_options); my $daemon = __PACKAGE__->new('pveproxy', $cmdline, %daemon_options);
my $ext5_dir_exists;
sub add_dirs { sub add_dirs {
my ($result_hash, $alias, $subdir) = @_; my ($result_hash, $alias, $subdir) = @_;
@ -70,13 +72,19 @@ sub init {
my $family = PVE::Tools::get_host_address_family($self->{nodename}); my $family = PVE::Tools::get_host_address_family($self->{nodename});
my $socket = $self->create_reusable_socket(8006, undef, $family); my $socket = $self->create_reusable_socket(8006, undef, $family);
$ext5_dir_exists = (-d '/usr/share/pve-manager/ext5');
my $dirs = {}; my $dirs = {};
add_dirs($dirs, '/pve2/locale/', '/usr/share/pve-manager/locale/'); add_dirs($dirs, '/pve2/locale/', '/usr/share/pve-manager/locale/');
add_dirs($dirs, '/pve2/touch/', '/usr/share/pve-manager/touch/'); add_dirs($dirs, '/pve2/touch/', '/usr/share/pve-manager/touch/');
add_dirs($dirs, '/pve2/ext4/', '/usr/share/pve-manager/ext4/'); add_dirs($dirs, '/pve2/ext4/', '/usr/share/pve-manager/ext4/');
if ($ext5_dir_exists) { # only add ext5 dirs if it was build
add_dirs($dirs, '/pve2/ext5/', '/usr/share/pve-manager/ext5/'); add_dirs($dirs, '/pve2/ext5/', '/usr/share/pve-manager/ext5/');
add_dirs($dirs, '/pve2/manager5/', '/usr/share/pve-manager/manager5/'); add_dirs($dirs, '/pve2/manager5/', '/usr/share/pve-manager/manager5/');
}
add_dirs($dirs, '/pve2/images/' => '/usr/share/pve-manager/images/'); add_dirs($dirs, '/pve2/images/' => '/usr/share/pve-manager/images/');
add_dirs($dirs, '/pve2/css/' => '/usr/share/pve-manager/css/'); add_dirs($dirs, '/pve2/css/' => '/usr/share/pve-manager/css/');
add_dirs($dirs, '/pve2/js/' => '/usr/share/pve-manager/js/'); add_dirs($dirs, '/pve2/js/' => '/usr/share/pve-manager/js/');
@ -194,7 +202,7 @@ sub get_index {
$page = PVE::NoVncIndex::get_index($lang, $username, $token, $args->{console}); $page = PVE::NoVncIndex::get_index($lang, $username, $token, $args->{console});
} elsif ($mobile) { } elsif ($mobile) {
$page = PVE::TouchIndex::get_index($lang, $username, $token, $args->{console}); $page = PVE::TouchIndex::get_index($lang, $username, $token, $args->{console});
} elsif ($ext5) { } elsif ($ext5 && $ext5_dir_exists) {
$page = PVE::ExtJSIndex5::get_index($lang, $username, $token, $args->{console}); $page = PVE::ExtJSIndex5::get_index($lang, $username, $token, $args->{console});
} else { } else {
$page = PVE::ExtJSIndex::get_index($lang, $username, $token, $args->{console}); $page = PVE::ExtJSIndex::get_index($lang, $username, $token, $args->{console});