From 5a8621791af5b0df34163b969f086ae7ea4ce694 Mon Sep 17 00:00:00 2001 From: freesource Date: Thu, 1 Nov 2001 04:20:25 +0000 Subject: [PATCH] Some misc. changes. --- BootRoot/Yard.pm | 6 +++--- BootRoot/YardBox.pm | 3 --- gbootroot | 4 ++-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/BootRoot/Yard.pm b/BootRoot/Yard.pm index c2abede..2c6e450 100644 --- a/BootRoot/Yard.pm +++ b/BootRoot/Yard.pm @@ -814,14 +814,14 @@ sub create_filesystem { ## Originally, this was -b 1024 switched with the inode approach. if (sys("$main::makefs $device $fs_size") !~ /^0$/ ) { - $error = error("Can not $fs_type filesystem."); + $error = error("Cannot $fs_type filesystem."); return "ERROR" if $error && $error eq "ERROR"; } } else { if (sys("$main::makefs $device $fs_size") !~ /^0$/ ) { - $error = error("Can not $fs_type filesystem."); + $error = error("Cannot $fs_type filesystem."); return "ERROR" if $error && $error eq "ERROR"; } } @@ -990,7 +990,7 @@ sub create_filesystem { if ( sys("/usr/lib/bootroot/$main::makefs -b $fs_size -d $mount_point -D $device_table $device") !~ /^0$/ ) { - $error = error("Can not $fs_type filesystem."); + $error = error("Cannot $fs_type filesystem."); return "ERROR" if $error && $error eq "ERROR"; } diff --git a/BootRoot/YardBox.pm b/BootRoot/YardBox.pm index 85386f6..c98e98c 100644 --- a/BootRoot/YardBox.pm +++ b/BootRoot/YardBox.pm @@ -276,9 +276,6 @@ sub file_system { # Editor and execute options label("Filesystem Command:",0,1,0,1,$table_filesystem); my $fs1 = entry(1,3,0,1,2,$table_filesystem); - if ( $> != 0 && -e "/usr/lib/bootroot/genext2fs" ) { - $main::makefs = "genext2fs -i8192"; - } $fs1->set_text($main::makefs); $table_filesystem->set_row_spacing( 0, 2); diff --git a/gbootroot b/gbootroot index f4ab1ce..cf9361e 100755 --- a/gbootroot +++ b/gbootroot @@ -580,8 +580,8 @@ else { # disk. In this example the user is locked into using one type of device # for the boot/root # - # /tmp/gboot_not_root_`id -u`/initrd_image \ - # /tmp/gboot_not_root_'id -u1`/initrd_mnt \ + # /tmp/gboot_non_root_`id -u`/initrd_image \ + # /tmp/gboot_non_root_'id -u1`/initrd_mnt \ # auto defaults,noauto,user,loop 0 0 # # /dev/fd0 /tmp/gboot_not_root_mnt_`id -u` auto defaults,noauto,user 0 0