From 2f3fa62828192aa305be71287b92035c353484fd Mon Sep 17 00:00:00 2001 From: freesource Date: Sat, 22 Dec 2001 20:42:30 +0000 Subject: [PATCH] Starting to consider a new stage by replaceing create with copy, and associating create only with the root_fs helper and uml_exclusively. --- BootRoot/Yard.pm | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/BootRoot/Yard.pm b/BootRoot/Yard.pm index 0e5e612..4a8c96f 100644 --- a/BootRoot/Yard.pm +++ b/BootRoot/Yard.pm @@ -1118,7 +1118,8 @@ sub space_check { ##### Create filesystem ######################## - +# This is really copy for normal users, uml_exclusively, and genext2fs +# since everything goes into a source directory. sub create_filesystem { 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) { 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 ) { ## Probably will want to umount here return "ERROR" if errum(sys("umount $mount_point")) == 2; @@ -1418,6 +1424,7 @@ sub create_filesystem { info(0,"$command_line\n\n"); # add error correction + # I'll allow the GUI to lock-xup for big copies and fs creation. open(EXPECT,"$command_line|"); while () { info(1,"$x_count $_");