bike/gbootroot
1
0
Fork 0
mirror of https://github.com/fspc/gbootroot.git synced 2025-04-04 07:43:22 -04:00
Code Issues Projects Releases Wiki Activity

Root Filename and verbosity are properly updated for the new *_cramfs.

Browse Source
This commit is contained in:
freesource 2001-12-21 15:28:36 +00:00
parent e4050d71bc
commit b261b47c4b
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
BootRoot/Yard.pm
View File

@ -37,7 +37,7 @@ use Exporter;
read_contents_file extra_links library_dependencies hard_links read_contents_file extra_links library_dependencies hard_links
space_check create_filesystem find_file_in_path sys device_table space_check create_filesystem find_file_in_path sys device_table
text_insert error warning warning_test logadj *LOGFILE text_insert error warning warning_test logadj *LOGFILE
which_tests create_fstab ars2 make_link_absolute which_tests create_fstab ars2 root_filename make_link_absolute
make_link_relative cleanup_link yard_glob); make_link_relative cleanup_link yard_glob);
# these last four added for tests # these last four added for tests
@ -64,6 +64,7 @@ my($Warnings) = 0;
my $verbosity; my $verbosity;
my ($text_insert,$red,$blue); my ($text_insert,$red,$blue);
my $logadj; my $logadj;
my $ear2;
my ($device, $mount_point); my ($device, $mount_point);
my $contents_file_tmp; # Checks for template name change my $contents_file_tmp; # Checks for template name change
my @pathlist; my @pathlist;
@ -90,6 +91,7 @@ sub warning {
sub verbosity { $verbosity = $_[0]; } sub verbosity { $verbosity = $_[0]; }
sub text_insert { $text_insert = $_[0]; $red = $_[1]; $blue = $_[2]; } sub text_insert { $text_insert = $_[0]; $red = $_[1]; $blue = $_[2]; }
sub root_filename { $ear2 = $_[0]; }
sub logadj { $logadj = $_[0]; } sub logadj { $logadj = $_[0]; }
my ($ars, $kernel, $kernel_version_choice, $uml_exclusively, $preserve_ownership); my ($ars, $kernel, $kernel_version_choice, $uml_exclusively, $preserve_ownership);
sub ars2 { $ars = $_[0]; sub ars2 { $ars = $_[0];
@ -1416,6 +1418,14 @@ sub create_filesystem {
while (Gtk->events_pending) { Gtk->main_iteration; } while (Gtk->events_pending) { Gtk->main_iteration; }
} }
if ( $fs_type eq "mkcramfs" ) {
$device = $device . "_cramfs";
my $cramfs_name = basename($device);
$ear2->set_text($cramfs_name);
$mount_point = dirname($device);
}
} }
elsif ( elsif (
sys("/usr/lib/bootroot/$main::makefs -b $fs_size -d $mount_point -D $device_table $device") !~ sys("/usr/lib/bootroot/$main::makefs -b $fs_size -d $mount_point -D $device_table $device") !~