@@ -751,11 +751,31 @@ private fun Os(c: CreatePartDataHolder) {
751751 Button (onClick = { c.parts.removeAt(c.parts.lastIndex) }, enabled = (c.parts.size > 1 )) {
752752 Text (" -" )
753753 }
754- var remaining = c.endSectorRelative - c.startSectorRelative
755- for (part in c.parts) {
756- remaining - = part.resolveSectorSize(c, remaining)
754+ if (c.vm.deviceInfo.metaonsd) {
755+ var remaining = c.endSectorRelative - c.startSectorRelative
756+ for (part in c.parts) {
757+ remaining - = part.resolveSectorSize(c, remaining)
758+ }
759+ Text (
760+ stringResource(
761+ R .string.remaining_sector,
762+ remaining,
763+ c.endSectorRelative - c.startSectorRelative
764+ )
765+ )
766+ } else {
767+ var remaining = c.desiredSize
768+ for (part in c.parts) {
769+ remaining - = part.resolveBytesSize(c, remaining)
770+ }
771+ Text (
772+ stringResource(
773+ R .string.remaining_sector,
774+ remaining,
775+ c.desiredSize
776+ )
777+ )
757778 }
758- Text (stringResource(R .string.remaining_sector, remaining, c.endSectorRelative - c.startSectorRelative))
759779 }
760780 }
761781 }
@@ -836,7 +856,7 @@ private fun Flash(c: CreatePartDataHolder) {
836856 vm.logic.mountBootset(vm.deviceInfo)
837857 } else {
838858 var space = c.desiredSize
839- val imgFolder = File (c.vm.logic.abmSdLessBootset, fn)
859+ val imgFolder = SuFile .open (c.vm.logic.abmSdLessBootset, fn)
840860 var i = 0
841861 if (imgFolder.exists())
842862 throw IllegalStateException (" image folder ${imgFolder.absolutePath} already exists" )
@@ -851,7 +871,7 @@ private fun Flash(c: CreatePartDataHolder) {
851871 space - = bytes
852872 if (space < 0 )
853873 throw IllegalStateException (" remaining space $space shouldn't be smaller than 0" )
854- if (! Shell .cmd(" fallocate -l $ bytes" + img.absolutePath).to(terminal).exec().isSuccess) {
874+ if (! Shell .cmd(" dd if=/dev/zero bs=1024 count= ${ bytes/ 1024 } " + img.absolutePath).to(terminal).exec().isSuccess) {
855875 terminal.add(vm.activity.getString(R .string.term_failed_fallocate))
856876 return @WizardTerminalWork
857877 }
0 commit comments