bike/gbootroot
1
0
Fork 0
mirror of https://github.com/fspc/gbootroot.git synced 2025-02-23 09:03:23 -05:00
Code Issues Projects Releases Wiki Activity

Added a check when uml_exclusively is used to make sure valid helper commands

Browse Source 
are used.
This commit is contained in:
freesource 2001-12-20 21:36:34 +00:00
parent 06ec15e04d
commit 7cfd2fd76a
1 changed files with 46 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
BootRoot/YardBox.pm
View File

@ -313,7 +313,7 @@ sub filesystem_size {
!$uml_expect{preserve_permissions}; !$uml_expect{preserve_permissions};
} }
} # end fileystem_size } # end sub fileystem_size
# This allows the user to choose a different filesystem besides ext2. # This allows the user to choose a different filesystem besides ext2.
# The space_check inode percentage formula can be altered. Default 2%. # The space_check inode percentage formula can be altered. Default 2%.
@ -426,24 +426,58 @@ sub file_system {
$submit_b->signal_connect( "clicked", sub { $submit_b->signal_connect( "clicked", sub {
if ($entry[2]) { if ($entry[2]) {
# Check to see if it actually exists # Check to see if it actually exists
# unless UML Exclusively is used, then
# supported fs types can be used even if they
# don't exist on the host system.
my $executable = (split(/\s+/,$entry[2]))[0]; my $executable = (split(/\s+/,$entry[2]))[0];
if (!find_file_in_path(basename($executable))) {
if ( $executable ne "genext2fs" ) { if ( $uml_expect{uml_exclusively} == 0 ) {
error_window
("gBootRoot: ERROR: Enter a valid command"); if (!find_file_in_path(basename($executable))) {
return; if ( $executable ne "genext2fs" ) {
} error_window
} ("gBootRoot: ERROR: Enter a valid command");
if ($executable =~ m,/,) { return;
if (! -e $executable) { }
error_window("gBootRoot: ERROR: " . }
"Enter a valid path for the command."); if ($executable =~ m,/,) {
if (! -e $executable) {
error_window("gBootRoot: ERROR: " .
"Enter a valid path for the command.");
return;
}
}
}
# usinng uml_exlusively
else {
my %uml_helper_fs_types = qw(mke2fs 1 mkcramfs 1 genromfs 1
mkfs.minix 1 mkminix 1
mkreiserfs 1);
if ( !$uml_helper_fs_types{$executable} ) {
error_window("ROOT_FS_HELPER ERROR: " .
"These are supported " .
"make fs commands:\n\nmke2fs mkcramfs" .
" genromfs mkfs.minix mkminix mkreiserfs");
return; return;
} }
} }
$main::makefs = $entry[2]; $main::makefs = $entry[2];
info(1,"Filesystem Command is $entry[2]\n"); info(1,"Filesystem Command is $entry[2]\n");
} }
} ); } );