cloud-setup: move from "clients/cloud-setup/" to "src/nm-cloud-setup/"

1 files changed, 37 insertions, 33 deletions

diff --git a/.gitignore b/.gitignore
index 3d94f6cd0b..afeba62995 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,9 +69,6 @@ test-*.trs
 /src/nm-dispatcher/tests/test-dispatcher-envp
 
 /clients/cli/nmcli
-/clients/cloud-setup/nm-cloud-setup
-/clients/cloud-setup/nm-cloud-setup.service
-/clients/cloud-setup/tests/test-cloud-setup-general
 /clients/tui/nmtui
 
 /data/NetworkManager.service
@@ -167,6 +164,10 @@ test-*.trs
 /src/nm-initrd-generator/tests/test-dt-reader
 /src/nm-initrd-generator/tests/test-ibft-reader
 
+/src/nm-cloud-setup/nm-cloud-setup
+/src/nm-cloud-setup/nm-cloud-setup.service
+/src/nm-cloud-setup/tests/test-cloud-setup-general
+
 /src/nm-online/nm-online
 
 /clients/cli/generate-docs-nm-settings-nmcli
@@ -287,6 +288,9 @@ test-*.trs
 /callouts/org.freedesktop.nm_dispatcher.service
 /callouts/tests/test-dispatcher-envp
 /clients/cli/settings-docs.c
+/clients/cloud-setup/nm-cloud-setup
+/clients/cloud-setup/nm-cloud-setup.service
+/clients/cloud-setup/tests/test-cloud-setup-general
 /clients/common/settings-docs-input.xml
 /clients/common/settings-docs.c
 /clients/common/settings-docs.h
@@ -324,7 +328,6 @@ test-*.trs
 /docs/libnm-util/tmpl/
 /docs/libnm-util/version.xml
 /docs/libnm-util/xml/
