Skip to content
Jump to bottom

mxgrub: Relax VX50 check #37

Merged
merged 1 commit into from
Apr 4, 2018
Merged

mxgrub: Relax VX50 check #37

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions mxgrub/mxgrub
View file
Open in desktop
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