SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #33660 from poettering/mount-tool-tweaks

Browse Source 
minor tweaks to "systemd-mount"
This commit is contained in:
Lennart Poettering
2024-07-10 12:00:13 +02:00
committed by GitHub
parent 40d9c16d1e c4ecc0231f
commit 035b98b607
4 changed files with 51 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TODO
+16
View File
@@ -130,6 +130,22 @@ Deprecations and removals:
Features:
* go through all uses of table_new() in our codebase, and make sure we support
all three of:
1. --no-legend properly
2. --json= properly
3. --no-pager properly
* go through all --help texts in our codebases, and make sure:
1. the one sentence description of the tool is highlighted via ANSI how we
usually do it
2. If more than one or two commands are supported (as opposed to switches),
separate commands + switches from each other, using underlined --help sections.
3. If there are many switches, consider adding additional --help sections.
* go through our codebase, and convert "vertical tables" (i.e. things such as
"systemctl status") to use table_new_vertical() for output
* logind: when logging in use new tmpfs quota support to configure quota on
/tmp/ + /dev/shm/. But do so only in case of tmpfs, because otherwise quota
is persistent and any persistent settings mean we don#t have to reapply them.
man/systemd-mount.xml
+1
View File
@@ -121,6 +121,7 @@
<xi:include href="standard-options.xml" xpointer="no-pager"/>
<xi:include href="standard-options.xml" xpointer="no-legend" />
<xi:include href="standard-options.xml" xpointer="no-ask-password"/>
<xi:include href="standard-options.xml" xpointer="json"/>
<varlistentry>
<term><option>--quiet</option></term>
src/mount/mount-tool.c
+32 -10
View File
@@ -74,6 +74,7 @@ static gid_t arg_gid = GID_INVALID;
static bool arg_fsck = true;
static bool arg_aggressive_gc = false;
static bool arg_tmpfs = false;
static sd_json_format_flags_t arg_json_format_flags = SD_JSON_FORMAT_OFF;
STATIC_DESTRUCTOR_REGISTER(arg_mount_what, freep);
STATIC_DESTRUCTOR_REGISTER(arg_mount_where, freep);
@@ -119,7 +120,7 @@ static int help(void) {
"systemd-mount [OPTIONS...] --tmpfs [NAME] WHERE\n"
"systemd-mount [OPTIONS...] --list\n"
"%s [OPTIONS...] %sWHAT|WHERE...\n\n"
"Establish a mount or auto-mount point transiently.\n\n"
"%sEstablish a mount or auto-mount point transiently.%s\n\n"
" -h --help Show this help\n"
" --version Show package version\n"
" --no-block Do not wait until operation finished\n"
@@ -128,6 +129,7 @@ static int help(void) {
" -l --full Do not ellipsize output\n"
" --no-ask-password Do not prompt for password\n"
" -q --quiet Suppress information messages during runtime\n"
" --json=pretty|short|off Generate JSON output\n"
" --user Run as user unit\n"
" -H --host=[USER@]HOST Operate on remote host\n"
" -M --machine=CONTAINER Operate on local container\n"
@@ -150,6 +152,8 @@ static int help(void) {
"\nSee the %s for details.\n",
program_invocation_short_name,
streq(program_invocation_short_name, "systemd-umount") ? "" : "--umount ",
ansi_highlight(),
ansi_normal(),
link);
return 0;
@@ -176,6 +180,7 @@ static int parse_argv(int argc, char *argv[]) {
ARG_AUTOMOUNT_PROPERTY,
ARG_BIND_DEVICE,
ARG_LIST,
ARG_JSON,
};
static const struct option options[] = {
@@ -207,6 +212,7 @@ static int parse_argv(int argc, char *argv[]) {
{ "unmount", no_argument, NULL, 'u' }, /* Compat spelling */
{ "collect", no_argument, NULL, 'G' },
{ "tmpfs", no_argument, NULL, 'T' },
{ "json", required_argument, NULL, ARG_JSON },
{},
};
@@ -361,6 +367,13 @@ static int parse_argv(int argc, char *argv[]) {
arg_tmpfs = true;
break;
case ARG_JSON:
r = parse_json_argument(optarg, &arg_json_format_flags);
if (r <= 0)
return r;
break;
case '?':
return -EINVAL;
@@ -1399,6 +1412,7 @@ static int discover_device(void) {
static int list_devices(void) {
enum {
COLUMN_NODE,
COLUMN_DISKSEQ,
COLUMN_PATH,
COLUMN_MODEL,
COLUMN_WWN,
@@ -1424,7 +1438,7 @@ static int list_devices(void) {
if (r < 0)
return log_error_errno(r, "Failed to add property match: %m");
table = table_new("NODE", "PATH", "MODEL", "WWN", "FSTYPE", "LABEL", "UUID");
table = table_new("node", "diskseq", "path", "model", "wwn", "fstype", "label", "uuid");
if (!table)
return log_oom();
@@ -1435,7 +1449,6 @@ static int list_devices(void) {
if (r < 0)
return log_error_errno(r, "Failed to set sort index: %m");
table_set_header(table, arg_legend);
table_set_ersatz_string(table, TABLE_ERSATZ_DASH);
FOREACH_DEVICE(e, d) {
@@ -1448,6 +1461,21 @@ static int list_devices(void) {
(void) sd_device_get_devname(d, &x);
break;
case COLUMN_DISKSEQ: {
uint64_t ds;
r = sd_device_get_diskseq(d, &ds);
if (r < 0) {
log_debug_errno(r, "Failed to get diskseq of block device, ignoring: %m");
r = table_add_cell(table, NULL, TABLE_EMPTY, NULL);
} else
r = table_add_cell(table, NULL, TABLE_UINT64, &ds);
if (r < 0)
return table_log_add_error(r);
continue;
}
case COLUMN_PATH:
(void) sd_device_get_property_value(d, "ID_PATH", &x);
break;
@@ -1479,13 +1507,7 @@ static int list_devices(void) {
}
}
pager_open(arg_pager_flags);
r = table_print(table, NULL);
if (r < 0)
return table_log_print_error(r);
return 0;
return table_print_with_pager(table, arg_json_format_flags, arg_pager_flags, arg_legend);
}
static int run(int argc, char* argv[]) {
test/units/TEST-74-AUX-UTILS.mount.sh
+2 -1
View File
@@ -23,6 +23,7 @@ systemd-mount --list --full
systemd-mount --list --no-legend
systemd-mount --list --no-pager
systemd-mount --list --quiet
systemd-mount --list --json=pretty
# tmpfs
mkdir -p "$WORK_DIR/mnt/foo/bar"
@@ -145,7 +146,7 @@ test -e /run/media/system/simple.img/foo.bar
# systemd-mount --list and systemd-umount require the loopback block device is initialized by udevd.
udevadm settle --timeout 30
assert_in "/dev/loop.* ext4 +sd-mount-test" "$(systemd-mount --list --full)"
LOOP_AUTO=$(systemd-mount --list --full --no-legend | awk '$6 == "sd-mount-test" { print $1 }')
LOOP_AUTO=$(systemd-mount --list --full --no-legend | awk '$7 == "sd-mount-test" { print $1 }')
LOOP_AUTO_DEVPATH=$(udevadm info --query property --property DEVPATH --value "$LOOP_AUTO")
systemd-umount "$WORK_DIR/simple.img"
# Wait for 'change' uevent for the device with DISK_MEDIA_CHANGE=1.