Skip to content

Commit

Permalink
Merge pull request #37 from mariux64/relax-vx50-check
Browse files Browse the repository at this point in the history
mxgrub: Relax VX50 check
  • Loading branch information
pmenzel authored Apr 4, 2018
2 parents c096a17 + 90c0052 commit 75419a7
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions mxgrub/mxgrub
Original file line number Diff line number Diff line change
Expand Up @@ -283,13 +283,15 @@ sub cmd_list {

$mbr_type eq 'GRUB' or warn "WARNING: $root_disk MBR type is $mbr_type\n";

is_VX50() and warn "WARNING: This is a VX50, I refuse to install grub here\n";
is_VX50() && $mbr_type ne 'GRUB' and warn "WARNING: This is a VX50, I refuse to install grub here\n";
}

sub cmd_install {
my ($label)=@_; #
my ($root_device,$root_disk)=root_dev();
my $mbr_type=check_mbr($root_disk);

is_VX50() and die "This is a VX50, I refuse to install grub here\n";
is_VX50() && $mbr_type ne 'GRUB' and die "This is a VX50, I refuse to install grub here\n";

if ($label eq 'default') {
scan_mariux(0);
Expand All @@ -301,8 +303,6 @@ sub cmd_install {

update_grub_cfg();

my ($root_device,$root_disk)=root_dev();
my $mbr_type=check_mbr($root_disk);
if ($mbr_type ne 'GRUB') {
sys 'grub-install',$root_disk and exit 1;
}
Expand Down

0 comments on commit 75419a7

Please sign in to comment.