mirror of
https://github.com/fspc/gbootroot.git
synced 2025-02-23 09:03:23 -05:00
Starting to consider a new stage by replaceing create with copy, and associating
create only with the root_fs helper and uml_exclusively.
This commit is contained in:
parent
2275fb5a6d
commit
2f3fa62828
@ -1118,7 +1118,8 @@ sub space_check {
|
|||||||
##### Create filesystem
|
##### Create filesystem
|
||||||
########################
|
########################
|
||||||
|
|
||||||
|
# This is really copy for normal users, uml_exclusively, and genext2fs
|
||||||
|
# since everything goes into a source directory.
|
||||||
sub create_filesystem {
|
sub create_filesystem {
|
||||||
|
|
||||||
my ($filename, $fs_size, $mnt, $strip_lib,
|
my ($filename, $fs_size, $mnt, $strip_lib,
|
||||||
@ -1363,10 +1364,6 @@ sub create_filesystem {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if ( $uml_exclusively == 0 ) {
|
|
||||||
info(0, "\nFinished creating root filesystem.\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (@Libs) {
|
if (@Libs) {
|
||||||
|
|
||||||
info(0, "Re-generating /etc/ld.so.cache on root fs.\n");
|
info(0, "Re-generating /etc/ld.so.cache on root fs.\n");
|
||||||
@ -1376,6 +1373,15 @@ sub create_filesystem {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
# This could be run as another stage, its only complicated
|
||||||
|
# when root is using a loop device, in figuring out the verbosity.
|
||||||
|
|
||||||
|
|
||||||
|
if ( $uml_exclusively == 0 ) {
|
||||||
|
info(0, "\nFinished creating root filesystem.\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
if ( $fs_type ne "genext2fs" && $uml_exclusively == 0 ) {
|
if ( $fs_type ne "genext2fs" && $uml_exclusively == 0 ) {
|
||||||
## Probably will want to umount here
|
## Probably will want to umount here
|
||||||
return "ERROR" if errum(sys("umount $mount_point")) == 2;
|
return "ERROR" if errum(sys("umount $mount_point")) == 2;
|
||||||
@ -1418,6 +1424,7 @@ sub create_filesystem {
|
|||||||
info(0,"$command_line\n\n");
|
info(0,"$command_line\n\n");
|
||||||
|
|
||||||
# add error correction
|
# add error correction
|
||||||
|
# I'll allow the GUI to lock-xup for big copies and fs creation.
|
||||||
open(EXPECT,"$command_line|");
|
open(EXPECT,"$command_line|");
|
||||||
while (<EXPECT>) {
|
while (<EXPECT>) {
|
||||||
info(1,"$x_count $_");
|
info(1,"$x_count $_");
|
||||||
|
Loading…
x
Reference in New Issue
Block a user