Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Drake <dsd@laptop.org>2012-08-07 00:52:18 (GMT)
committer Daniel Drake <dsd@laptop.org>2012-08-08 02:47:44 (GMT)
commita9fbe78634bac1e6054b794517f2cc6bc993b8a1 (patch)
tree719782d3ae016ae292f6991ac947039050b7a9d4
parentff0805fa2a2f4ab402a95d22c833b44114c27289 (diff)
base: fix NetworkManager config tweak
The NM config file has changed, so removing the plugins line now leaves no remaining settings for plugins. Select keyfile explicitly to avoid NM not being able to create network connections.
-rw-r--r--modules/base/kspost.10.core.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/base/kspost.10.core.inc b/modules/base/kspost.10.core.inc
index f36f420..f12db61 100644
--- a/modules/base/kspost.10.core.inc
+++ b/modules/base/kspost.10.core.inc
@@ -207,7 +207,7 @@ echo "kernel.sysrq = 1" > /usr/lib/sysctl.d/10-olpc.conf
# /etc/NetworkManager/system-connections, which is a path that we can safely
# put in statetab. (the rh-ifcfg path in /etc/sysconfig mixes code with data
# and is hence not appropriate to retain over upgrades)
-sed -i -e '/^plugins=ifcfg-rh$/d' /etc/NetworkManager/NetworkManager.conf
+sed -i -e 's/^plugins=ifcfg-rh$/plugins=keyfile/g' /etc/NetworkManager/NetworkManager.conf
# set default plymouth theme
# we do this with plymouthd.defaults so that plymouth-set-default-theme