Browse Source

Fixed another non-root boot/root bug. The info had it correct, but the actual

copy with genext2fs was being done from the wrong location.  This has been
fixed.
master
freesource 23 years ago
parent
commit
fb9b3ed43b
  1. 3
      BootRoot/BootRoot.pm
  2. 4
      Changes

3
BootRoot/BootRoot.pm

@ -3195,7 +3195,7 @@ sub device2 {
if ( if (
sys("/usr/lib/bootroot/$main::makefs -b $device_size -d $mnt $entry_advanced[3]") !~ sys("/usr/lib/bootroot/$main::makefs -b $device_size -d $tmp/rootdisk $entry_advanced[3]") !~
/^0$/ ) { /^0$/ ) {
info( 0, "/usr/lib/bootroot/$main::makefs -b $device_size -d $tmp/rootdisk $entry_advanced[3]\n"); info( 0, "/usr/lib/bootroot/$main::makefs -b $device_size -d $tmp/rootdisk $entry_advanced[3]\n");
$error = error("Cannot $fs_type filesystem.\n"); $error = error("Cannot $fs_type filesystem.\n");
@ -3212,6 +3212,7 @@ sub device2 {
"gBootRoot: ERROR: Root disk did not properly umount") == 2; "gBootRoot: ERROR: Root disk did not properly umount") == 2;
} }
$line_count = $line_count * 2;
pb($FS,$count,$line_count); pb($FS,$count,$line_count);
info(0, "Finished!\n"); info(0, "Finished!\n");

4
Changes

@ -1,3 +1,7 @@
Fixed another non-root boot/root bug. The info had it correct, but the actual
copy with genext2fs was being done from the wrong location. This has been
fixed.
Had some testing code which was providing the wrong value for $compress, this Had some testing code which was providing the wrong value for $compress, this
made non-root booting fail for bzip2 because bunzip2 didn't exist in the made non-root booting fail for bzip2 because bunzip2 didn't exist in the
initrd. initrd.

Loading…
Cancel
Save