From 81f8bfb077eb6772d27aa03b91517b78aa62e583 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 10 Jul 2018 08:48:51 +0200 Subject: contrib/rpm: add RHEL connectivity checking package --- contrib/fedora/rpm/20-connectivity-redhat.conf | 4 ++++ contrib/fedora/rpm/NetworkManager.spec | 32 ++++++++++++++++++++++++++ contrib/fedora/rpm/build.sh | 4 ++++ 3 files changed, 40 insertions(+) create mode 100644 contrib/fedora/rpm/20-connectivity-redhat.conf diff --git a/contrib/fedora/rpm/20-connectivity-redhat.conf b/contrib/fedora/rpm/20-connectivity-redhat.conf new file mode 100644 index 0000000000..e556fd6235 --- /dev/null +++ b/contrib/fedora/rpm/20-connectivity-redhat.conf @@ -0,0 +1,4 @@ +[connectivity] +uri=http://static.redhat.com/test/rhel-networkmanager.txt +response=OK +interval=300 diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index d0ba0f75ec..00a27a008c 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -74,6 +74,11 @@ %else %bcond_with connectivity_fedora %endif +%if 0%{?rhel} +%bcond_without connectivity_redhat +%else +%bcond_with connectivity_redhat +%endif %if 0%{?fedora} > 28 || 0%{?rhel} > 7 %bcond_without crypto_gnutls %else @@ -112,6 +117,7 @@ Source: __SOURCE1__ Source1: NetworkManager.conf Source2: 00-server.conf Source3: 20-connectivity-fedora.conf +Source4: 20-connectivity-redhat.conf #Patch1: 0001-some.patch @@ -373,6 +379,7 @@ is the new NetworkManager API. See also NetworkManager-glib-devel. Summary: NetworkManager config file for connectivity checking via Fedora servers Group: System Environment/Base BuildArch: noarch +Provides: NetworkManager-config-connectivity = %{epoch}:%{version}-%{release} %description config-connectivity-fedora This adds a NetworkManager configuration file to enable connectivity checking @@ -380,6 +387,19 @@ via Fedora infrastructure. %endif +%if %{with connectivity_redhat} +%package config-connectivity-redhat +Summary: NetworkManager config file for connectivity checking via Red Hat servers +Group: System Environment/Base +BuildArch: noarch +Provides: NetworkManager-config-connectivity = %{epoch}:%{version}-%{release} + +%description config-connectivity-redhat +This adds a NetworkManager configuration file to enable connectivity checking +via Red Hat infrastructure. +%endif + + %package config-server Summary: NetworkManager config file for "server-like" defaults Group: System Environment/Base @@ -555,6 +575,10 @@ cp %{SOURCE2} %{buildroot}%{nmlibdir}/conf.d/ cp %{SOURCE3} %{buildroot}%{nmlibdir}/conf.d/ %endif +%if %{with connectivity_redhat} +cp %{SOURCE4} %{buildroot}%{nmlibdir}/conf.d/ +%endif + cp examples/dispatcher/10-ifcfg-rh-routes.sh %{buildroot}%{_sysconfdir}/%{name}/dispatcher.d/ ln -s ../no-wait.d/10-ifcfg-rh-routes.sh %{buildroot}%{_sysconfdir}/%{name}/dispatcher.d/pre-up.d/ ln -s ../10-ifcfg-rh-routes.sh %{buildroot}%{_sysconfdir}/%{name}/dispatcher.d/no-wait.d/ @@ -808,6 +832,14 @@ fi %endif +%if %{with connectivity_redhat} +%files config-connectivity-redhat +%dir %{nmlibdir} +%dir %{nmlibdir}/conf.d +%{nmlibdir}/conf.d/20-connectivity-redhat.conf +%endif + + %files config-server %dir %{nmlibdir} %dir %{nmlibdir}/conf.d diff --git a/contrib/fedora/rpm/build.sh b/contrib/fedora/rpm/build.sh index b7674cc8c5..bd92f1eb2c 100755 --- a/contrib/fedora/rpm/build.sh +++ b/contrib/fedora/rpm/build.sh @@ -19,6 +19,7 @@ # SOURCE_NETWORKMANAGER_CONF= # SOURCE_CONFIG_SERVER= # SOURCE_CONFIG_CONNECTIVITY_FEDORA= +# SOURCE_CONFIG_CONNECTIVITY_REDHAT= die() { echo "$*" >&2 @@ -121,6 +122,7 @@ fi SOURCE_NETWORKMANAGER_CONF="$(abs_path "$SOURCE_NETWORKMANAGER_CONF" "$SCRIPTDIR/NetworkManager.conf")" || die "invalid \$SOURCE_NETWORKMANAGER_CONF argument" SOURCE_CONFIG_SERVER="$(abs_path "$SOURCE_CONFIG_SERVER" "$SCRIPTDIR/00-server.conf")" || die "invalid \$SOURCE_CONFIG_SERVER argument" SOURCE_CONFIG_CONNECTIVITY_FEDORA="$(abs_path "$SOURCE_CONFIG_CONNECTIVITY_FEDORA" "$SCRIPTDIR/20-connectivity-fedora.conf")" || die "invalid \$SOURCE_CONFIG_CONNECTIVITY_FEDORA argument" +SOURCE_CONFIG_CONNECTIVITY_REDHAT="$(abs_path "$SOURCE_CONFIG_CONNECTIVITY_REDHAT" "$SCRIPTDIR/20-connectivity-redhat.conf")" || die "invalid \$SOURCE_CONFIG_CONNECTIVITY_REDHAT argument" TEMP="$(mktemp -d "$SCRIPTDIR/NetworkManager.$DATE.XXXXXX")" TEMPBASE="$(basename "$TEMP")" @@ -143,6 +145,7 @@ LOG "SOURCE_FROM_GIT=$SOURCE_FROM_GIT" LOG "SOURCE_NETWORKMANAGER_CONF=$SOURCE_NETWORKMANAGER_CONF" LOG "SOURCE_CONFIG_SERVER=$SOURCE_CONFIG_SERVER" LOG "SOURCE_CONFIG_CONNECTIVITY_FEDORA=$SOURCE_CONFIG_CONNECTIVITY_FEDORA" +LOG "SOURCE_CONFIG_CONNECTIVITY_REDHAT=$SOURCE_CONFIG_CONNECTIVITY_REDHAT" LOG "BUILDTYPE=$BUILDTYPE" LOG "NM_RPMBUILD_ARGS=$NM_RPMBUILD_ARGS" LOG "" @@ -162,6 +165,7 @@ fi cp "$SOURCE_NETWORKMANAGER_CONF" "$TEMP/SOURCES/NetworkManager.conf" || die "Could not copy source $SOURCE_NETWORKMANAGER_CONF to $TEMP/SOURCES" cp "$SOURCE_CONFIG_SERVER" "$TEMP/SOURCES/00-server.conf" || die "Could not copy source $SOURCE_CONFIG_SERVER to $TEMP/SOURCES" cp "$SOURCE_CONFIG_CONNECTIVITY_FEDORA" "$TEMP/SOURCES/20-connectivity-fedora.conf" || die "Could not copy source $SOURCE_CONFIG_CONNECTIVITY_FEDORA to $TEMP/SOURCES" +cp "$SOURCE_CONFIG_CONNECTIVITY_REDHAT" "$TEMP/SOURCES/20-connectivity-redhat.conf" || die "Could not copy source $SOURCE_CONFIG_CONNECTIVITY_REDHAT to $TEMP/SOURCES" write_changelog -- cgit v1.2.1