diff options
71 files changed, 66 insertions, 69 deletions
diff --git a/src/grp-initprogs/systemd-fsck/fsck.c b/src/grp-initprogs/systemd-fsck/fsck.c index e8530043b3..9dfb23116f 100644 --- a/src/grp-initprogs/systemd-fsck/fsck.c +++ b/src/grp-initprogs/systemd-fsck/fsck.c @@ -32,7 +32,6 @@ #include "sd-bus/bus-common-errors.h" #include "sd-bus/bus-error.h" #include "sd-device/device-util.h" -#include "sd-device/sd-device.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/fd-util.h" #include "systemd-basic/fs-util.h" @@ -46,6 +45,7 @@ #include "systemd-basic/stdio-util.h" #include "systemd-basic/util.h" #include "systemd-shared/bus-util.h" +#include "systemd-staging/sd-device.h" /* exit codes as defined in fsck(8) */ enum { diff --git a/src/libmachine-core/include/machine-core/image-dbus.h b/src/grp-machine/libmachine-core/include/machine-core/image-dbus.h index b62da996c6..b62da996c6 100644 --- a/src/libmachine-core/include/machine-core/image-dbus.h +++ b/src/grp-machine/libmachine-core/include/machine-core/image-dbus.h diff --git a/src/libmachine-core/include/machine-core/machine-dbus.h b/src/grp-machine/libmachine-core/include/machine-core/machine-dbus.h index d3faf5cb07..d3faf5cb07 100644 --- a/src/libmachine-core/include/machine-core/machine-dbus.h +++ b/src/grp-machine/libmachine-core/include/machine-core/machine-dbus.h diff --git a/src/libmachine-core/include/machine-core/machine.h b/src/grp-machine/libmachine-core/include/machine-core/machine.h index 361451b1c8..361451b1c8 100644 --- a/src/libmachine-core/include/machine-core/machine.h +++ b/src/grp-machine/libmachine-core/include/machine-core/machine.h diff --git a/src/libmachine-core/include/machine-core/machined.h b/src/grp-machine/libmachine-core/include/machine-core/machined.h index 8994097db0..8994097db0 100644 --- a/src/libmachine-core/include/machine-core/machined.h +++ b/src/grp-machine/libmachine-core/include/machine-core/machined.h diff --git a/src/libmachine-core/include/machine-core/operation.h b/src/grp-machine/libmachine-core/include/machine-core/operation.h index 5eed62bd6f..5eed62bd6f 100644 --- a/src/libmachine-core/include/machine-core/operation.h +++ b/src/grp-machine/libmachine-core/include/machine-core/operation.h diff --git a/src/libmachine-core/src/image-dbus.c b/src/grp-machine/libmachine-core/src/image-dbus.c index cee2d2d7f2..cee2d2d7f2 100644 --- a/src/libmachine-core/src/image-dbus.c +++ b/src/grp-machine/libmachine-core/src/image-dbus.c diff --git a/src/libmachine-core/src/machine-dbus.c b/src/grp-machine/libmachine-core/src/machine-dbus.c index b18d851898..b18d851898 100644 --- a/src/libmachine-core/src/machine-dbus.c +++ b/src/grp-machine/libmachine-core/src/machine-dbus.c diff --git a/src/libmachine-core/src/machine.c b/src/grp-machine/libmachine-core/src/machine.c index 9eca08948f..9eca08948f 100644 --- a/src/libmachine-core/src/machine.c +++ b/src/grp-machine/libmachine-core/src/machine.c diff --git a/src/libmachine-core/src/machined-dbus.c b/src/grp-machine/libmachine-core/src/machined-dbus.c index 9a50dcbaa8..9a50dcbaa8 100644 --- a/src/libmachine-core/src/machined-dbus.c +++ b/src/grp-machine/libmachine-core/src/machined-dbus.c diff --git a/src/libmachine-core/src/operation.c b/src/grp-machine/libmachine-core/src/operation.c index 715e867e4f..715e867e4f 100644 --- a/src/libmachine-core/src/operation.c +++ b/src/grp-machine/libmachine-core/src/operation.c diff --git a/src/libmachine-core/test/test-machine-tables.c b/src/grp-machine/libmachine-core/test/test-machine-tables.c index 5f50c3856b..5f50c3856b 100644 --- a/src/libmachine-core/test/test-machine-tables.c +++ b/src/grp-machine/libmachine-core/test/test-machine-tables.c diff --git a/src/grp-network/libnetworkd-core/networkd-link.h b/src/grp-network/libnetworkd-core/networkd-link.h index 81783e8d22..96315fa57f 100644 --- a/src/grp-network/libnetworkd-core/networkd-link.h +++ b/src/grp-network/libnetworkd-core/networkd-link.h @@ -23,7 +23,6 @@ #include <systemd/sd-bus.h> -#include "sd-netlink/sd-netlink.h" #include "systemd-basic/list.h" #include "systemd-basic/set.h" #include "systemd-network/sd-dhcp-client.h" @@ -32,6 +31,7 @@ #include "systemd-network/sd-ipv4ll.h" #include "systemd-network/sd-lldp.h" #include "systemd-network/sd-ndisc.h" +#include "systemd-staging/sd-netlink.h" typedef enum LinkState { LINK_STATE_PENDING, diff --git a/src/grp-network/libnetworkd-core/networkd-manager.c b/src/grp-network/libnetworkd-core/networkd-manager.c index e8c64ea0be..255217f07c 100644 --- a/src/grp-network/libnetworkd-core/networkd-manager.c +++ b/src/grp-network/libnetworkd-core/networkd-manager.c @@ -26,7 +26,6 @@ #include "libudev-private.h" #include "sd-netlink/local-addresses.h" #include "sd-netlink/netlink-util.h" -#include "sd-netlink/sd-netlink.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/def.h" #include "systemd-basic/fd-util.h" @@ -39,6 +38,7 @@ #include "systemd-shared/conf-parser.h" #include "systemd-shared/dns-domain.h" #include "systemd-shared/udev-util.h" +#include "systemd-staging/sd-netlink.h" #include "networkd.h" diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-bond.c b/src/grp-network/libnetworkd-core/networkd-netdev-bond.c index 873b5e056d..de6210d76a 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev-bond.c +++ b/src/grp-network/libnetworkd-core/networkd-netdev-bond.c @@ -22,13 +22,13 @@ #include <linux/if_bonding.h> -#include "sd-netlink/sd-netlink.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/extract-word.h" #include "systemd-basic/missing.h" #include "systemd-basic/string-table.h" #include "systemd-basic/string-util.h" #include "systemd-shared/conf-parser.h" +#include "systemd-staging/sd-netlink.h" #include "networkd-netdev-bond.h" diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c b/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c index 5823487241..44a6d9f4e9 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c +++ b/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c @@ -24,13 +24,13 @@ #include <linux/if_tunnel.h> #include <linux/ip6_tunnel.h> -#include "sd-netlink/sd-netlink.h" #include "systemd-basic/missing.h" #include "systemd-basic/parse-util.h" #include "systemd-basic/string-table.h" #include "systemd-basic/string-util.h" #include "systemd-basic/util.h" #include "systemd-shared/conf-parser.h" +#include "systemd-staging/sd-netlink.h" #include "networkd-link.h" #include "networkd-netdev-tunnel.h" diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-veth.c b/src/grp-network/libnetworkd-core/networkd-netdev-veth.c index fb068c75bf..171fe4012a 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev-veth.c +++ b/src/grp-network/libnetworkd-core/networkd-netdev-veth.c @@ -21,7 +21,7 @@ #include <linux/veth.h> -#include "sd-netlink/sd-netlink.h" +#include "systemd-staging/sd-netlink.h" #include "networkd-netdev-veth.h" diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-vrf.c b/src/grp-network/libnetworkd-core/networkd-netdev-vrf.c index 9affa6f947..c9b281d185 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev-vrf.c +++ b/src/grp-network/libnetworkd-core/networkd-netdev-vrf.c @@ -19,8 +19,8 @@ #include <net/if.h> -#include "sd-netlink/sd-netlink.h" #include "systemd-basic/missing.h" +#include "systemd-staging/sd-netlink.h" #include "networkd-netdev-vrf.h" diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.c b/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.c index afad0dca38..a9df6bd89d 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.c +++ b/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.c @@ -19,12 +19,12 @@ #include <net/if.h> -#include "sd-netlink/sd-netlink.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/extract-word.h" #include "systemd-basic/missing.h" #include "systemd-basic/parse-util.h" #include "systemd-shared/conf-parser.h" +#include "systemd-staging/sd-netlink.h" #include "networkd-link.h" #include "networkd-netdev-vxlan.h" diff --git a/src/grp-network/libnetworkd-core/networkd-netdev.h b/src/grp-network/libnetworkd-core/networkd-netdev.h index d74b63a001..08397f0c73 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev.h +++ b/src/grp-network/libnetworkd-core/networkd-netdev.h @@ -19,9 +19,9 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-netlink/sd-netlink.h" #include "systemd-basic/list.h" #include "systemd-basic/time-util.h" +#include "systemd-staging/sd-netlink.h" typedef struct netdev_join_callback netdev_join_callback; typedef struct Link Link; diff --git a/src/grp-network/libnetworkd-core/networkd.h b/src/grp-network/libnetworkd-core/networkd.h index 0d38a70096..c788ad0fcb 100644 --- a/src/grp-network/libnetworkd-core/networkd.h +++ b/src/grp-network/libnetworkd-core/networkd.h @@ -24,10 +24,10 @@ #include <systemd/sd-bus.h> #include <systemd/sd-event.h> -#include "sd-netlink/sd-netlink.h" #include "systemd-basic/hashmap.h" #include "systemd-basic/list.h" #include "systemd-network/dhcp-identifier.h" +#include "systemd-staging/sd-netlink.h" #include "udev.h" #include "networkd-address-pool.h" diff --git a/src/grp-network/networkctl/networkctl.c b/src/grp-network/networkctl/networkctl.c index 52c85b9dc2..ec449d8dcb 100644 --- a/src/grp-network/networkctl/networkctl.c +++ b/src/grp-network/networkctl/networkctl.c @@ -22,13 +22,9 @@ #include <stdbool.h> #include "sd-device/device-util.h" -#include "sd-device/sd-device.h" #include "sd-hwdb/hwdb-util.h" -#include "sd-hwdb/sd-hwdb.h" #include "sd-netlink/local-addresses.h" #include "sd-netlink/netlink-util.h" -#include "sd-netlink/sd-netlink.h" -#include "sd-network/sd-network.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/arphrd-list.h" #include "systemd-basic/ether-addr-util.h" @@ -47,6 +43,10 @@ #include "systemd-basic/verbs.h" #include "systemd-network/sd-lldp.h" #include "systemd-shared/pager.h" +#include "systemd-staging/sd-device.h" +#include "systemd-staging/sd-hwdb.h" +#include "systemd-staging/sd-netlink.h" +#include "systemd-staging/sd-network.h" static bool arg_no_pager = false; static bool arg_legend = true; diff --git a/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-link.c b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-link.c index 8840267f55..535f4087f8 100644 --- a/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-link.c +++ b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-link.c @@ -18,9 +18,9 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-network/sd-network.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/string-util.h" +#include "systemd-staging/sd-network.h" #include "networkd-wait-online-link.h" diff --git a/src/grp-network/systemd-networkd-wait-online/networkd-wait-online.h b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online.h index 6490cb314c..e8c749b840 100644 --- a/src/grp-network/systemd-networkd-wait-online/networkd-wait-online.h +++ b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online.h @@ -21,9 +21,9 @@ #include <systemd/sd-event.h> -#include "sd-netlink/sd-netlink.h" -#include "sd-network/sd-network.h" #include "systemd-basic/hashmap.h" +#include "systemd-staging/sd-netlink.h" +#include "systemd-staging/sd-network.h" typedef struct Manager Manager; diff --git a/src/grp-resolve/systemd-resolve/resolve-tool.c b/src/grp-resolve/systemd-resolve/resolve-tool.c index e0e4c9f70a..c39bdcca82 100644 --- a/src/grp-resolve/systemd-resolve/resolve-tool.c +++ b/src/grp-resolve/systemd-resolve/resolve-tool.c @@ -26,7 +26,6 @@ #include "basic-dns/resolved-dns-packet.h" #include "sd-bus/bus-error.h" #include "sd-netlink/netlink-util.h" -#include "sd-netlink/sd-netlink.h" #include "systemd-basic/af-list.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/escape.h" @@ -37,6 +36,7 @@ #include "systemd-shared/bus-util.h" #include "systemd-shared/gcrypt-util.h" #include "systemd-shared/pager.h" +#include "systemd-staging/sd-netlink.h" #define DNS_CALL_TIMEOUT_USEC (45*USEC_PER_SEC) diff --git a/src/grp-resolve/systemd-resolved/resolved-link.c b/src/grp-resolve/systemd-resolved/resolved-link.c index 5e706a02a9..ccfcc70d1a 100644 --- a/src/grp-resolve/systemd-resolved/resolved-link.c +++ b/src/grp-resolve/systemd-resolved/resolved-link.c @@ -19,7 +19,6 @@ #include <net/if.h> -#include "sd-network/sd-network.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/fd-util.h" #include "systemd-basic/fileio.h" @@ -28,6 +27,7 @@ #include "systemd-basic/parse-util.h" #include "systemd-basic/string-util.h" #include "systemd-basic/strv.h" +#include "systemd-staging/sd-network.h" #include "resolved-link.h" diff --git a/src/grp-resolve/systemd-resolved/resolved-manager.h b/src/grp-resolve/systemd-resolved/resolved-manager.h index 3a76bd95de..2e187efeb5 100644 --- a/src/grp-resolve/systemd-resolved/resolved-manager.h +++ b/src/grp-resolve/systemd-resolved/resolved-manager.h @@ -21,12 +21,12 @@ #include <systemd/sd-event.h> -#include "sd-netlink/sd-netlink.h" -#include "sd-network/sd-network.h" #include "systemd-basic/hashmap.h" #include "systemd-basic/list.h" #include "systemd-basic/ordered-set.h" #include "systemd-shared/resolve-util.h" +#include "systemd-staging/sd-netlink.h" +#include "systemd-staging/sd-network.h" typedef struct Manager Manager; diff --git a/src/grp-system/libcore/src/loopback-setup.c b/src/grp-system/libcore/src/loopback-setup.c index a036581923..8eb6251bd7 100644 --- a/src/grp-system/libcore/src/loopback-setup.c +++ b/src/grp-system/libcore/src/loopback-setup.c @@ -22,8 +22,8 @@ #include "core/loopback-setup.h" #include "sd-netlink/netlink-util.h" -#include "sd-netlink/sd-netlink.h" #include "systemd-basic/missing.h" +#include "systemd-staging/sd-netlink.h" static int start_loopback(sd_netlink *rtnl) { _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL; diff --git a/src/grp-udev/libudev-core/net/link-config.c b/src/grp-udev/libudev-core/net/link-config.c index 845d5beaaa..df06447e6c 100644 --- a/src/grp-udev/libudev-core/net/link-config.c +++ b/src/grp-udev/libudev-core/net/link-config.c @@ -21,7 +21,6 @@ #include "libudev-private.h" #include "sd-netlink/netlink-util.h" -#include "sd-netlink/sd-netlink.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/conf-files.h" #include "systemd-basic/fd-util.h" @@ -38,6 +37,7 @@ #include "systemd-basic/util.h" #include "systemd-network/network-internal.h" #include "systemd-shared/conf-parser.h" +#include "systemd-staging/sd-netlink.h" #include "ethtool-util.h" #include "link-config.h" diff --git a/src/grp-udev/libudev-core/udev-builtin-hwdb.c b/src/grp-udev/libudev-core/udev-builtin-hwdb.c index 53d9376f9f..9587845ac2 100644 --- a/src/grp-udev/libudev-core/udev-builtin-hwdb.c +++ b/src/grp-udev/libudev-core/udev-builtin-hwdb.c @@ -23,10 +23,10 @@ #include <stdlib.h> #include "sd-hwdb/hwdb-util.h" -#include "sd-hwdb/sd-hwdb.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/string-util.h" #include "systemd-shared/udev-util.h" +#include "systemd-staging/sd-hwdb.h" #include "udev.h" static sd_hwdb *hwdb; diff --git a/src/libsystemd-network/test/test-acd.c b/src/libsystemd-network/test/test-acd.c index 1322714573..26480a2012 100644 --- a/src/libsystemd-network/test/test-acd.c +++ b/src/libsystemd-network/test/test-acd.c @@ -27,10 +27,10 @@ #include <systemd/sd-event.h> #include "sd-netlink/netlink-util.h" -#include "sd-netlink/sd-netlink.h" #include "systemd-basic/in-addr-util.h" #include "systemd-basic/util.h" #include "systemd-network/sd-ipv4acd.h" +#include "systemd-staging/sd-netlink.h" static void acd_handler(sd_ipv4acd *acd, int event, void *userdata) { assert_se(acd); diff --git a/src/libsystemd-network/test/test-ipv4ll-manual.c b/src/libsystemd-network/test/test-ipv4ll-manual.c index 5253c3b62b..f67a8fe16c 100644 --- a/src/libsystemd-network/test/test-ipv4ll-manual.c +++ b/src/libsystemd-network/test/test-ipv4ll-manual.c @@ -27,13 +27,13 @@ #include <systemd/sd-event.h> #include "sd-netlink/netlink-util.h" -#include "sd-netlink/sd-netlink.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/in-addr-util.h" #include "systemd-basic/parse-util.h" #include "systemd-basic/string-util.h" #include "systemd-basic/util.h" #include "systemd-network/sd-ipv4ll.h" +#include "systemd-staging/sd-netlink.h" static void ll_handler(sd_ipv4ll *ll, int event, void *userdata) { _cleanup_free_ char *address = NULL; diff --git a/src/libsystemd/src/sd-device/sd-device.h b/src/libsystemd/include-staging/systemd-staging/sd-device.h index 5e32fc6110..5e32fc6110 100644 --- a/src/libsystemd/src/sd-device/sd-device.h +++ b/src/libsystemd/include-staging/systemd-staging/sd-device.h diff --git a/src/libsystemd/src/sd-hwdb/sd-hwdb.h b/src/libsystemd/include-staging/systemd-staging/sd-hwdb.h index f46d7ad561..f46d7ad561 100644 --- a/src/libsystemd/src/sd-hwdb/sd-hwdb.h +++ b/src/libsystemd/include-staging/systemd-staging/sd-hwdb.h diff --git a/src/libsystemd/src/sd-netlink/sd-netlink.h b/src/libsystemd/include-staging/systemd-staging/sd-netlink.h index 8a8c85a004..8a8c85a004 100644 --- a/src/libsystemd/src/sd-netlink/sd-netlink.h +++ b/src/libsystemd/include-staging/systemd-staging/sd-netlink.h diff --git a/src/libsystemd/src/sd-network/sd-network.h b/src/libsystemd/include-staging/systemd-staging/sd-network.h index ac2660de45..ac2660de45 100644 --- a/src/libsystemd/src/sd-network/sd-network.h +++ b/src/libsystemd/include-staging/systemd-staging/sd-network.h diff --git a/src/libsystemd/src/sd-resolve/sd-resolve.h b/src/libsystemd/include-staging/systemd-staging/sd-resolve.h index 1996ae401a..1996ae401a 100644 --- a/src/libsystemd/src/sd-resolve/sd-resolve.h +++ b/src/libsystemd/include-staging/systemd-staging/sd-resolve.h diff --git a/src/libsystemd/src/sd-device/device-enumerator-private.h b/src/libsystemd/src/sd-device/device-enumerator-private.h index eb06f9542d..7bf39d188a 100644 --- a/src/libsystemd/src/sd-device/device-enumerator-private.h +++ b/src/libsystemd/src/sd-device/device-enumerator-private.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-device.h" +#include "systemd-staging/sd-device.h" int device_enumerator_scan_devices(sd_device_enumerator *enumeartor); int device_enumerator_scan_subsystems(sd_device_enumerator *enumeartor); diff --git a/src/libsystemd/src/sd-device/device-enumerator.c b/src/libsystemd/src/sd-device/device-enumerator.c index d435d1b11b..b4577a5a39 100644 --- a/src/libsystemd/src/sd-device/device-enumerator.c +++ b/src/libsystemd/src/sd-device/device-enumerator.c @@ -26,10 +26,10 @@ #include "systemd-basic/string-util.h" #include "systemd-basic/strv.h" #include "systemd-basic/util.h" +#include "systemd-staging/sd-device.h" #include "device-enumerator-private.h" #include "device-util.h" -#include "sd-device.h" #define DEVICE_ENUMERATE_MAX_DEPTH 256 diff --git a/src/libsystemd/src/sd-device/device-private.c b/src/libsystemd/src/sd-device/device-private.c index 3145f30a05..03c04b5eae 100644 --- a/src/libsystemd/src/sd-device/device-private.c +++ b/src/libsystemd/src/sd-device/device-private.c @@ -39,11 +39,11 @@ #include "systemd-basic/strxcpyx.h" #include "systemd-basic/user-util.h" #include "systemd-basic/util.h" +#include "systemd-staging/sd-device.h" #include "device-internal.h" #include "device-private.h" #include "device-util.h" -#include "sd-device.h" int device_add_property(sd_device *device, const char *key, const char *value) { int r; diff --git a/src/libsystemd/src/sd-device/device-private.h b/src/libsystemd/src/sd-device/device-private.h index 29b3e155fb..504507e3cb 100644 --- a/src/libsystemd/src/sd-device/device-private.h +++ b/src/libsystemd/src/sd-device/device-private.h @@ -23,7 +23,7 @@ #include <stdbool.h> #include <sys/types.h> -#include "sd-device.h" +#include "systemd-staging/sd-device.h" int device_new_from_nulstr(sd_device **ret, uint8_t *nulstr, size_t len); int device_new_from_strv(sd_device **ret, char **strv); diff --git a/src/libsystemd/src/sd-device/sd-device.c b/src/libsystemd/src/sd-device/sd-device.c index 5dcbea0142..3f7e21af96 100644 --- a/src/libsystemd/src/sd-device/sd-device.c +++ b/src/libsystemd/src/sd-device/sd-device.c @@ -36,11 +36,11 @@ #include "systemd-basic/strv.h" #include "systemd-basic/strxcpyx.h" #include "systemd-basic/util.h" +#include "systemd-staging/sd-device.h" #include "device-internal.h" #include "device-private.h" #include "device-util.h" -#include "sd-device.h" int device_new_aux(sd_device **ret) { _cleanup_(sd_device_unrefp) sd_device *device = NULL; diff --git a/src/libsystemd/src/sd-hwdb/hwdb-util.h b/src/libsystemd/src/sd-hwdb/hwdb-util.h index e62bc7e7f7..5585965c83 100644 --- a/src/libsystemd/src/sd-hwdb/hwdb-util.h +++ b/src/libsystemd/src/sd-hwdb/hwdb-util.h @@ -20,7 +20,6 @@ ***/ #include "systemd-basic/util.h" - -#include "sd-hwdb.h" +#include "systemd-staging/sd-hwdb.h" bool hwdb_validate(sd_hwdb *hwdb); diff --git a/src/libsystemd/src/sd-hwdb/sd-hwdb.c b/src/libsystemd/src/sd-hwdb/sd-hwdb.c index 74d0b055ac..0891719604 100644 --- a/src/libsystemd/src/sd-hwdb/sd-hwdb.c +++ b/src/libsystemd/src/sd-hwdb/sd-hwdb.c @@ -32,10 +32,10 @@ #include "systemd-basic/hashmap.h" #include "systemd-basic/refcnt.h" #include "systemd-basic/string-util.h" +#include "systemd-staging/sd-hwdb.h" #include "hwdb-internal.h" #include "hwdb-util.h" -#include "sd-hwdb.h" struct sd_hwdb { RefCount n_ref; diff --git a/src/libsystemd/src/sd-netlink/local-addresses.c b/src/libsystemd/src/sd-netlink/local-addresses.c index b872c989ce..74e1b2c2bf 100644 --- a/src/libsystemd/src/sd-netlink/local-addresses.c +++ b/src/libsystemd/src/sd-netlink/local-addresses.c @@ -20,10 +20,10 @@ #include "systemd-basic/alloc-util.h" #include "systemd-basic/macro.h" +#include "systemd-staging/sd-netlink.h" #include "local-addresses.h" #include "netlink-util.h" -#include "sd-netlink.h" static int address_compare(const void *_a, const void *_b) { const struct local_address *a = _a, *b = _b; diff --git a/src/libsystemd/src/sd-netlink/local-addresses.h b/src/libsystemd/src/sd-netlink/local-addresses.h index ac1b7cafa5..f1e91ccfd2 100644 --- a/src/libsystemd/src/sd-netlink/local-addresses.h +++ b/src/libsystemd/src/sd-netlink/local-addresses.h @@ -21,8 +21,7 @@ #include "systemd-basic/in-addr-util.h" - -#include "sd-netlink.h" +#include "systemd-staging/sd-netlink.h" struct local_address { int family, ifindex; diff --git a/src/libsystemd/src/sd-netlink/netlink-internal.h b/src/libsystemd/src/sd-netlink/netlink-internal.h index 1d7e522e0d..0df449a43c 100644 --- a/src/libsystemd/src/sd-netlink/netlink-internal.h +++ b/src/libsystemd/src/sd-netlink/netlink-internal.h @@ -24,9 +24,9 @@ #include "systemd-basic/list.h" #include "systemd-basic/prioq.h" #include "systemd-basic/refcnt.h" +#include "systemd-staging/sd-netlink.h" #include "netlink-types.h" -#include "sd-netlink.h" #define RTNL_DEFAULT_TIMEOUT ((usec_t) (25 * USEC_PER_SEC)) diff --git a/src/libsystemd/src/sd-netlink/netlink-message.c b/src/libsystemd/src/sd-netlink/netlink-message.c index 5d12d52143..73afe876b6 100644 --- a/src/libsystemd/src/sd-netlink/netlink-message.c +++ b/src/libsystemd/src/sd-netlink/netlink-message.c @@ -27,11 +27,11 @@ #include "systemd-basic/refcnt.h" #include "systemd-basic/socket-util.h" #include "systemd-basic/util.h" +#include "systemd-staging/sd-netlink.h" #include "netlink-internal.h" #include "netlink-types.h" #include "netlink-util.h" -#include "sd-netlink.h" #define GET_CONTAINER(m, i) ((i) < (m)->n_containers ? (struct rtattr*)((uint8_t*)(m)->hdr + (m)->containers[i].offset) : NULL) #define PUSH_CONTAINER(m, new) (m)->container_offsets[(m)->n_containers++] = (uint8_t*)(new) - (uint8_t*)(m)->hdr; diff --git a/src/libsystemd/src/sd-netlink/netlink-socket.c b/src/libsystemd/src/sd-netlink/netlink-socket.c index 3cc08e0ab5..f9a0df9f20 100644 --- a/src/libsystemd/src/sd-netlink/netlink-socket.c +++ b/src/libsystemd/src/sd-netlink/netlink-socket.c @@ -27,11 +27,11 @@ #include "systemd-basic/refcnt.h" #include "systemd-basic/socket-util.h" #include "systemd-basic/util.h" +#include "systemd-staging/sd-netlink.h" #include "netlink-internal.h" #include "netlink-types.h" #include "netlink-util.h" -#include "sd-netlink.h" int socket_open(int family) { int fd; diff --git a/src/libsystemd/src/sd-netlink/netlink-util.c b/src/libsystemd/src/sd-netlink/netlink-util.c index 9248aa0b18..4bb99b00af 100644 --- a/src/libsystemd/src/sd-netlink/netlink-util.c +++ b/src/libsystemd/src/sd-netlink/netlink-util.c @@ -17,9 +17,10 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ +#include "systemd-staging/sd-netlink.h" + #include "netlink-internal.h" #include "netlink-util.h" -#include "sd-netlink.h" int rtnl_set_link_name(sd_netlink **rtnl, int ifindex, const char *name) { _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *message = NULL; diff --git a/src/libsystemd/src/sd-netlink/netlink-util.h b/src/libsystemd/src/sd-netlink/netlink-util.h index 547f402c67..9fc80af61d 100644 --- a/src/libsystemd/src/sd-netlink/netlink-util.h +++ b/src/libsystemd/src/sd-netlink/netlink-util.h @@ -20,8 +20,7 @@ ***/ #include "systemd-basic/util.h" - -#include "sd-netlink.h" +#include "systemd-staging/sd-netlink.h" int rtnl_message_new_synthetic_error(int error, uint32_t serial, sd_netlink_message **ret); uint32_t rtnl_message_get_serial(sd_netlink_message *m); diff --git a/src/libsystemd/src/sd-netlink/rtnl-message.c b/src/libsystemd/src/sd-netlink/rtnl-message.c index b3a2ab9ff0..315da4f0ca 100644 --- a/src/libsystemd/src/sd-netlink/rtnl-message.c +++ b/src/libsystemd/src/sd-netlink/rtnl-message.c @@ -26,11 +26,11 @@ #include "systemd-basic/refcnt.h" #include "systemd-basic/socket-util.h" #include "systemd-basic/util.h" +#include "systemd-staging/sd-netlink.h" #include "netlink-internal.h" #include "netlink-types.h" #include "netlink-util.h" -#include "sd-netlink.h" int sd_rtnl_message_route_set_dst_prefixlen(sd_netlink_message *m, unsigned char prefixlen) { struct rtmsg *rtm; diff --git a/src/libsystemd/src/sd-netlink/sd-netlink.c b/src/libsystemd/src/sd-netlink/sd-netlink.c index 9b6f5761b1..4999f59d24 100644 --- a/src/libsystemd/src/sd-netlink/sd-netlink.c +++ b/src/libsystemd/src/sd-netlink/sd-netlink.c @@ -27,10 +27,10 @@ #include "systemd-basic/missing.h" #include "systemd-basic/socket-util.h" #include "systemd-basic/util.h" +#include "systemd-staging/sd-netlink.h" #include "netlink-internal.h" #include "netlink-util.h" -#include "sd-netlink.h" static int sd_netlink_new(sd_netlink **ret) { _cleanup_(sd_netlink_unrefp) sd_netlink *rtnl = NULL; diff --git a/src/libsystemd/src/sd-netlink/test-netlink.c b/src/libsystemd/src/sd-netlink/test-netlink.c index 3c66ceb1b2..b16419a3ab 100644 --- a/src/libsystemd/src/sd-netlink/test-netlink.c +++ b/src/libsystemd/src/sd-netlink/test-netlink.c @@ -26,9 +26,9 @@ #include "systemd-basic/socket-util.h" #include "systemd-basic/string-util.h" #include "systemd-basic/util.h" +#include "systemd-staging/sd-netlink.h" #include "netlink-util.h" -#include "sd-netlink.h" static void test_message_link_bridge(sd_netlink *rtnl) { _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *message = NULL; diff --git a/src/libsystemd/src/sd-network/network-util.h b/src/libsystemd/src/sd-network/network-util.h index 26780dce28..4527ed7c0f 100644 --- a/src/libsystemd/src/sd-network/network-util.h +++ b/src/libsystemd/src/sd-network/network-util.h @@ -19,6 +19,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-network.h" +#include "systemd-staging/sd-network.h" bool network_is_online(void); diff --git a/src/libsystemd/src/sd-network/sd-network.c b/src/libsystemd/src/sd-network/sd-network.c index e7eeb3e74c..2467fdb7ff 100644 --- a/src/libsystemd/src/sd-network/sd-network.c +++ b/src/libsystemd/src/sd-network/sd-network.c @@ -33,8 +33,7 @@ #include "systemd-basic/string-util.h" #include "systemd-basic/strv.h" #include "systemd-basic/util.h" - -#include "sd-network.h" +#include "systemd-staging/sd-network.h" _public_ int sd_network_get_operational_state(char **state) { _cleanup_free_ char *s = NULL; diff --git a/src/libsystemd/src/sd-resolve/sd-resolve.c b/src/libsystemd/src/sd-resolve/sd-resolve.c index 5ec1edd27e..629eeb7799 100644 --- a/src/libsystemd/src/sd-resolve/sd-resolve.c +++ b/src/libsystemd/src/sd-resolve/sd-resolve.c @@ -36,8 +36,7 @@ #include "systemd-basic/missing.h" #include "systemd-basic/socket-util.h" #include "systemd-basic/util.h" - -#include "sd-resolve.h" +#include "systemd-staging/sd-resolve.h" #define WORKERS_MIN 1U #define WORKERS_MAX 16U diff --git a/src/libsystemd/src/sd-resolve/test-resolve.c b/src/libsystemd/src/sd-resolve/test-resolve.c index 574af105d2..0a5bba81cf 100644 --- a/src/libsystemd/src/sd-resolve/test-resolve.c +++ b/src/libsystemd/src/sd-resolve/test-resolve.c @@ -30,8 +30,7 @@ #include "systemd-basic/macro.h" #include "systemd-basic/socket-util.h" #include "systemd-basic/string-util.h" - -#include "sd-resolve.h" +#include "systemd-staging/sd-resolve.h" static int getaddrinfo_handler(sd_resolve_query *q, int ret, const struct addrinfo *ai, void *userdata) { const struct addrinfo *i; diff --git a/src/libudev/src/libudev-device-internal.h b/src/libudev/src/libudev-device-internal.h index 07a73e6b9c..9987f80499 100644 --- a/src/libudev/src/libudev-device-internal.h +++ b/src/libudev/src/libudev-device-internal.h @@ -22,7 +22,7 @@ #include <libudev.h> -#include "sd-device/sd-device.h" +#include "systemd-staging/sd-device.h" #include "libudev-private.h" diff --git a/src/libudev/src/libudev-device.c b/src/libudev/src/libudev-device.c index eec698f8eb..0944c27d39 100644 --- a/src/libudev/src/libudev-device.c +++ b/src/libudev/src/libudev-device.c @@ -39,9 +39,9 @@ #include "sd-device/device-private.h" #include "sd-device/device-util.h" -#include "sd-device/sd-device.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/parse-util.h" +#include "systemd-staging/sd-device.h" #include "libudev-device-internal.h" #include "libudev-private.h" diff --git a/src/libudev/src/libudev-enumerate.c b/src/libudev/src/libudev-enumerate.c index 536dfee8d3..53de8c1a41 100644 --- a/src/libudev/src/libudev-enumerate.c +++ b/src/libudev/src/libudev-enumerate.c @@ -32,8 +32,8 @@ #include "sd-device/device-enumerator-private.h" #include "sd-device/device-util.h" -#include "sd-device/sd-device.h" #include "systemd-basic/alloc-util.h" +#include "systemd-staging/sd-device.h" #include "libudev-device-internal.h" diff --git a/src/libudev/src/libudev-hwdb.c b/src/libudev/src/libudev-hwdb.c index 0a4f4b5ee8..e381ffc62e 100644 --- a/src/libudev/src/libudev-hwdb.c +++ b/src/libudev/src/libudev-hwdb.c @@ -18,8 +18,8 @@ ***/ #include "sd-hwdb/hwdb-util.h" -#include "sd-hwdb/sd-hwdb.h" #include "systemd-basic/alloc-util.h" +#include "systemd-staging/sd-hwdb.h" #include "libudev-private.h" diff --git a/src/libudev/src/udev.h b/src/libudev/src/udev.h index 50b6c05462..eeffef86bc 100644 --- a/src/libudev/src/udev.h +++ b/src/libudev/src/udev.h @@ -24,11 +24,11 @@ #include <libudev.h> -#include "sd-netlink/sd-netlink.h" #include "systemd-basic/label.h" #include "systemd-basic/macro.h" #include "systemd-basic/strv.h" #include "systemd-basic/util.h" +#include "systemd-staging/sd-netlink.h" #include "libudev-private.h" diff --git a/src/systemd-cryptsetup/cryptsetup.c b/src/systemd-cryptsetup/cryptsetup.c index f37ef076b8..fbfef1e002 100644 --- a/src/systemd-cryptsetup/cryptsetup.c +++ b/src/systemd-cryptsetup/cryptsetup.c @@ -24,7 +24,6 @@ #include <sys/mman.h> #include "sd-device/device-util.h" -#include "sd-device/sd-device.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/escape.h" #include "systemd-basic/fileio.h" @@ -36,6 +35,7 @@ #include "systemd-basic/strv.h" #include "systemd-basic/util.h" #include "systemd-shared/ask-password-api.h" +#include "systemd-staging/sd-device.h" static const char *arg_type = NULL; /* CRYPT_LUKS1, CRYPT_TCRYPT or CRYPT_PLAIN */ static char *arg_cipher = NULL; diff --git a/src/systemd-nspawn/nspawn-expose-ports.c b/src/systemd-nspawn/nspawn-expose-ports.c index 9de03b46ba..1ecebe8e30 100644 --- a/src/systemd-nspawn/nspawn-expose-ports.c +++ b/src/systemd-nspawn/nspawn-expose-ports.c @@ -19,7 +19,6 @@ #include "sd-netlink/local-addresses.h" #include "sd-netlink/netlink-util.h" -#include "sd-netlink/sd-netlink.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/fd-util.h" #include "systemd-basic/in-addr-util.h" @@ -28,6 +27,7 @@ #include "systemd-basic/string-util.h" #include "systemd-basic/util.h" #include "systemd-firewall/firewall-util.h" +#include "systemd-staging/sd-netlink.h" #include "nspawn-expose-ports.h" diff --git a/src/systemd-nspawn/nspawn-expose-ports.h b/src/systemd-nspawn/nspawn-expose-ports.h index 99f2872869..61134fcba6 100644 --- a/src/systemd-nspawn/nspawn-expose-ports.h +++ b/src/systemd-nspawn/nspawn-expose-ports.h @@ -23,9 +23,9 @@ #include <systemd/sd-event.h> -#include "sd-netlink/sd-netlink.h" #include "systemd-basic/in-addr-util.h" #include "systemd-basic/list.h" +#include "systemd-staging/sd-netlink.h" typedef struct ExposePort { int protocol; diff --git a/src/systemd-nspawn/nspawn-network.c b/src/systemd-nspawn/nspawn-network.c index 7e2a494bc2..2e0760ec86 100644 --- a/src/systemd-nspawn/nspawn-network.c +++ b/src/systemd-nspawn/nspawn-network.c @@ -25,7 +25,6 @@ #include <systemd/sd-id128.h> #include "sd-netlink/netlink-util.h" -#include "sd-netlink/sd-netlink.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/ether-addr-util.h" #include "systemd-basic/lockfile-util.h" @@ -35,6 +34,7 @@ #include "systemd-basic/string-util.h" #include "systemd-basic/util.h" #include "systemd-shared/udev-util.h" +#include "systemd-staging/sd-netlink.h" #include "nspawn-network.h" diff --git a/src/systemd-socket-proxyd/socket-proxyd.c b/src/systemd-socket-proxyd/socket-proxyd.c index bfaca75ec2..6a11804694 100644 --- a/src/systemd-socket-proxyd/socket-proxyd.c +++ b/src/systemd-socket-proxyd/socket-proxyd.c @@ -31,7 +31,6 @@ #include <systemd/sd-daemon.h> #include <systemd/sd-event.h> -#include "sd-resolve/sd-resolve.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/fd-util.h" #include "systemd-basic/log.h" @@ -40,6 +39,7 @@ #include "systemd-basic/socket-util.h" #include "systemd-basic/string-util.h" #include "systemd-basic/util.h" +#include "systemd-staging/sd-resolve.h" #define BUFFER_SIZE (256 * 1024) #define CONNECTIONS_MAX 256 diff --git a/src/systemd-timesyncd/timesyncd-manager.h b/src/systemd-timesyncd/timesyncd-manager.h index aadad483da..9012801cd0 100644 --- a/src/systemd-timesyncd/timesyncd-manager.h +++ b/src/systemd-timesyncd/timesyncd-manager.h @@ -21,10 +21,10 @@ #include <systemd/sd-event.h> -#include "sd-network/sd-network.h" -#include "sd-resolve/sd-resolve.h" #include "systemd-basic/list.h" #include "systemd-basic/ratelimit.h" +#include "systemd-staging/sd-network.h" +#include "systemd-staging/sd-resolve.h" typedef struct Manager Manager; diff --git a/src/test/test-netlink-manual.c b/src/test/test-netlink-manual.c index da16f86f57..3e82a7cc96 100644 --- a/src/test/test-netlink-manual.c +++ b/src/test/test-netlink-manual.c @@ -24,9 +24,9 @@ #include <linux/ip.h> #include <linux/if_tunnel.h> -#include "sd-netlink/sd-netlink.h" #include "systemd-basic/macro.h" #include "systemd-basic/util.h" +#include "systemd-staging/sd-netlink.h" static int load_module(const char *mod_name) { struct kmod_ctx *ctx; diff --git a/tools/notsd-move b/tools/notsd-move index a62c9d138f..481bd59523 100755 --- a/tools/notsd-move +++ b/tools/notsd-move @@ -488,9 +488,10 @@ move_files() ( src/libsystemd/include/systemd/sd-ipv4* \ src/libsystemd/include/systemd/sd-lldp* \ src/libsystemd/include/systemd/sd-ndisc* - for l in device hwdb netlink network resolve; do - mv -T src/libsystemd/include/systemd/sd-$l.h src/libsystemd/src/sd-$l/sd-$l.h - done + mkdir src/libsystemd/include-staging{,/systemd-staging} + mv -t src/libsystemd/include-staging/systemd-staging \ + src/libsystemd/include/systemd/sd-{device,hwdb,netlink,network,resolve}.h + mkdir src/grp-journal.d mv -t src/grp-journal.d tmpfiles.d/journal-nocow.* mv -t src/grp-remote.d tmpfiles.d/systemd-remote.* @@ -616,6 +617,7 @@ move_files() ( src/systemd-inhibit \ src/systemd-logind grp src/grp-machine \ + src/libmachine-core \ src/machinectl \ src/nss-mymachines \ src/systemd-machined |