#include "bus-common-errors.h"
#include "bus-error.h"
#include "bus-locator.h"
-#include "bus-wait-for-jobs.h"
-#include "conf-files.h"
#include "device-util.h"
-#include "edit-util.h"
#include "escape.h"
#include "ether-addr-util.h"
#include "ethtool-util.h"
#include "fd-util.h"
#include "format-table.h"
#include "format-util.h"
+#include "fs-util.h"
#include "geneve-util.h"
#include "glob-util.h"
#include "hwdb-util.h"
#include "netlink-util.h"
#include "network-internal.h"
#include "network-util.h"
+#include "networkctl.h"
+#include "networkctl-config-file.h"
#include "pager.h"
#include "parse-argument.h"
#include "parse-util.h"
#include "path-util.h"
#include "pretty-print.h"
#include "set.h"
+#include "sigbus.h"
#include "socket-netlink.h"
#include "socket-util.h"
#include "sort-util.h"
#include "strv.h"
#include "strxcpyx.h"
#include "terminal-util.h"
+#include "udev-util.h"
#include "unit-def.h"
#include "verbs.h"
-#include "virt.h"
#include "wifi-util.h"
/* Kernel defines MODULE_NAME_LEN as 64 - sizeof(unsigned long). So, 64 is enough. */
/* use 128 kB for receive socket kernel queue, we shouldn't need more here */
#define RCVBUF_SIZE (128*1024)
-static PagerFlags arg_pager_flags = 0;
-static bool arg_legend = true;
-static bool arg_no_reload = false;
-static bool arg_all = false;
-static bool arg_stats = false;
-static bool arg_full = false;
-static unsigned arg_lines = 10;
-static char *arg_drop_in = NULL;
-static JsonFormatFlags arg_json_format_flags = JSON_FORMAT_OFF;
+PagerFlags arg_pager_flags = 0;
+bool arg_legend = true;
+bool arg_no_reload = false;
+bool arg_all = false;
+bool arg_stats = false;
+bool arg_full = false;
+bool arg_runtime = false;
+unsigned arg_lines = 10;
+char *arg_drop_in = NULL;
+JsonFormatFlags arg_json_format_flags = JSON_FORMAT_OFF;
STATIC_DESTRUCTOR_REGISTER(arg_drop_in, freep);
return 0;
}
-static bool networkd_is_running(void) {
+bool networkd_is_running(void) {
static int cached = -1;
int r;
return cached;
}
-static int acquire_bus(sd_bus **ret) {
+int acquire_bus(sd_bus **ret) {
_cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
int r;
return -ENODATA;
}
-static int dump_list(Table *table, const char *prefix, char * const *l) {
+static int dump_list(Table *table, const char *key, char * const *l) {
int r;
assert(table);
+ assert(key);
if (strv_isempty(l))
return 0;
r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, prefix,
+ TABLE_FIELD, key,
TABLE_STRV, l);
if (r < 0)
return table_log_add_error(r);
return log_oom();
}
- return dump_list(table, "Gateway:", buf);
+ return dump_list(table, "Gateway", buf);
}
static int dump_addresses(
return log_oom();
}
- return dump_list(table, "Address:", buf);
+ return dump_list(table, "Address", buf);
}
static int dump_address_labels(sd_netlink *rtnl) {
assert(table);
assert(prefix);
- if (!ifindexes || ifindexes[0] <= 0)
+ if (!ifindexes)
return 0;
for (unsigned c = 0; ifindexes[c] > 0; c++) {
- r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, c == 0 ? prefix : "",
- TABLE_IFINDEX, ifindexes[c]);
+ if (c == 0)
+ r = table_add_cell(table, NULL, TABLE_FIELD, prefix);
+ else
+ r = table_add_cell(table, NULL, TABLE_EMPTY, NULL);
+ if (r < 0)
+ return table_log_add_error(r);
+
+ r = table_add_cell(table, NULL, TABLE_IFINDEX, &ifindexes[c]);
if (r < 0)
return table_log_add_error(r);
}
return 0;
}
-#define DUMP_STATS_ONE(name, val_name) \
- r = table_add_many(table, \
- TABLE_EMPTY, \
- TABLE_STRING, name ":"); \
- if (r < 0) \
- return table_log_add_error(r); \
- r = table_add_cell(table, NULL, \
- info->has_stats64 ? TABLE_UINT64 : TABLE_UINT32, \
- info->has_stats64 ? (void*) &info->stats64.val_name : (void*) &info->stats.val_name); \
- if (r < 0) \
- return table_log_add_error(r);
+#define DUMP_STATS_ONE(name, val_name) \
+ ({ \
+ r = table_add_cell(table, NULL, TABLE_FIELD, name); \
+ if (r < 0) \
+ return table_log_add_error(r); \
+ r = table_add_cell(table, NULL, \
+ info->has_stats64 ? TABLE_UINT64 : TABLE_UINT32, \
+ info->has_stats64 ? (void*) &info->stats64.val_name : (void*) &info->stats.val_name); \
+ if (r < 0) \
+ return table_log_add_error(r); \
+ })
static int dump_statistics(Table *table, const LinkInfo *info) {
int r;
if (addr->length == ETH_ALEN)
(void) ieee_oui(hwdb, &addr->ether, &description);
- r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, field);
+ r = table_add_cell(table, NULL, TABLE_FIELD, field);
if (r < 0)
return table_log_add_error(r);
return 0;
r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, key,
+ TABLE_FIELD, key,
TABLE_STRING, value);
if (r < 0)
return table_log_add_error(r);
_cleanup_free_ int *carrier_bound_to = NULL, *carrier_bound_by = NULL;
_cleanup_(sd_dhcp_lease_unrefp) sd_dhcp_lease *lease = NULL;
_cleanup_(table_unrefp) Table *table = NULL;
- TableCell *cell;
int r;
assert(bus);
(void) sd_device_get_property_value(info->sd_device, "ID_NET_DRIVER", &driver);
(void) sd_device_get_property_value(info->sd_device, "ID_PATH", &path);
-
- if (sd_device_get_property_value(info->sd_device, "ID_VENDOR_FROM_DATABASE", &vendor) < 0)
- (void) sd_device_get_property_value(info->sd_device, "ID_VENDOR", &vendor);
-
- if (sd_device_get_property_value(info->sd_device, "ID_MODEL_FROM_DATABASE", &model) < 0)
- (void) sd_device_get_property_value(info->sd_device, "ID_MODEL", &model);
+ (void) device_get_vendor_string(info->sd_device, &vendor);
+ (void) device_get_model_string(info->sd_device, &model);
}
r = net_get_type_string(info->sd_device, info->iftype, &t);
if (strv_prepend(&link_dropins, link) < 0)
return log_oom();
- table = table_new("dot", "key", "value");
+ table = table_new_vertical();
if (!table)
return log_oom();
if (arg_full)
table_set_width(table, 0);
- assert_se(cell = table_get_cell(table, 0, 0));
- (void) table_set_ellipsize_percent(table, cell, 100);
-
- assert_se(cell = table_get_cell(table, 0, 1));
- (void) table_set_ellipsize_percent(table, cell, 100);
-
- table_set_header(table, false);
-
- /* First line: circle, ifindex, ifname. */
- r = table_add_many(table,
- TABLE_STRING, special_glyph(SPECIAL_GLYPH_BLACK_CIRCLE),
- TABLE_SET_COLOR, on_color_operational);
- if (r < 0)
- return table_log_add_error(r);
- r = table_add_cell_stringf(table, &cell, "%i: %s", info->ifindex, info->name);
- if (r < 0)
- return table_log_add_error(r);
- r = table_add_many(table, TABLE_EMPTY);
- if (r < 0)
- return table_log_add_error(r);
-
- (void) table_set_align_percent(table, cell, 0);
-
/* unit files and basic states. */
r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "Link File:",
- TABLE_SET_ALIGN_PERCENT, 100,
+ TABLE_FIELD, "Link File",
TABLE_STRV, link_dropins ?: STRV_MAKE("n/a"),
- TABLE_EMPTY,
- TABLE_STRING, "Network File:",
+ TABLE_FIELD, "Network File",
TABLE_STRV, network_dropins ?: STRV_MAKE("n/a"),
- TABLE_EMPTY,
- TABLE_STRING, "State:");
+ TABLE_FIELD, "State");
if (r < 0)
return table_log_add_error(r);
return table_log_add_error(r);
r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "Online state:",
+ TABLE_FIELD, "Online state",
TABLE_STRING, online_state ?: "unknown",
TABLE_SET_COLOR, on_color_online);
if (r < 0)
return table_log_add_error(r);
- r = table_add_string_line(table, "Type:", t);
+ r = table_add_string_line(table, "Type", t);
if (r < 0)
return r;
- r = table_add_string_line(table, "Kind:", info->netdev_kind);
+ r = table_add_string_line(table, "Kind", info->netdev_kind);
if (r < 0)
return r;
- r = table_add_string_line(table, "Path:", path);
+ r = table_add_string_line(table, "Path", path);
if (r < 0)
return r;
- r = table_add_string_line(table, "Driver:", driver);
+ r = table_add_string_line(table, "Driver", driver);
if (r < 0)
return r;
- r = table_add_string_line(table, "Vendor:", vendor);
+ r = table_add_string_line(table, "Vendor", vendor);
if (r < 0)
return r;
- r = table_add_string_line(table, "Model:", model);
+ r = table_add_string_line(table, "Model", model);
if (r < 0)
return r;
strv_sort(info->alternative_names);
- r = dump_list(table, "Alternative Names:", info->alternative_names);
+ r = dump_list(table, "Alternative Names", info->alternative_names);
if (r < 0)
return r;
if (info->has_hw_address) {
- r = dump_hw_address(table, hwdb, "Hardware Address:", &info->hw_address);
+ r = dump_hw_address(table, hwdb, "Hardware Address", &info->hw_address);
if (r < 0)
return r;
}
if (info->has_permanent_hw_address) {
- r = dump_hw_address(table, hwdb, "Permanent Hardware Address:", &info->permanent_hw_address);
+ r = dump_hw_address(table, hwdb, "Permanent Hardware Address", &info->permanent_hw_address);
if (r < 0)
return r;
}
xsprintf(min_str, "%" PRIu32, info->min_mtu);
xsprintf(max_str, "%" PRIu32, info->max_mtu);
- r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "MTU:");
+ r = table_add_cell(table, NULL, TABLE_FIELD, "MTU");
if (r < 0)
return table_log_add_error(r);
+
r = table_add_cell_stringf(table, NULL, "%" PRIu32 "%s%s%s%s%s%s%s",
info->mtu,
info->min_mtu > 0 || info->max_mtu > 0 ? " (" : "",
return table_log_add_error(r);
}
- r = table_add_string_line(table, "QDisc:", info->qdisc);
+ r = table_add_string_line(table, "QDisc", info->qdisc);
if (r < 0)
return r;
if (info->master > 0) {
r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "Master:",
+ TABLE_FIELD, "Master",
TABLE_IFINDEX, info->master);
if (r < 0)
return table_log_add_error(r);
};
r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "IPv6 Address Generation Mode:",
+ TABLE_FIELD, "IPv6 Address Generation Mode",
TABLE_STRING, mode_table[info->addr_gen_mode]);
if (r < 0)
return table_log_add_error(r);
if (streq_ptr(info->netdev_kind, "bridge")) {
r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "Forward Delay:",
+ TABLE_FIELD, "Forward Delay",
TABLE_TIMESPAN_MSEC, jiffies_to_usec(info->forward_delay),
- TABLE_EMPTY,
- TABLE_STRING, "Hello Time:",
+ TABLE_FIELD, "Hello Time",
TABLE_TIMESPAN_MSEC, jiffies_to_usec(info->hello_time),
- TABLE_EMPTY,
- TABLE_STRING, "Max Age:",
+ TABLE_FIELD, "Max Age",
TABLE_TIMESPAN_MSEC, jiffies_to_usec(info->max_age),
- TABLE_EMPTY,
- TABLE_STRING, "Ageing Time:",
+ TABLE_FIELD, "Ageing Time",
TABLE_TIMESPAN_MSEC, jiffies_to_usec(info->ageing_time),
- TABLE_EMPTY,
- TABLE_STRING, "Priority:",
+ TABLE_FIELD, "Priority",
TABLE_UINT16, info->priority,
- TABLE_EMPTY,
- TABLE_STRING, "STP:",
+ TABLE_FIELD, "STP",
TABLE_BOOLEAN, info->stp_state > 0,
- TABLE_EMPTY,
- TABLE_STRING, "Multicast IGMP Version:",
+ TABLE_FIELD, "Multicast IGMP Version",
TABLE_UINT8, info->mcast_igmp_version,
- TABLE_EMPTY,
- TABLE_STRING, "Cost:",
+ TABLE_FIELD, "Cost",
TABLE_UINT32, info->cost);
if (r < 0)
return table_log_add_error(r);
if (info->port_state <= BR_STATE_BLOCKING) {
r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "Port State:",
+ TABLE_FIELD, "Port State",
TABLE_STRING, bridge_state_to_string(info->port_state));
if (r < 0)
return table_log_add_error(r);
} else if (streq_ptr(info->netdev_kind, "bond")) {
r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "Mode:",
+ TABLE_FIELD, "Mode",
TABLE_STRING, bond_mode_to_string(info->mode),
- TABLE_EMPTY,
- TABLE_STRING, "Miimon:",
+ TABLE_FIELD, "Miimon",
TABLE_TIMESPAN_MSEC, info->miimon * USEC_PER_MSEC,
- TABLE_EMPTY,
- TABLE_STRING, "Updelay:",
+ TABLE_FIELD, "Updelay",
TABLE_TIMESPAN_MSEC, info->updelay * USEC_PER_MSEC,
- TABLE_EMPTY,
- TABLE_STRING, "Downdelay:",
+ TABLE_FIELD, "Downdelay",
TABLE_TIMESPAN_MSEC, info->downdelay * USEC_PER_MSEC);
if (r < 0)
return table_log_add_error(r);
if (info->vxlan_info.vni > 0) {
r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "VNI:",
+ TABLE_FIELD, "VNI",
TABLE_UINT32, info->vxlan_info.vni);
if (r < 0)
return table_log_add_error(r);
r = in_addr_is_multicast(info->vxlan_info.group_family, &info->vxlan_info.group);
if (r <= 0)
- p = "Remote:";
+ p = "Remote";
else
- p = "Group:";
+ p = "Group";
r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, p,
- info->vxlan_info.group_family == AF_INET ? TABLE_IN_ADDR : TABLE_IN6_ADDR,
- &info->vxlan_info.group);
+ TABLE_FIELD, p,
+ info->vxlan_info.group_family == AF_INET ? TABLE_IN_ADDR : TABLE_IN6_ADDR, &info->vxlan_info.group);
if (r < 0)
return table_log_add_error(r);
}
if (IN_SET(info->vxlan_info.local_family, AF_INET, AF_INET6)) {
r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "Local:",
- info->vxlan_info.local_family == AF_INET ? TABLE_IN_ADDR : TABLE_IN6_ADDR,
- &info->vxlan_info.local);
+ TABLE_FIELD, "Local",
+ info->vxlan_info.local_family == AF_INET ? TABLE_IN_ADDR : TABLE_IN6_ADDR, &info->vxlan_info.local);
if (r < 0)
return table_log_add_error(r);
}
if (info->vxlan_info.dest_port > 0) {
r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "Destination Port:",
+ TABLE_FIELD, "Destination Port",
TABLE_UINT16, be16toh(info->vxlan_info.dest_port));
if (r < 0)
return table_log_add_error(r);
if (info->vxlan_info.link > 0) {
r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "Underlying Device:",
+ TABLE_FIELD, "Underlying Device",
TABLE_IFINDEX, info->vxlan_info.link);
if (r < 0)
return table_log_add_error(r);
}
r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "Learning:",
- TABLE_BOOLEAN, info->vxlan_info.learning);
- if (r < 0)
- return table_log_add_error(r);
-
- r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "RSC:",
- TABLE_BOOLEAN, info->vxlan_info.rsc);
- if (r < 0)
- return table_log_add_error(r);
-
- r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "L3MISS:",
- TABLE_BOOLEAN, info->vxlan_info.l3miss);
- if (r < 0)
- return table_log_add_error(r);
-
- r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "L2MISS:",
+ TABLE_FIELD, "Learning",
+ TABLE_BOOLEAN, info->vxlan_info.learning,
+ TABLE_FIELD, "RSC",
+ TABLE_BOOLEAN, info->vxlan_info.rsc,
+ TABLE_FIELD, "L3MISS",
+ TABLE_BOOLEAN, info->vxlan_info.l3miss,
+ TABLE_FIELD, "L2MISS",
TABLE_BOOLEAN, info->vxlan_info.l2miss);
if (r < 0)
return table_log_add_error(r);
if (info->vxlan_info.tos > 1) {
r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "TOS:",
+ TABLE_FIELD, "TOS",
TABLE_UINT8, info->vxlan_info.tos);
if (r < 0)
return table_log_add_error(r);
strcpy(ttl, "auto");
r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "TTL:",
+ TABLE_FIELD, "TTL",
TABLE_STRING, ttl);
if (r < 0)
return table_log_add_error(r);
} else if (streq_ptr(info->netdev_kind, "vlan") && info->vlan_id > 0) {
r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "VLan Id:",
+ TABLE_FIELD, "VLan Id",
TABLE_UINT16, info->vlan_id);
if (r < 0)
return table_log_add_error(r);
} else if (STRPTR_IN_SET(info->netdev_kind, "ipip", "sit", "gre", "gretap", "erspan", "vti")) {
if (in_addr_is_set(AF_INET, &info->local)) {
r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "Local:",
+ TABLE_FIELD, "Local",
TABLE_IN_ADDR, &info->local);
if (r < 0)
return table_log_add_error(r);
if (in_addr_is_set(AF_INET, &info->remote)) {
r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "Remote:",
+ TABLE_FIELD, "Remote",
TABLE_IN_ADDR, &info->remote);
if (r < 0)
return table_log_add_error(r);
} else if (STRPTR_IN_SET(info->netdev_kind, "ip6gre", "ip6gretap", "ip6erspan", "vti6")) {
if (in_addr_is_set(AF_INET6, &info->local)) {
r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "Local:",
+ TABLE_FIELD, "Local",
TABLE_IN6_ADDR, &info->local);
if (r < 0)
return table_log_add_error(r);
if (in_addr_is_set(AF_INET6, &info->remote)) {
r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "Remote:",
+ TABLE_FIELD, "Remote",
TABLE_IN6_ADDR, &info->remote);
if (r < 0)
return table_log_add_error(r);
} else if (streq_ptr(info->netdev_kind, "geneve")) {
r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "VNI:",
+ TABLE_FIELD, "VNI",
TABLE_UINT32, info->vni);
if (r < 0)
return table_log_add_error(r);
if (info->has_tunnel_ipv4 && in_addr_is_set(AF_INET, &info->remote)) {
r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "Remote:",
+ TABLE_FIELD, "Remote",
TABLE_IN_ADDR, &info->remote);
if (r < 0)
return table_log_add_error(r);
} else if (in_addr_is_set(AF_INET6, &info->remote)) {
r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "Remote:",
+ TABLE_FIELD, "Remote",
TABLE_IN6_ADDR, &info->remote);
if (r < 0)
return table_log_add_error(r);
if (info->ttl > 0) {
r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "TTL:",
+ TABLE_FIELD, "TTL",
TABLE_UINT8, info->ttl);
if (r < 0)
return table_log_add_error(r);
if (info->tos > 0) {
r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "TOS:",
+ TABLE_FIELD, "TOS",
TABLE_UINT8, info->tos);
if (r < 0)
return table_log_add_error(r);
}
r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "Port:",
- TABLE_UINT16, info->tunnel_port);
- if (r < 0)
- return table_log_add_error(r);
-
- r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "Inherit:",
+ TABLE_FIELD, "Port",
+ TABLE_UINT16, info->tunnel_port,
+ TABLE_FIELD, "Inherit",
TABLE_STRING, geneve_df_to_string(info->inherit));
if (r < 0)
return table_log_add_error(r);
if (info->df > 0) {
r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "IPDoNotFragment:",
+ TABLE_FIELD, "IPDoNotFragment",
TABLE_UINT8, info->df);
if (r < 0)
return table_log_add_error(r);
}
r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "UDPChecksum:",
- TABLE_BOOLEAN, info->csum);
- if (r < 0)
- return table_log_add_error(r);
-
- r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "UDP6ZeroChecksumTx:",
- TABLE_BOOLEAN, info->csum6_tx);
- if (r < 0)
- return table_log_add_error(r);
-
- r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "UDP6ZeroChecksumRx:",
+ TABLE_FIELD, "UDPChecksum",
+ TABLE_BOOLEAN, info->csum,
+ TABLE_FIELD, "UDP6ZeroChecksumTx",
+ TABLE_BOOLEAN, info->csum6_tx,
+ TABLE_FIELD, "UDP6ZeroChecksumRx",
TABLE_BOOLEAN, info->csum6_rx);
if (r < 0)
return table_log_add_error(r);
if (info->label > 0) {
r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "FlowLabel:",
+ TABLE_FIELD, "FlowLabel",
TABLE_UINT32, info->label);
if (r < 0)
return table_log_add_error(r);
} else if (STRPTR_IN_SET(info->netdev_kind, "macvlan", "macvtap")) {
r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "Mode:",
+ TABLE_FIELD, "Mode",
TABLE_STRING, macvlan_mode_to_string(info->macvlan_mode));
if (r < 0)
return table_log_add_error(r);
} else if (streq_ptr(info->netdev_kind, "ipvlan")) {
- _cleanup_free_ char *p = NULL, *s = NULL;
+ const char *p;
if (info->ipvlan_flags & IPVLAN_F_PRIVATE)
- p = strdup("private");
+ p = "private";
else if (info->ipvlan_flags & IPVLAN_F_VEPA)
- p = strdup("vepa");
+ p = "vepa";
else
- p = strdup("bridge");
- if (!p)
- log_oom();
+ p = "bridge";
- s = strjoin(ipvlan_mode_to_string(info->ipvlan_mode), " (", p, ")");
- if (!s)
- return log_oom();
+ r = table_add_cell(table, NULL, TABLE_FIELD, "Mode");
+ if (r < 0)
+ return table_log_add_error(r);
- r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "Mode:",
- TABLE_STRING, s);
+ r = table_add_cell_stringf(table, NULL, "%s (%s)",
+ ipvlan_mode_to_string(info->ipvlan_mode), p);
if (r < 0)
return table_log_add_error(r);
}
if (info->has_wlan_link_info) {
_cleanup_free_ char *esc = NULL;
- r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "WiFi access point:");
+ r = table_add_cell(table, NULL, TABLE_FIELD, "Wi-Fi access point");
if (r < 0)
return table_log_add_error(r);
}
if (info->has_bitrates) {
- r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "Bit Rate (Tx/Rx):");
+ r = table_add_cell(table, NULL, TABLE_FIELD, "Bit Rate (Tx/Rx)");
if (r < 0)
return table_log_add_error(r);
+
r = table_add_cell_stringf(table, NULL, "%sbps/%sbps",
FORMAT_BYTES_FULL(info->tx_bitrate, 0),
FORMAT_BYTES_FULL(info->rx_bitrate, 0));
}
if (info->has_tx_queues || info->has_rx_queues) {
- r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "Number of Queues (Tx/Rx):");
+ r = table_add_cell(table, NULL, TABLE_FIELD, "Number of Queues (Tx/Rx)");
if (r < 0)
return table_log_add_error(r);
+
r = table_add_cell_stringf(table, NULL, "%" PRIu32 "/%" PRIu32, info->tx_queues, info->rx_queues);
if (r < 0)
return table_log_add_error(r);
if (info->has_ethtool_link_info) {
if (IN_SET(info->autonegotiation, AUTONEG_DISABLE, AUTONEG_ENABLE)) {
r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "Auto negotiation:",
+ TABLE_FIELD, "Auto negotiation",
TABLE_BOOLEAN, info->autonegotiation == AUTONEG_ENABLE);
if (r < 0)
return table_log_add_error(r);
if (info->speed > 0 && info->speed != UINT64_MAX) {
r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "Speed:",
+ TABLE_FIELD, "Speed",
TABLE_BPS, info->speed);
if (r < 0)
return table_log_add_error(r);
}
- r = table_add_string_line(table, "Duplex:", duplex_to_string(info->duplex));
+ r = table_add_string_line(table, "Duplex", duplex_to_string(info->duplex));
if (r < 0)
return r;
- r = table_add_string_line(table, "Port:", port_to_string(info->port));
+ r = table_add_string_line(table, "Port", port_to_string(info->port));
if (r < 0)
return r;
}
r = dump_addresses(rtnl, lease, table, info->ifindex);
if (r < 0)
return r;
+
r = dump_gateways(rtnl, hwdb, table, info->ifindex);
if (r < 0)
return r;
- r = dump_list(table, "DNS:", dns);
+
+ r = dump_list(table, "DNS", dns);
if (r < 0)
return r;
- r = dump_list(table, "Search Domains:", search_domains);
+
+ r = dump_list(table, "Search Domains", search_domains);
if (r < 0)
return r;
- r = dump_list(table, "Route Domains:", route_domains);
+
+ r = dump_list(table, "Route Domains", route_domains);
if (r < 0)
return r;
- r = dump_list(table, "NTP:", ntp);
+
+ r = dump_list(table, "NTP", ntp);
if (r < 0)
return r;
- r = dump_list(table, "SIP:", sip);
+
+ r = dump_list(table, "SIP", sip);
if (r < 0)
return r;
- r = dump_ifindexes(table, "Carrier Bound To:", carrier_bound_to);
+
+ r = dump_ifindexes(table, "Carrier Bound To", carrier_bound_to);
if (r < 0)
return r;
- r = dump_ifindexes(table, "Carrier Bound By:", carrier_bound_by);
+
+ r = dump_ifindexes(table, "Carrier Bound By", carrier_bound_by);
if (r < 0)
return r;
- r = table_add_string_line(table, "Activation Policy:", activation_policy);
+ r = table_add_string_line(table, "Activation Policy", activation_policy);
if (r < 0)
return r;
r = sd_network_link_get_required_for_online(info->ifindex);
if (r >= 0) {
r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "Required For Online:",
+ TABLE_FIELD, "Required For Online",
TABLE_BOOLEAN, r);
if (r < 0)
return table_log_add_error(r);
if (captive_portal) {
r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "Captive Portal:",
+ TABLE_FIELD, "Captive Portal",
TABLE_STRING, captive_portal,
TABLE_SET_URL, captive_portal);
if (r < 0)
r = sd_dhcp_lease_get_timezone(lease, &tz);
if (r >= 0) {
r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "Time Zone:",
+ TABLE_FIELD, "Time Zone",
TABLE_STRING, tz);
if (r < 0)
return table_log_add_error(r);
r = sd_dhcp_client_id_to_string(client_id, client_id_len, &id);
if (r >= 0) {
r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "DHCP4 Client ID:",
+ TABLE_FIELD, "DHCP4 Client ID",
TABLE_STRING, id);
if (r < 0)
return table_log_add_error(r);
r = sd_network_link_get_dhcp6_client_iaid_string(info->ifindex, &iaid);
if (r >= 0) {
r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "DHCP6 Client IAID:",
+ TABLE_FIELD, "DHCP6 Client IAID",
TABLE_STRING, iaid);
if (r < 0)
return table_log_add_error(r);
r = sd_network_link_get_dhcp6_client_duid_string(info->ifindex, &duid);
if (r >= 0) {
r = table_add_many(table,
- TABLE_EMPTY,
- TABLE_STRING, "DHCP6 Client DUID:",
+ TABLE_FIELD, "DHCP6 Client DUID",
TABLE_STRING, duid);
if (r < 0)
return table_log_add_error(r);
}
- r = dump_lldp_neighbors(table, "Connected To:", info->ifindex);
+ r = dump_lldp_neighbors(table, "Connected To", info->ifindex);
if (r < 0)
return r;
- r = dump_dhcp_leases(table, "Offered DHCP leases:", bus, info);
+ r = dump_dhcp_leases(table, "Offered DHCP leases", bus, info);
if (r < 0)
return r;
if (r < 0)
return r;
+ /* First line: circle, ifindex, ifname. */
+ printf("%s%s%s %d: %s\n",
+ on_color_operational, special_glyph(SPECIAL_GLYPH_BLACK_CIRCLE), off_color_operational,
+ info->ifindex, info->name);
+
r = table_print(table, NULL);
if (r < 0)
return table_log_print_error(r);
}
static int system_status(sd_netlink *rtnl, sd_hwdb *hwdb) {
- _cleanup_free_ char *operational_state = NULL, *online_state = NULL;
- _cleanup_strv_free_ char **dns = NULL, **ntp = NULL, **search_domains = NULL, **route_domains = NULL;
- const char *on_color_operational, *on_color_online;
+ _cleanup_free_ char *operational_state = NULL, *online_state = NULL, *netifs_joined = NULL;
+ _cleanup_strv_free_ char **netifs = NULL, **dns = NULL, **ntp = NULL, **search_domains = NULL, **route_domains = NULL;
+ const char *on_color_operational, *off_color_operational, *on_color_online;
_cleanup_(table_unrefp) Table *table = NULL;
- TableCell *cell;
int r;
assert(rtnl);
(void) sd_network_get_operational_state(&operational_state);
- operational_state_to_color(NULL, operational_state, &on_color_operational, NULL);
+ operational_state_to_color(NULL, operational_state, &on_color_operational, &off_color_operational);
(void) sd_network_get_online_state(&online_state);
online_state_to_color(online_state, &on_color_online, NULL);
- table = table_new("dot", "key", "value");
+ table = table_new_vertical();
if (!table)
return log_oom();
if (arg_full)
table_set_width(table, 0);
- assert_se(cell = table_get_cell(table, 0, 0));
- (void) table_set_ellipsize_percent(table, cell, 100);
-
- assert_se(cell = table_get_cell(table, 0, 1));
- (void) table_set_align_percent(table, cell, 100);
- (void) table_set_ellipsize_percent(table, cell, 100);
-
- table_set_header(table, false);
+ r = get_files_in_directory("/run/systemd/netif/links/", &netifs);
+ if (r < 0 && r != -ENOENT)
+ return log_error_errno(r, "Failed to list network interfaces: %m");
+ else if (r > 0) {
+ netifs_joined = strv_join(netifs, ", ");
+ if (!netifs_joined)
+ return log_oom();
+ }
r = table_add_many(table,
- TABLE_STRING, special_glyph(SPECIAL_GLYPH_BLACK_CIRCLE),
- TABLE_SET_COLOR, on_color_operational,
- TABLE_STRING, "State:",
+ TABLE_FIELD, "State",
TABLE_STRING, strna(operational_state),
TABLE_SET_COLOR, on_color_operational,
- TABLE_EMPTY,
- TABLE_STRING, "Online state:",
+ TABLE_FIELD, "Online state",
TABLE_STRING, online_state ?: "unknown",
TABLE_SET_COLOR, on_color_online);
if (r < 0)
r = dump_addresses(rtnl, NULL, table, 0);
if (r < 0)
return r;
+
r = dump_gateways(rtnl, hwdb, table, 0);
if (r < 0)
return r;
(void) sd_network_get_dns(&dns);
- r = dump_list(table, "DNS:", dns);
+ r = dump_list(table, "DNS", dns);
if (r < 0)
return r;
(void) sd_network_get_search_domains(&search_domains);
- r = dump_list(table, "Search Domains:", search_domains);
+ r = dump_list(table, "Search Domains", search_domains);
if (r < 0)
return r;
(void) sd_network_get_route_domains(&route_domains);
- r = dump_list(table, "Route Domains:", route_domains);
+ r = dump_list(table, "Route Domains", route_domains);
if (r < 0)
return r;
(void) sd_network_get_ntp(&ntp);
- r = dump_list(table, "NTP:", ntp);
+ r = dump_list(table, "NTP", ntp);
if (r < 0)
return r;
+ printf("%s%s%s Interfaces: %s\n",
+ on_color_operational, special_glyph(SPECIAL_GLYPH_BLACK_CIRCLE), off_color_operational,
+ strna(netifs_joined));
+
r = table_print(table, NULL);
if (r < 0)
return table_log_print_error(r);
if (c < 0)
return c;
- for (int i = 0; i < c; i++) {
- if (i > 0)
- fputc('\n', stdout);
+ r = 0;
+
+ bool first = true;
+ FOREACH_ARRAY(i, links, c) {
+ if (!first)
+ putchar('\n');
+
+ RET_GATHER(r, link_status_one(bus, rtnl, hwdb, i));
- link_status_one(bus, rtnl, hwdb, links + i);
+ first = false;
}
- return 0;
+ return r;
}
static char *lldp_capabilities_to_string(uint16_t x) {
static int link_renew(int argc, char *argv[], void *userdata) {
_cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
_cleanup_(sd_netlink_unrefp) sd_netlink *rtnl = NULL;
- int index, k = 0, r;
+ int r;
r = acquire_bus(&bus);
if (r < 0)
return r;
+ r = 0;
+
for (int i = 1; i < argc; i++) {
+ int index;
+
index = rtnl_resolve_interface_or_warn(&rtnl, argv[i]);
if (index < 0)
return index;
- r = link_renew_one(bus, index, argv[i]);
- if (r < 0 && k >= 0)
- k = r;
+ RET_GATHER(r, link_renew_one(bus, index, argv[i]));
}
- return k;
+ return r;
}
static int link_force_renew_one(sd_bus *bus, int index, const char *name) {
return 0;
}
-typedef enum ReloadFlags {
- RELOAD_NETWORKD = 1 << 0,
- RELOAD_UDEVD = 1 << 1,
-} ReloadFlags;
-
-static int get_config_files_by_name(const char *name, char **ret_path, char ***ret_dropins) {
- _cleanup_free_ char *path = NULL;
- int r;
-
- assert(name);
- assert(ret_path);
-
- STRV_FOREACH(i, NETWORK_DIRS) {
- _cleanup_free_ char *p = NULL;
-
- p = path_join(*i, name);
- if (!p)
- return -ENOMEM;
-
- r = RET_NERRNO(access(p, F_OK));
- if (r >= 0) {
- path = TAKE_PTR(p);
- break;
- }
-
- if (r != -ENOENT)
- log_debug_errno(r, "Failed to determine whether '%s' exists, ignoring: %m", p);
- }
-
- if (!path)
- return -ENOENT;
-
- if (ret_dropins) {
- _cleanup_free_ char *dropin_dirname = NULL;
-
- dropin_dirname = strjoin(name, ".d");
- if (!dropin_dirname)
- return -ENOMEM;
-
- r = conf_files_list_dropins(ret_dropins, dropin_dirname, /* root = */ NULL, NETWORK_DIRS);
- if (r < 0)
- return r;
- }
-
- *ret_path = TAKE_PTR(path);
-
- return 0;
-}
-
-static int get_dropin_by_name(
- const char *name,
- char * const *dropins,
- char **ret) {
-
- assert(name);
- assert(dropins);
- assert(ret);
-
- STRV_FOREACH(i, dropins)
- if (path_equal_filename(*i, name)) {
- _cleanup_free_ char *d = NULL;
-
- d = strdup(*i);
- if (!d)
- return -ENOMEM;
-
- *ret = TAKE_PTR(d);
- return 1;
- }
-
- *ret = NULL;
- return 0;
-}
-
-static int get_network_files_by_link(
- sd_netlink **rtnl,
- const char *link,
- char **ret_path,
- char ***ret_dropins) {
-
- _cleanup_strv_free_ char **dropins = NULL;
- _cleanup_free_ char *path = NULL;
- int r, ifindex;
-
- assert(rtnl);
- assert(link);
- assert(ret_path);
- assert(ret_dropins);
-
- ifindex = rtnl_resolve_interface_or_warn(rtnl, link);
- if (ifindex < 0)
- return ifindex;
-
- r = sd_network_link_get_network_file(ifindex, &path);
- if (r == -ENODATA)
- return log_error_errno(SYNTHETIC_ERRNO(ENOENT),
- "Link '%s' has no associated network file.", link);
- if (r < 0)
- return log_error_errno(r, "Failed to get network file for link '%s': %m", link);
-
- r = sd_network_link_get_network_file_dropins(ifindex, &dropins);
- if (r < 0 && r != -ENODATA)
- return log_error_errno(r, "Failed to get network drop-ins for link '%s': %m", link);
-
- *ret_path = TAKE_PTR(path);
- *ret_dropins = TAKE_PTR(dropins);
-
- return 0;
-}
-
-static int get_link_files_by_link(const char *link, char **ret_path, char ***ret_dropins) {
- _cleanup_(sd_device_unrefp) sd_device *device = NULL;
- _cleanup_strv_free_ char **dropins_split = NULL;
- _cleanup_free_ char *p = NULL;
- const char *path, *dropins;
- int r;
-
- assert(link);
- assert(ret_path);
- assert(ret_dropins);
-
- r = sd_device_new_from_ifname(&device, link);
- if (r < 0)
- return log_error_errno(r, "Failed to create sd-device object for link '%s': %m", link);
-
- r = sd_device_get_property_value(device, "ID_NET_LINK_FILE", &path);
- if (r == -ENOENT)
- return log_error_errno(r, "Link '%s' has no associated link file.", link);
- if (r < 0)
- return log_error_errno(r, "Failed to get link file for link '%s': %m", link);
-
- r = sd_device_get_property_value(device, "ID_NET_LINK_FILE_DROPINS", &dropins);
- if (r < 0 && r != -ENOENT)
- return log_error_errno(r, "Failed to get link drop-ins for link '%s': %m", link);
- if (r >= 0) {
- r = strv_split_full(&dropins_split, dropins, ":", EXTRACT_CUNESCAPE);
- if (r < 0)
- return log_error_errno(r, "Failed to parse link drop-ins for link '%s': %m", link);
- }
-
- p = strdup(path);
- if (!p)
- return log_oom();
-
- *ret_path = TAKE_PTR(p);
- *ret_dropins = TAKE_PTR(dropins_split);
-
- return 0;
-}
-
-static int get_config_files_by_link_config(
- const char *link_config,
- sd_netlink **rtnl,
- char **ret_path,
- char ***ret_dropins,
- ReloadFlags *ret_reload) {
-
- _cleanup_strv_free_ char **dropins = NULL, **link_config_split = NULL;
- _cleanup_free_ char *path = NULL;
- const char *ifname, *type;
- ReloadFlags reload;
- size_t n;
- int r;
-
- assert(link_config);
- assert(rtnl);
- assert(ret_path);
- assert(ret_dropins);
-
- link_config_split = strv_split(link_config, ":");
- if (!link_config_split)
- return log_oom();
-
- n = strv_length(link_config_split);
- if (n == 0 || isempty(link_config_split[0]))
- return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "No link name is given.");
- if (n > 2)
- return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Invalid link config '%s'.", link_config);
-
- ifname = link_config_split[0];
- type = n == 2 ? link_config_split[1] : "network";
-
- if (streq(type, "network")) {
- if (!networkd_is_running())
- return log_error_errno(SYNTHETIC_ERRNO(ESRCH),
- "Cannot get network file for link if systemd-networkd is not running.");
-
- r = get_network_files_by_link(rtnl, ifname, &path, &dropins);
- if (r < 0)
- return r;
-
- reload = RELOAD_NETWORKD;
- } else if (streq(type, "link")) {
- r = get_link_files_by_link(ifname, &path, &dropins);
- if (r < 0)
- return r;
-
- reload = RELOAD_UDEVD;
- } else
- return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
- "Invalid config type '%s' for link '%s'.", type, ifname);
-
- *ret_path = TAKE_PTR(path);
- *ret_dropins = TAKE_PTR(dropins);
-
- if (ret_reload)
- *ret_reload = reload;
-
- return 0;
-}
-
-static int add_config_to_edit(
- EditFileContext *context,
- const char *path,
- char * const *dropins) {
-
- _cleanup_free_ char *new_path = NULL, *dropin_path = NULL, *old_dropin = NULL;
- _cleanup_strv_free_ char **comment_paths = NULL;
- int r;
-
- assert(context);
- assert(path);
- assert(!arg_drop_in || dropins);
-
- if (path_startswith(path, "/usr")) {
- _cleanup_free_ char *name = NULL;
-
- r = path_extract_filename(path, &name);
- if (r < 0)
- return log_error_errno(r, "Failed to extract filename from '%s': %m", path);
-
- new_path = path_join(NETWORK_DIRS[0], name);
- if (!new_path)
- return log_oom();
- }
-
- if (!arg_drop_in)
- return edit_files_add(context, new_path ?: path, path, NULL);
-
- r = get_dropin_by_name(arg_drop_in, dropins, &old_dropin);
- if (r < 0)
- return log_error_errno(r, "Failed to acquire drop-in '%s': %m", arg_drop_in);
-
- if (r > 0 && !path_startswith(old_dropin, "/usr"))
- /* An existing drop-in is found and not in /usr/. Let's edit it directly. */
- dropin_path = TAKE_PTR(old_dropin);
- else {
- /* No drop-in was found or an existing drop-in resides in /usr/. Let's create
- * a new drop-in file. */
- dropin_path = strjoin(new_path ?: path, ".d/", arg_drop_in);
- if (!dropin_path)
- return log_oom();
- }
-
- comment_paths = strv_new(path);
- if (!comment_paths)
- return log_oom();
-
- r = strv_extend_strv(&comment_paths, dropins, /* filter_duplicates = */ false);
- if (r < 0)
- return log_oom();
-
- return edit_files_add(context, dropin_path, old_dropin, comment_paths);
-}
-
-static int udevd_reload(sd_bus *bus) {
- _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
- _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
- _cleanup_(bus_wait_for_jobs_freep) BusWaitForJobs *w = NULL;
- const char *job_path;
- int r;
-
- assert(bus);
-
- r = bus_wait_for_jobs_new(bus, &w);
- if (r < 0)
- return log_error_errno(r, "Could not watch jobs: %m");
-
- r = bus_call_method(bus,
- bus_systemd_mgr,
- "ReloadUnit",
- &error,
- &reply,
- "ss",
- "systemd-udevd.service",
- "replace");
- if (r < 0)
- return log_error_errno(r, "Failed to reload systemd-udevd: %s", bus_error_message(&error, r));
-
- r = sd_bus_message_read(reply, "o", &job_path);
- if (r < 0)
- return bus_log_parse_error(r);
-
- r = bus_wait_for_jobs_one(w, job_path, /* quiet = */ true, NULL);
- if (r == -ENOEXEC) {
- log_debug("systemd-udevd is not running, skipping reload.");
- return 0;
- }
- if (r < 0)
- return log_error_errno(r, "Failed to reload systemd-udevd: %m");
-
- return 1;
-}
-
-static int verb_edit(int argc, char *argv[], void *userdata) {
- _cleanup_(edit_file_context_done) EditFileContext context = {
- .marker_start = DROPIN_MARKER_START,
- .marker_end = DROPIN_MARKER_END,
- .remove_parent = !!arg_drop_in,
- };
- _cleanup_(sd_netlink_unrefp) sd_netlink *rtnl = NULL;
- ReloadFlags reload = 0;
- int r;
-
- if (!on_tty())
- return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Cannot edit network config files if not on a tty.");
-
- r = mac_selinux_init();
- if (r < 0)
- return r;
-
- STRV_FOREACH(name, strv_skip(argv, 1)) {
- _cleanup_strv_free_ char **dropins = NULL;
- _cleanup_free_ char *path = NULL;
- const char *link_config;
-
- link_config = startswith(*name, "@");
- if (link_config) {
- ReloadFlags flags;
-
- r = get_config_files_by_link_config(link_config, &rtnl, &path, &dropins, &flags);
- if (r < 0)
- return r;
-
- reload |= flags;
-
- r = add_config_to_edit(&context, path, dropins);
- if (r < 0)
- return r;
-
- continue;
- }
-
- if (ENDSWITH_SET(*name, ".network", ".netdev"))
- reload |= RELOAD_NETWORKD;
- else if (endswith(*name, ".link"))
- reload |= RELOAD_UDEVD;
- else
- return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Invalid network config name '%s'.", *name);
-
- r = get_config_files_by_name(*name, &path, &dropins);
- if (r == -ENOENT) {
- if (arg_drop_in)
- return log_error_errno(r, "Cannot find network config '%s'.", *name);
-
- log_debug("No existing network config '%s' found, creating a new file.", *name);
-
- path = path_join(NETWORK_DIRS[0], *name);
- if (!path)
- return log_oom();
-
- r = edit_files_add(&context, path, NULL, NULL);
- if (r < 0)
- return r;
- continue;
- }
- if (r < 0)
- return log_error_errno(r, "Failed to get the path of network config '%s': %m", *name);
-
- r = add_config_to_edit(&context, path, dropins);
- if (r < 0)
- return r;
- }
-
- r = do_edit_files_and_install(&context);
- if (r < 0)
- return r;
-
- if (arg_no_reload)
- return 0;
-
- if (!sd_booted() || running_in_chroot() > 0) {
- log_debug("System is not booted with systemd or is running in chroot, skipping reload.");
- return 0;
- }
-
- _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
-
- r = sd_bus_open_system(&bus);
- if (r < 0)
- return log_error_errno(r, "Failed to connect to system bus: %m");
-
- if (FLAGS_SET(reload, RELOAD_UDEVD)) {
- r = udevd_reload(bus);
- if (r < 0)
- return r;
- }
-
- if (FLAGS_SET(reload, RELOAD_NETWORKD)) {
- _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
-
- if (!networkd_is_running()) {
- log_debug("systemd-networkd is not running, skipping reload.");
- return 0;
- }
-
- r = bus_call_method(bus, bus_network_mgr, "Reload", &error, NULL, NULL);
- if (r < 0)
- return log_error_errno(r, "Failed to reload systemd-networkd: %s", bus_error_message(&error, r));
- }
-
- return 0;
-}
-
-static int verb_cat(int argc, char *argv[], void *userdata) {
- _cleanup_(sd_netlink_unrefp) sd_netlink *rtnl = NULL;
- int r, ret = 0;
-
- pager_open(arg_pager_flags);
-
- STRV_FOREACH(name, strv_skip(argv, 1)) {
- _cleanup_strv_free_ char **dropins = NULL;
- _cleanup_free_ char *path = NULL;
- const char *link_config;
-
- link_config = startswith(*name, "@");
- if (link_config) {
- r = get_config_files_by_link_config(link_config, &rtnl, &path, &dropins, /* ret_reload = */ NULL);
- if (r < 0)
- return ret < 0 ? ret : r;
- } else {
- r = get_config_files_by_name(*name, &path, &dropins);
- if (r == -ENOENT) {
- log_error_errno(r, "Cannot find network config file '%s'.", *name);
- ret = ret < 0 ? ret : r;
- continue;
- }
- if (r < 0) {
- log_error_errno(r, "Failed to get the path of network config '%s': %m", *name);
- return ret < 0 ? ret : r;
- }
- }
-
- r = cat_files(path, dropins, /* flags = */ 0);
- if (r < 0)
- return ret < 0 ? ret : r;
- }
-
- return ret;
-}
-
static int help(void) {
_cleanup_free_ char *link = NULL;
int r;
" reload Reload .network and .netdev files\n"
" edit FILES|DEVICES... Edit network configuration files\n"
" cat FILES|DEVICES... Show network configuration files\n"
+ " mask FILES... Mask network configuration files\n"
+ " unmask FILES... Unmask network configuration files\n"
"\nOptions:\n"
" -h --help Show this help\n"
" --version Show package version\n"
" --no-reload Do not reload systemd-networkd or systemd-udevd\n"
" after editing network config\n"
" --drop-in=NAME Edit specified drop-in instead of main config file\n"
+ " --runtime Edit runtime config files\n"
"\nSee the %s for details.\n",
program_invocation_short_name,
ansi_highlight(),
ARG_JSON,
ARG_NO_RELOAD,
ARG_DROP_IN,
+ ARG_RUNTIME,
};
static const struct option options[] = {
{ "json", required_argument, NULL, ARG_JSON },
{ "no-reload", no_argument, NULL, ARG_NO_RELOAD },
{ "drop-in", required_argument, NULL, ARG_DROP_IN },
+ { "runtime", no_argument, NULL, ARG_RUNTIME },
{}
};
arg_no_reload = true;
break;
+ case ARG_RUNTIME:
+ arg_runtime = true;
+ break;
+
case ARG_DROP_IN:
if (isempty(optarg))
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Empty drop-in file name.");
{ "reload", 1, 1, VERB_ONLINE_ONLY, verb_reload },
{ "edit", 2, VERB_ANY, 0, verb_edit },
{ "cat", 2, VERB_ANY, 0, verb_cat },
+ { "mask", 2, VERB_ANY, 0, verb_mask },
+ { "unmask", 2, VERB_ANY, 0, verb_unmask },
{}
};
log_setup();
+ sigbus_install();
+
r = parse_argv(argc, argv);
if (r <= 0)
return r;
projects / thirdparty / systemd.git / blobdiff