summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2004-12-17 16:19:59 +0000
committerNarayan Desai <desai@mcs.anl.gov>2004-12-17 16:19:59 +0000
commit8734f8be82d65f9ccb491fa8fcc6a6fb04e2b6ae (patch)
treeefe7ae797c9bc5a99296334d1ed0a2fc385983e4 /src
parentb9b0624efc264b362fc7d961dcd8d1de9d70794a (diff)
downloadbcfg2-8734f8be82d65f9ccb491fa8fcc6a6fb04e2b6ae.tar.gz
bcfg2-8734f8be82d65f9ccb491fa8fcc6a6fb04e2b6ae.tar.bz2
bcfg2-8734f8be82d65f9ccb491fa8fcc6a6fb04e2b6ae.zip
fix xml quoting issues
2004/12/17 10:01:23-06:00 anl.gov!desai switch to __name__ (Logical change 1.168) git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@741 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src')
-rw-r--r--src/lib/Server/Generators/Debconf.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/Server/Generators/Debconf.py b/src/lib/Server/Generators/Debconf.py
index 20247407c..25c6e2094 100644
--- a/src/lib/Server/Generators/Debconf.py
+++ b/src/lib/Server/Generators/Debconf.py
@@ -9,20 +9,20 @@ class Debconf(Generator):
-> hostname
-> video driver'''
__name__ = 'Debconf'
- __version__ = '$Revision$'
+ __version__ = '$Id$'
__author__ = 'bcfg-dev@mcs.anl.gov'
__provides__ = {'ConfigFile':{}}
- probes = [Element("probe", name='VGA', interpreter='/bin/sh', source='Debconf')]
+ probes = [Element("probe", name='VGA', interpreter='/bin/sh', source=__name__)]
probes[0].text = '''
XSERVER='/usr/bin/X11/X|/usr/X11R6/bin/X'
if [ XFree86 -configure 2>/dev/null ] ; then
- VGACARD=`tail -50 /root/XF86Config.new | grep Driver | awk -F\" '{print $2}'`
+ VGACARD=`tail -50 /root/XF86Config.new | grep Driver | awk -F\&quot; '{print $2}'`
elif ps auxww | egrep ${XSERVER} | grep -v grep > /dev/null ;then
if [ -e /etc/X11/XF86Config ]; then
- VGACARD=`tail -50 /etc/X11/XF86Config | grep Driver | awk -F\" '{print $2}'`
+ VGACARD=`tail -50 /etc/X11/XF86Config | grep Driver | awk -F\&quot; '{print $2}'`
else
- VGACARD=`tail -50 /etc/X11/XF86Config-4 | grep Driver | awk -F\" '{print $2}'`
+ VGACARD=`tail -50 /etc/X11/XF86Config-4 | grep Driver | awk -F\&quot; '{print $2}'`
fi
else
VGACARD=nv