diff --git a/BootRoot/BootRoot.pm b/BootRoot/BootRoot.pm index 3a2efe1..a70f245 100644 --- a/BootRoot/BootRoot.pm +++ b/BootRoot/BootRoot.pm @@ -3195,7 +3195,7 @@ sub device2 { 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$/ ) { info( 0, "/usr/lib/bootroot/$main::makefs -b $device_size -d $tmp/rootdisk $entry_advanced[3]\n"); $error = error("Cannot $fs_type filesystem.\n"); @@ -3212,6 +3212,7 @@ sub device2 { "gBootRoot: ERROR: Root disk did not properly umount") == 2; } + $line_count = $line_count * 2; pb($FS,$count,$line_count); info(0, "Finished!\n"); diff --git a/Changes b/Changes index e903a52..9d2fbd5 100644 --- a/Changes +++ b/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 made non-root booting fail for bzip2 because bunzip2 didn't exist in the initrd.