From a859cee560ccde429ffa94edc9300e68a4b986b8 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 4 May 2022 21:27:32 +0200 Subject: [PATCH] contrib: fix /etc/motd for "nm-in-container.sh" --- contrib/scripts/nm-in-container.sh | 94 +++++++++++++++--------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/contrib/scripts/nm-in-container.sh b/contrib/scripts/nm-in-container.sh index 4c71610b8..95fc306a9 100755 --- a/contrib/scripts/nm-in-container.sh +++ b/contrib/scripts/nm-in-container.sh @@ -109,53 +109,53 @@ find NetworkManager bind mounted at $BASEDIR_NM run \`nm-env-prepare.sh setup --idx 1\` to setup test interfaces 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}" \ + \$ ./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