Skip to content

Commit

Permalink
storage: Offer global "Create partition" action
Browse files Browse the repository at this point in the history
  • Loading branch information
@mvollmer
mvollmer committed Apr 5, 2024
1 parent 20530fc commit fa9ef75
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 30 deletions.
8 changes: 4 additions & 4 deletions pkg/storaged/block/actions.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import cockpit from "cockpit";
import client from "../client";

import { format_disk } from "./format-disk-dialog.jsx";
import { format_dialog, add_encryption_dialog, encrypted_format_dialog } from "./format-dialog.jsx";
import { format_dialog } from "./format-dialog.jsx";
import { erase_dialog } from "./erase-dialog.jsx";

const _ = cockpit.gettext;
Expand All @@ -37,7 +37,7 @@ export function block_actions(block, kind) {
if (kind != "crypto") {
actions.push({
title: _("Add encryption"),
action: () => add_encryption_dialog(client, block),
action: () => format_dialog(block, { add_encryption: true }),
excuse,
});
}
Expand All @@ -54,14 +54,14 @@ export function block_actions(block, kind) {
if (kind == "crypto") {
actions.push({
title: _("Format cleartext device"),
action: () => encrypted_format_dialog(client, block),
action: () => format_dialog(block, { is_encrypted: true }),
primary: true,
excuse,
});
} else {
actions.push({
title: _("Format as filesystem"),
action: () => format_dialog(client, block.path),
action: () => format_dialog(block),
primary: true,
excuse,
});
Expand Down
37 changes: 17 additions & 20 deletions pkg/storaged/block/format-dialog.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,18 +81,6 @@ export function initial_mount_options(client, block) {
return initial_tab_options(client, block, true);
}

export function format_dialog(client, path, start, size, enable_dos_extended) {
return format_dialog_internal(client, client.blocks[path], { start, size, enable_dos_extended });
}

export function add_encryption_dialog(client, block) {
return format_dialog_internal(client, block, { add_encryption: true });
}

export function encrypted_format_dialog(client, block) {
return format_dialog_internal(client, block, { is_encrypted: true });
}

function find_root_fsys_block() {
const root = client.anaconda?.mount_point_prefix || "/";
for (const p in client.blocks) {
Expand All @@ -104,14 +92,14 @@ function find_root_fsys_block() {
return null;
}

function format_dialog_internal(client, block, options) {
const { start, size, enable_dos_extended, add_encryption } = options;
export function format_dialog(block, options) {
const { free_spaces, enable_dos_extended, add_encryption } = options || { };
const is_already_encrypted = options.is_encrypted;
const block_part = client.blocks_part[block.path];
const block_ptable = client.blocks_ptable[block.path] || client.blocks_ptable[block_part?.Table];
const content_block = block.IdUsage == "crypto" ? client.blocks_cleartext[block.path] : block;

const create_partition = (start !== undefined);
const create_partition = (free_spaces !== undefined);

let title;
if (add_encryption)
Expand Down Expand Up @@ -282,18 +270,20 @@ function format_dialog_internal(client, block, options) {
];
}

let max_size = 0;
if (create_partition)
max_size = Math.max(...free_spaces.map(f => f.size));

dialog_open({
Title: title,
Teardown: TeardownMessage(usage),
Fields: [
SizeSlider("size", _("Size"),
{
value: size,
max: size,
value: max_size,
max: max_size,
round: 1024 * 1024,
visible: function () {
return create_partition;
}
visible: () => create_partition,
}),
SelectOne("type", _("Type"),
{
Expand Down Expand Up @@ -497,6 +487,13 @@ function format_dialog_internal(client, block, options) {

function format() {
if (create_partition) {
let start = free_spaces[0].start;
for (const fs of free_spaces) {
if (fs.size >= vals.size) {
start = fs.start;
break;
}
}
if (type == "dos-extended")
return block_ptable.CreatePartition(start, vals.size, "0x05", "", { });
else
Expand Down
31 changes: 25 additions & 6 deletions pkg/storaged/partitions/partition-table.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import { make_partition_card, delete_partition } from "./partition.jsx";

const _ = cockpit.gettext;

function make_partition_pages(parent, block) {
function make_partition_pages(parent, block, partitions) {
const block_ptable = client.blocks_ptable[block.path];
let counter = 0;

Expand All @@ -45,8 +45,7 @@ function make_partition_pages(parent, block) {
actions: [
{
title: _("Create partition"),
action: () => format_dialog(client, block.path, start, size,
enable_dos_extended),
action: () => format_dialog(block, { free_spaces: [{ start, size }], enable_dos_extended }),
}
],
});
Expand Down Expand Up @@ -80,12 +79,24 @@ function make_partition_pages(parent, block) {
}
}

process_partitions(parent, get_partitions(client, block),
block_ptable.Type == 'dos');
process_partitions(parent, partitions, block_ptable.Type == 'dos');
}

function get_free_spaces(partitions) {
let result = [];
for (const p of partitions) {
if (p.type == 'free')
result.push({ start: p.start, size: p.size });
else if (p.type == 'container')
result = result.concat(get_free_spaces(p.partitions));
}
return result;
}

export function make_partition_table_page(parent, block, next_card) {
const block_ptable = client.blocks_ptable[block.path];
const partitions = get_partitions(client, block);
const free_spaces = get_free_spaces(partitions);

const parts_card = new_card({
title: (block_ptable.Type
Expand All @@ -94,10 +105,18 @@ export function make_partition_table_page(parent, block, next_card) {
next: next_card,
component: PartitionsCard,
props: { },
actions: [
{
title: _("Create partition"),
action: () => format_dialog(block, { free_spaces, enable_dos_extended: false }),
primary: true,
excuse: free_spaces.length == 0 ? _("No free space") : null,
},
],
});

const p = new_page(parent, parts_card, { sorted: false });
make_partition_pages(p, block);
make_partition_pages(p, block, partitions);
}

const PartitionsCard = ({ card }) => {
Expand Down

0 comments on commit fa9ef75

Please sign in to comment.