mirror of
https://github.com/fspc/gbootroot.git
synced 2025-02-23 09:03:23 -05:00
Some misc. changes.
This commit is contained in:
parent
c7eac0edfe
commit
5a8621791a
@ -814,14 +814,14 @@ sub create_filesystem {
|
|||||||
## Originally, this was -b 1024 switched with the inode approach.
|
## Originally, this was -b 1024 switched with the inode approach.
|
||||||
if (sys("$main::makefs $device $fs_size") !~
|
if (sys("$main::makefs $device $fs_size") !~
|
||||||
/^0$/ ) {
|
/^0$/ ) {
|
||||||
$error = error("Can not $fs_type filesystem.");
|
$error = error("Cannot $fs_type filesystem.");
|
||||||
return "ERROR" if $error && $error eq "ERROR";
|
return "ERROR" if $error && $error eq "ERROR";
|
||||||
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (sys("$main::makefs $device $fs_size") !~
|
if (sys("$main::makefs $device $fs_size") !~
|
||||||
/^0$/ ) {
|
/^0$/ ) {
|
||||||
$error = error("Can not $fs_type filesystem.");
|
$error = error("Cannot $fs_type filesystem.");
|
||||||
return "ERROR" if $error && $error eq "ERROR";
|
return "ERROR" if $error && $error eq "ERROR";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -990,7 +990,7 @@ sub create_filesystem {
|
|||||||
if (
|
if (
|
||||||
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") !~
|
||||||
/^0$/ ) {
|
/^0$/ ) {
|
||||||
$error = error("Can not $fs_type filesystem.");
|
$error = error("Cannot $fs_type filesystem.");
|
||||||
return "ERROR" if $error && $error eq "ERROR";
|
return "ERROR" if $error && $error eq "ERROR";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -276,9 +276,6 @@ sub file_system {
|
|||||||
# Editor and execute options
|
# Editor and execute options
|
||||||
label("Filesystem Command:",0,1,0,1,$table_filesystem);
|
label("Filesystem Command:",0,1,0,1,$table_filesystem);
|
||||||
my $fs1 = entry(1,3,0,1,2,$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);
|
$fs1->set_text($main::makefs);
|
||||||
|
|
||||||
$table_filesystem->set_row_spacing( 0, 2);
|
$table_filesystem->set_row_spacing( 0, 2);
|
||||||
|
@ -580,8 +580,8 @@ else {
|
|||||||
# disk. In this example the user is locked into using one type of device
|
# disk. In this example the user is locked into using one type of device
|
||||||
# for the boot/root
|
# for the boot/root
|
||||||
#
|
#
|
||||||
# /tmp/gboot_not_root_`id -u`/initrd_image \
|
# /tmp/gboot_non_root_`id -u`/initrd_image \
|
||||||
# /tmp/gboot_not_root_'id -u1`/initrd_mnt \
|
# /tmp/gboot_non_root_'id -u1`/initrd_mnt \
|
||||||
# auto defaults,noauto,user,loop 0 0
|
# auto defaults,noauto,user,loop 0 0
|
||||||
#
|
#
|
||||||
# /dev/fd0 /tmp/gboot_not_root_mnt_`id -u` auto defaults,noauto,user 0 0
|
# /dev/fd0 /tmp/gboot_not_root_mnt_`id -u` auto defaults,noauto,user 0 0
|
||||||
|
Loading…
x
Reference in New Issue
Block a user