[PATCH rhel7-branch 2/2] network: enable NM ibft plugin only for ip=ibft boot option (#804511)

Radek Vykydal rvykydal at redhat.com
Fri Sep 26 09:24:53 UTC 2014


Resolves: rhbz#804511
---
 anaconda.spec.in                        | 1 +
 data/systemd/Makefile.am                | 1 +
 data/systemd/anaconda-generator         | 2 ++
 data/systemd/anaconda-nm-config.service | 7 +++++++
 scripts/Makefile.am                     | 2 +-
 scripts/anaconda-disable-nm-ibft-plugin | 2 ++
 6 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 data/systemd/anaconda-nm-config.service
 create mode 100755 scripts/anaconda-disable-nm-ibft-plugin

diff --git a/anaconda.spec.in b/anaconda.spec.in
index 31658c7..29712be 100644
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -249,6 +249,7 @@ update-desktop-database &> /dev/null || :
 %{_unitdir}/*
 %{_prefix}/lib/systemd/system-generators/*
 %{_bindir}/instperf
+%{_bindir}/anaconda-disable-nm-ibft-plugin
 %{_sbindir}/anaconda
 %{_sbindir}/handle-sshpw
 %{_datadir}/anaconda
diff --git a/data/systemd/Makefile.am b/data/systemd/Makefile.am
index d27ba2f..1d47798 100644
--- a/data/systemd/Makefile.am
+++ b/data/systemd/Makefile.am
@@ -27,6 +27,7 @@ dist_systemd_DATA = anaconda.service \
 		    anaconda-tmux at .service \
 		    anaconda-shell at .service \
 		    instperf.service \
+		    anaconda-nm-config.service \
 		    anaconda-sshd.service
 
 dist_generator_SCRIPTS = anaconda-generator
diff --git a/data/systemd/anaconda-generator b/data/systemd/anaconda-generator
index fa533db..d8ca584 100755
--- a/data/systemd/anaconda-generator
+++ b/data/systemd/anaconda-generator
@@ -44,3 +44,5 @@ done
 if getargbool 0 sshd inst.sshd || [ $(uname -m) = "s390x" ]; then
     ln -sf $systemd_dir/anaconda-sshd.service $target_dir/anaconda-sshd.service
 fi
+
+ln -sf $systemd_dir/anaconda-nm-config.service $target_dir/anaconda-nm-config.service
diff --git a/data/systemd/anaconda-nm-config.service b/data/systemd/anaconda-nm-config.service
new file mode 100644
index 0000000..e7442cc
--- /dev/null
+++ b/data/systemd/anaconda-nm-config.service
@@ -0,0 +1,7 @@
+[Unit]
+ConditionKernelCommandLine=!ip=ibft
+Description=Anaconda NetworkManager configuration
+Before=NetworkManager.service
+
+[Service]
+ExecStart=/usr/bin/anaconda-disable-nm-ibft-plugin
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index f667f46..6a7b15a 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -22,7 +22,7 @@ dist_scripts_SCRIPTS = upd-updates run-anaconda anaconda-yum
 dist_scripts_DATA    = pyrc.py
 dist_noinst_SCRIPTS  = upd-kernel makeupdates
 
-dist_bin_SCRIPTS = analog anaconda-cleanup instperf
+dist_bin_SCRIPTS = analog anaconda-cleanup instperf anaconda-disable-nm-ibft-plugin
 
 stage2scriptsdir = $(datadir)/$(PACKAGE_NAME)
 dist_stage2scripts_SCRIPTS = restart-anaconda
diff --git a/scripts/anaconda-disable-nm-ibft-plugin b/scripts/anaconda-disable-nm-ibft-plugin
new file mode 100755
index 0000000..6ddaf46
--- /dev/null
+++ b/scripts/anaconda-disable-nm-ibft-plugin
@@ -0,0 +1,2 @@
+#!/bin/sh
+rm -f /etc/NetworkManager/conf.d/10-ibft-plugin.conf
-- 
1.9.3



More information about the anaconda-patches mailing list