-/man/nm-settings.xml
 /include/
 /initscript/*/[Nn]etwork[Mm]anager
 /initscript/Slackware/rc.networkmanager
@@ -332,20 +335,20 @@ test-*.trs
 /introspection/nmdbus-*.h
 /introspection/nmdbus-*.xml
 /libgsystem/
-/libnm-core/tests/test-setting-8021x
-/libnm-core/tests/test-setting-bond
-/libnm-core/tests/test-setting-dcb
+/libnm-core/nm-dbus-types.xml
+/libnm-core/nm-version-macros.h
+/libnm-core/nm-vpn-dbus-types.xml
 /libnm-core/tests/test-compare
 /libnm-core/tests/test-crypto
-/libnm-core/tests/test-settings-defaults
 /libnm-core/tests/test-general
 /libnm-core/tests/test-keyfile
 /libnm-core/tests/test-need-secrets
 /libnm-core/tests/test-secrets
 /libnm-core/tests/test-setting
-/libnm-core/nm-dbus-types.xml
-/libnm-core/nm-version-macros.h
-/libnm-core/nm-vpn-dbus-types.xml
+/libnm-core/tests/test-setting-8021x
+/libnm-core/tests/test-setting-bond
+/libnm-core/tests/test-setting-dcb
+/libnm-core/tests/test-settings-defaults
 /libnm-glib/libnm-glib-test
 /libnm-glib/nm-secret-agent-glue.h
 /libnm-glib/nm-vpn-plugin-glue.h
@@ -380,6 +383,7 @@ test-*.trs
 /libnm/tests/test-nm-client
 /libnm/tests/test-remote-settings-client
 /libnm/tests/test-secret-agent
+/man/nm-settings.xml
 /policy/org.freedesktop.NetworkManager.policy
 /policy/org.freedesktop.NetworkManager.policy.in
 /shared/nm-glib-aux/tests/test-json-aux
@@ -387,26 +391,6 @@ test-*.trs
 /shared/nm-platform/tests/test-nm-platform
 /shared/nm-utils/tests/test-shared-general
 /shared/nm-version-macros.h
-/src/devices/tests/test-arping
-/src/devices/wifi/tests/test-general
-/src/devices/wifi/tests/test-wifi-ap-utils
-/src/dhcp-manager/nm-dhcp-helper
-/src/dhcp-manager/tests/test-dhcp-dhclient
-/src/dhcp-manager/tests/test-dhcp-options
-/src/dhcp-manager/tests/test-dhcp-utils
-/src/dnsmasq-manager/tests/test-dnsmasq-utils
-/src/platform/tests/dump
-/src/platform/tests/platform
-/src/platform/tests/test-general
-/src/rdisc/
-/src/settings/plugins/ibft/tests/test-ibft
-/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh-utils
-/src/settings/plugins/ifnet
-/src/settings/plugins/keyfile/tests/test-keyfile
-/src/supplicant-manager/tests/test-supplicant-config
-/src/tests/test-general
-/src/tests/test-general-with-expect
-/src/tests/test-resolvconf-capture
 /src/NetworkManager
 /src/NetworkManager-all-sym
 /src/NetworkManager.ver
@@ -416,26 +400,37 @@ test-*.trs
 /src/core/initrd/tests/test-ibft-reader
 /src/devices/bluetooth/tests/nm-bt-test
 /src/devices/tests/test-acd
+/src/devices/tests/test-arping
 /src/devices/tests/test-lldp
 /src/devices/wifi/tests/test-devices-wifi
+/src/devices/wifi/tests/test-general
+/src/devices/wifi/tests/test-wifi-ap-utils
 /src/devices/wwan/tests/test-service-providers
+/src/dhcp-manager/nm-dhcp-helper
+/src/dhcp-manager/tests/test-dhcp-dhclient
+/src/dhcp-manager/tests/test-dhcp-options
+/src/dhcp-manager/tests/test-dhcp-utils
 /src/dhcp/nm-dhcp-helper
 /src/dhcp/tests/test-dhcp-dhclient
 /src/dhcp/tests/test-dhcp-options
 /src/dhcp/tests/test-dhcp-utils
+/src/dnsmasq-manager/tests/test-dnsmasq-utils
 /src/dnsmasq/tests/test-dnsmasq-utils
 /src/initrd/nm-initrd-generator
 /src/initrd/tests/test-cmdline-reader
 /src/initrd/tests/test-dt-reader
 /src/initrd/tests/test-ibft-reader
-/src/nm-iface-helper
 /src/ndisc/tests/test-ndisc-fake
 /src/ndisc/tests/test-ndisc-linux
+/src/nm-iface-helper
+/src/platform/tests/dump
 /src/platform/tests/monitor
+/src/platform/tests/platform
 /src/platform/tests/test-address-fake
 /src/platform/tests/test-address-linux
 /src/platform/tests/test-cleanup-fake
 /src/platform/tests/test-cleanup-linux
+/src/platform/tests/test-general
 /src/platform/tests/test-link-fake
 /src/platform/tests/test-link-linux
 /src/platform/tests/test-nmp-object
@@ -444,19 +439,28 @@ test-*.trs
 /src/platform/tests/test-route-linux
 /src/platform/tests/test-tc-fake
 /src/platform/tests/test-tc-linux
+/src/rdisc/
+/src/settings/plugins/ibft/tests/test-ibft
 /src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.[ch]
+/src/settings/plugins/ifcfg-rh/tests/network-scripts/tmp/
 /src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh
+/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh-utils
+/src/settings/plugins/ifnet
 /src/settings/plugins/ifupdown/tests/test-ifupdown
+/src/settings/plugins/keyfile/tests/test-keyfile
 /src/settings/plugins/keyfile/tests/test-keyfile-settings
-/src/settings/plugins/ifcfg-rh/tests/network-scripts/tmp/
+/src/supplicant-manager/tests/test-supplicant-config
 /src/supplicant/tests/test-supplicant-config
 /src/tests/config/test-config
 /src/tests/test-core
 /src/tests/test-core-with-expect
 /src/tests/test-dcb
+/src/tests/test-general
+/src/tests/test-general-with-expect
 /src/tests/test-ip4-config
 /src/tests/test-ip6-config
 /src/tests/test-l3cfg
+/src/tests/test-resolvconf-capture
 /src/tests/test-route-manager-fake
 /src/tests/test-route-manager-linux
 /src/tests/test-systemd