mirror of
https://github.com/fspc/gbootroot.git
synced 2025-04-04 07:43:22 -04:00
* Some tweaks before beginning work on check_root_fs.
This commit is contained in:
parent
1cb92862bc
commit
9c47087234
4
Yard.pm
4
Yard.pm
@ -770,7 +770,7 @@ sub create_filesystem {
|
||||
return "ERROR" if $error && $error eq "ERROR";
|
||||
}
|
||||
} else {
|
||||
if (sys("mke2fs -F -m 0 -i $inode_size $device $fs_size") !~
|
||||
if (sys("mke2fs -m 0 -i $inode_size $device $fs_size") !~
|
||||
/^0$/ ) {
|
||||
$error = error("Can not make $fs_type filesystem");
|
||||
return "ERROR" if $error && $error eq "ERROR";
|
||||
@ -914,7 +914,7 @@ sub create_filesystem {
|
||||
## Probably will want to umount here
|
||||
|
||||
info(0, "\nDone with $PROGRAM_NAME. $Warnings warnings.\n",
|
||||
"$device is still mounted on $mount_point\n");
|
||||
"$device is still mounted on $mount_point\n\n");
|
||||
|
||||
} # end sub create_filesystem
|
||||
|
||||
|
19
YardBox.pm
19
YardBox.pm
@ -385,6 +385,11 @@ sub which_stage {
|
||||
}
|
||||
|
||||
} # end if one-by-one or continuous
|
||||
elsif ($stages_bool eq "user-defined") {
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
for (keys %$continue) { print $_, "=>", $continue->{$_}, "\n"; }
|
||||
|
||||
@ -395,7 +400,7 @@ sub continue {
|
||||
my $thing;
|
||||
|
||||
# This has to go sequentially, but backwards is o.k.
|
||||
if ($stages_bool eq "one-by-one") {
|
||||
if ($stages_bool eq "one-by-one" || $stages_bool eq "continuous") {
|
||||
if ( $continue->{check} == 0 ) {
|
||||
check();
|
||||
foreach $thing (@check_boxes) {
|
||||
@ -407,7 +412,7 @@ sub continue {
|
||||
$dep->active($true);
|
||||
$dep->show();
|
||||
$continue->{check} = 1;
|
||||
return;
|
||||
return if $stages_bool eq "one-by-one";
|
||||
}
|
||||
if ( $continue->{dep} == 0 ) {
|
||||
links_deps();
|
||||
@ -420,7 +425,7 @@ sub continue {
|
||||
$space->active($true);
|
||||
$space->show();
|
||||
$continue->{dep} = 1;
|
||||
return;
|
||||
return if $stages_bool eq "one-by-one";
|
||||
}
|
||||
if ( $continue->{space} == 0 ) {
|
||||
space_left();
|
||||
@ -433,7 +438,7 @@ sub continue {
|
||||
$create->active($true);
|
||||
$create->show();
|
||||
$continue->{space} = 1;
|
||||
return;
|
||||
return if $stages_bool eq "one-by-one";
|
||||
}
|
||||
if ( $continue->{create} == 0 ) {
|
||||
create();
|
||||
@ -446,9 +451,13 @@ sub continue {
|
||||
$test->active($true);
|
||||
$test->show();
|
||||
$continue->{create} = 1;
|
||||
return;
|
||||
return if $stages_bool eq "one-by-one";
|
||||
}
|
||||
|
||||
}
|
||||
elsif ($stages_bool eq "user-defined") {
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -2055,7 +2055,9 @@ sub initrd {
|
||||
|
||||
info(0, "Determine run-time link bindings\n");
|
||||
# Has a return code of 0 regardless
|
||||
sys("ldconfig -r $tmp/initrd_mnt");
|
||||
# Also, produces false alarms even when it is working.
|
||||
info(1, "Ignore warnings about missing directories\n");
|
||||
sys("ldconfig -v -r $tmp/initrd_mnt");
|
||||
info(0, "Umounting loop device, and compressing initrd\n");
|
||||
return if errum(sys("umount $tmp/initrd_mnt")) == 2;
|
||||
sys("gzip -f9 $tmp/$initrd");
|
||||
|
Loading…
x
Reference in New Issue
Block a user