summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Jones <pjones@redhat.com>2006-04-06 17:42:09 +0000
committerPeter Jones <pjones@redhat.com>2006-04-06 17:42:09 +0000
commit25ae50a687f8d6f3df8d491500299a9b3ac474db (patch)
treea25c92c33cc90c80476afa431675afdec2ffd76e
parenta4de2099d7bbc689c85c0b7878b35eb4a7ff408b (diff)
downloadanaconda-25ae50a687f8d6f3df8d491500299a9b3ac474db.tar.gz
anaconda-25ae50a687f8d6f3df8d491500299a9b3ac474db.tar.xz
anaconda-25ae50a687f8d6f3df8d491500299a9b3ac474db.zip
- quote ethtool opts properly (#176918)
-rw-r--r--ChangeLog2
-rw-r--r--network.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 52be0f52a..2752233a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
hard drive list (#147504)
* kickstart.py (KickstartBase.defineLogicalVolume): Check for missing
vg declaration earlier so the error message makes sense (#176989).
+ * network.py (NetworkDevice.__str__): quote ethtool opts properly
+ (#176918)
2006-02-17 Peter Jones <pjones@redhat.com>
diff --git a/network.py b/network.py
index 1ae4988c9..30ef59610 100644
--- a/network.py
+++ b/network.py
@@ -119,7 +119,7 @@ class NetworkDevice(SimpleConfigFile):
s = s + key + "=" + 'no' + "\n"
# make sure we include autoneg in the ethtool line
elif key == 'ETHTOOL_OPTS' and self.info[key].find("autoneg")== -1:
- s = s + key + "=" + "autoneg off " + self.info[key] + "\n"
+ s = "%s%s=\"autoneg off %s\"\n" % (s, key, self.info[key],)
elif self.info[key] is not None:
s = s + key + "=" + self.info[key] + "\n"