diff options
Diffstat (limited to 'tools/nm-guest-data')
| -rw-r--r-- | tools/nm-guest-data/bin-nm-deploy.sh.in | 7 | ||||
| -rw-r--r-- | tools/nm-guest-data/etc-bashrc.my.in | 1 | ||||
| -rw-r--r-- | tools/nm-guest-data/etc-motd-container.in | 56 | ||||
| -rw-r--r-- | tools/nm-guest-data/etc-motd-vm.in | 56 |
4 files changed, 5 insertions, 115 deletions
diff --git a/tools/nm-guest-data/bin-nm-deploy.sh.in b/tools/nm-guest-data/bin-nm-deploy.sh.in index 9b5385b1..77b51d0c 100644 --- a/tools/nm-guest-data/bin-nm-deploy.sh.in +++ b/tools/nm-guest-data/bin-nm-deploy.sh.in @@ -4,11 +4,6 @@ set -ex cd /NetworkManager -if [ -f ./config.log ] ; then - make -j 5 install -else - meson install -C build -fi - +meson install -C build systemctl daemon-reload systemctl restart NetworkManager.service diff --git a/tools/nm-guest-data/etc-bashrc.my.in b/tools/nm-guest-data/etc-bashrc.my.in index 88f2f9aa..f6936c4d 100644 --- a/tools/nm-guest-data/etc-bashrc.my.in +++ b/tools/nm-guest-data/etc-bashrc.my.in @@ -1,4 +1,3 @@ -alias m="make -j 8" alias n="ninja -C build" alias l='ls -l --color=auto' diff --git a/tools/nm-guest-data/etc-motd-container.in b/tools/nm-guest-data/etc-motd-container.in index 131f815c..e0fb88d6 100644 --- a/tools/nm-guest-data/etc-motd-container.in +++ b/tools/nm-guest-data/etc-motd-container.in @@ -15,60 +15,8 @@ so that core dumps get written to file. Afterwards, restore with from /usr/lib/sysctl.d/50-coredump.conf. -For example, configure NetworkManager with - $ ./configure \ - --enable-address-sanitizer=no \ - --enable-compile-warnings=yes \ - --enable-concheck \ - --enable-config-plugin-ibft=yes \ - --enable-gtk-doc \ - --enable-ifcfg-rh=yes \ - --enable-ifcfg-suse \ - --enable-ifnet \ - --enable-ifupdown=yes \ - --enable-introspection \ - --enable-json-validation=yes \ - --enable-maintainer-mode \ - --enable-more-logging \ - --enable-more-warnings=error \ - --enable-ovs=yes \ - --enable-polkit=yes \ - --enable-teamdctl=yes \ - --enable-undefined-sanitizer=no \ - --enable-vala=yes \ - --enable-wimax \ - --localstatedir=/var \ - --prefix=/opt/test \ - --sysconfdir=/etc \ - --with-config-dhcp-default=internal \ - --with-config-dns-rc-manager-default=auto \ - --with-consolekit=yes \ - --with-consolekit=yes \ - --with-crypto=nss \ - --with-dhclient=yes \ - --with-dhcpcanon=yes \ - --with-dhcpcd=yes \ - --with-iwd=yes \ - --with-libnm-glib=yes \ - --with-modem-manager-1 \ - --with-netconfig=/bin/nowhere/netconfig \ - --with-nm-cloud-setup=yes \ - --with-nmcli=yes \ - --with-nmtui=yes \ - --with-ofono=yes \ - --with-resolvconf=/bin/nowhere/resolvconf \ - --with-session-tracking=systemd \ - --with-suspend-resume=systemd \ - --with-systemd-logind=yes \ - --with-valgrind=yes \ - --enable-tests="${NM_BUILD_TESTS:-yes}" \ - --with-more-asserts="${NM_BUILD_MORE_ASSERTS:-1000}" \ - "${NM_CONFIGURE_OTPS[@]}" -Test with: - $ systemctl stop NetworkManager; /opt/test/sbin/NetworkManager --debug 2>&1 | tee -a /tmp/nm-log.txt - -Or better, configure with `contrib/fedora/rpm/configure-for-system.sh`, -subsequent `make && make install` will overwrite your system's NetworkManager, +Configure NetworkManager with `contrib/fedora/rpm/configure-for-system.sh`, +subsequent `meson install` will overwrite your system's NetworkManager, and you can test it with `systemctl daemon-reload ; systemctl restart NetworkManager`. Run NM-ci tests after creating eth1 with diff --git a/tools/nm-guest-data/etc-motd-vm.in b/tools/nm-guest-data/etc-motd-vm.in index 10ae1f9f..feb6c7a3 100644 --- a/tools/nm-guest-data/etc-motd-vm.in +++ b/tools/nm-guest-data/etc-motd-vm.in @@ -3,60 +3,8 @@ find NetworkManager bind mounted at {{BASEDIR_NM}} run `nm-env-prepare.sh setup --idx 1` to setup test interfaces -For example, configure NetworkManager with - $ ./configure \ - --enable-address-sanitizer=no \ - --enable-compile-warnings=yes \ - --enable-concheck \ - --enable-config-plugin-ibft=yes \ - --enable-gtk-doc \ - --enable-ifcfg-rh=yes \ - --enable-ifcfg-suse \ - --enable-ifnet \ - --enable-ifupdown=yes \ - --enable-introspection \ - --enable-json-validation=yes \ - --enable-maintainer-mode \ - --enable-more-logging \ - --enable-more-warnings=error \ - --enable-ovs=yes \ - --enable-polkit=yes \ - --enable-teamdctl=yes \ - --enable-undefined-sanitizer=no \ - --enable-vala=yes \ - --enable-wimax \ - --localstatedir=/var \ - --prefix=/opt/test \ - --sysconfdir=/etc \ - --with-config-dhcp-default=internal \ - --with-config-dns-rc-manager-default=auto \ - --with-consolekit=yes \ - --with-consolekit=yes \ - --with-crypto=nss \ - --with-dhclient=yes \ - --with-dhcpcanon=yes \ - --with-dhcpcd=yes \ - --with-iwd=yes \ - --with-libnm-glib=yes \ - --with-modem-manager-1 \ - --with-netconfig=/bin/nowhere/netconfig \ - --with-nm-cloud-setup=yes \ - --with-nmcli=yes \ - --with-nmtui=yes \ - --with-ofono=yes \ - --with-resolvconf=/bin/nowhere/resolvconf \ - --with-session-tracking=systemd \ - --with-suspend-resume=systemd \ - --with-systemd-logind=yes \ - --with-valgrind=yes \ - --enable-tests="${NM_BUILD_TESTS:-yes}" \ - --with-more-asserts="${NM_BUILD_MORE_ASSERTS:-1000}" \ - "${NM_CONFIGURE_OTPS[@]}" -Test with: - $ systemctl stop NetworkManager; /opt/test/sbin/NetworkManager --debug 2>&1 | tee -a /tmp/nm-log.txt - -Or better, if using Fedora, configure with `contrib/fedora/rpm/configure-for-system.sh`, -subsequent `make && make install` will overwrite your system's NetworkManager, +Configure NetworkManager with `contrib/fedora/rpm/configure-for-system.sh`, +subsequent `meson install` will overwrite your system's NetworkManager, and you can test it with `systemctl daemon-reload ; systemctl restart NetworkManager`. Run NM-ci tests after creating eth1 with |