diff options
author | Thomas Haller <thaller@redhat.com> | 2015-01-28 12:43:06 +0100 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2015-01-28 13:20:19 +0100 |
commit | 8eba28b9bd07197070974fee103c89451a4cdf8e (patch) | |
tree | d92ef96fa38b2e74604cb7f6240ecfd29b1b136f /contrib | |
parent | 0acdd0e1e31e296274cdba959b99fced0f833371 (diff) | |
download | NetworkManager-8eba28b9bd07197070974fee103c89451a4cdf8e.tar.gz |
contrib/rpm: add 10-ibft-plugin.conf config file
Taken from rhel-7.1 package
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/fedora/rpm/10-ibft-plugin.conf | 11 | ||||
-rw-r--r-- | contrib/fedora/rpm/NetworkManager.spec | 5 | ||||
-rwxr-xr-x | contrib/fedora/rpm/build.sh | 3 |
3 files changed, 18 insertions, 1 deletions
diff --git a/contrib/fedora/rpm/10-ibft-plugin.conf b/contrib/fedora/rpm/10-ibft-plugin.conf new file mode 100644 index 0000000000..482ae2a073 --- /dev/null +++ b/contrib/fedora/rpm/10-ibft-plugin.conf @@ -0,0 +1,11 @@ +# This file enables the standalone 'iBFT' settings plugin to read +# iBFT information with iscsiadm and create connections from that +# data. +# +# Do not edit this file; it will be overwritten on upgrades. If you +# want to override the values here, or set additional values, you can +# do so by adding another file (eg, "99-local.conf") to this directory +# and setting keys there. + +[main] +plugins+=ibft diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index ab8d89db11..0b3f702710 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -83,7 +83,8 @@ URL: http://www.gnome.org/projects/NetworkManager/ Source: __SOURCE1__ Source1: NetworkManager.conf Source2: 00-server.conf -Source3: 20-connectivity-fedora.conf +Source3: 10-ibft-plugin.conf +Source4: 20-connectivity-fedora.conf #Patch1: 0001-some.patch @@ -440,6 +441,7 @@ make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.d %{__cp} %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.d %{__cp} %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.d +%{__cp} %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.d # create a VPN directory %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/VPN @@ -531,6 +533,7 @@ fi %if 0%{?with_nmtui} %exclude %{_mandir}/man1/nmtui* %endif +%config %{_sysconfdir}/%{name}/conf.d/10-ibft-plugin.conf %{_mandir}/man1/* %{_mandir}/man5/* %{_mandir}/man8/* diff --git a/contrib/fedora/rpm/build.sh b/contrib/fedora/rpm/build.sh index 8e6539dcb1..c1ededb554 100755 --- a/contrib/fedora/rpm/build.sh +++ b/contrib/fedora/rpm/build.sh @@ -73,6 +73,7 @@ SOURCE="$(abs_path "$SOURCE" "$(ls -1 "$GITDIR/NetworkManager-$VERSION"*.tar* 2> [[ -f "$SOURCE" ]] || die "could not find source ${_SOURCE:-$GITDIR/NetworkManager-$VERSION*.tar*} . Did you execute \`make dist\`? Otherwise set \$SOURCE variable" SOURCE_NETWORKMANAGER_CONF="$(abs_path "$SOURCE_NETWORKMANAGER_CONF" "$SCRIPTDIR/NetworkManager.conf")" SOURCE_CONFIG_SERVER="$(abs_path "$SOURCE_CONFIG_SERVER" "$SCRIPTDIR/00-server.conf")" +SOURCE_CONFIG_IBFT_PLUGIN="$(abs_path "$SOURCE_CONFIG_IBFT_PLUGIN" "$SCRIPTDIR/10-ibft-plugin.conf")" SOURCE_CONFIG_CONNECTIVITY_FEDORA="$(abs_path "$SOURCE_CONFIG_CONNECTIVITY_FEDORA" "$SCRIPTDIR/20-connectivity-fedora.conf")" TEMP="$(mktemp -d "$SCRIPTDIR/NetworkManager.$DATE.XXXXXX")" @@ -87,6 +88,7 @@ LOG "SPECFILE=$SPECFILE" LOG "SOURCE=$SOURCE" LOG "SOURCE_NETWORKMANAGER_CONF=$SOURCE_NETWORKMANAGER_CONF" LOG "SOURCE_CONFIG_SERVER=$SOURCE_CONFIG_SERVER" +LOG "SOURCE_CONFIG_IBFT_PLUGIN=$SOURCE_CONFIG_IBFT_PLUGIN" LOG "SOURCE_CONFIG_CONNECTIVITY_FEDORA=$SOURCE_CONFIG_CONNECTIVITY_FEDORA" LOG "BASEDIR=$TEMP" @@ -100,6 +102,7 @@ mkdir -p "$TEMP/SOURCES/" "$TEMP/SPECS/" || die "error creating SPECS directoy" cp "$SOURCE" "$TEMP/SOURCES/" || die "Could not copy source $SOURCE to $TEMP/SOURCES" 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_IBFT_PLUGIN" "$TEMP/SOURCES/10-ibft-plugin.conf" || die "Could not copy source $SOURCE_CONFIG_IBFT_PLUGIN 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" write_changelog |