diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2004-12-17 17:05:45 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2004-12-17 17:05:45 +0000 |
| commit | d96ba2468261d4b4e189dc8c4aac88023207658c (patch) | |
| tree | 53044a650cb8decd3239bc584c927db7f462aa72 /src | |
| parent | 8aa31e1e0a642f0185827c616daa067fa254f294 (diff) | |
| download | bcfg2-d96ba2468261d4b4e189dc8c4aac88023207658c.tar.gz bcfg2-d96ba2468261d4b4e189dc8c4aac88023207658c.tar.bz2 bcfg2-d96ba2468261d4b4e189dc8c4aac88023207658c.zip | |
fixup bugs
2004/12/17 10:58:48-06:00 anl.gov!desai
fix quoting
(Logical change 1.170)
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@745 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Server/Generators/Debconf.py | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/lib/Server/Generators/Debconf.py b/src/lib/Server/Generators/Debconf.py index bcc675cba..9156e5d6d 100644 --- a/src/lib/Server/Generators/Debconf.py +++ b/src/lib/Server/Generators/Debconf.py @@ -2,7 +2,7 @@ __revision__ = '$Revision$' from Bcfg2.Server.Generator import Generator, DirectoryBacked -from elementtree.ElementTree import XML, Element +from elementtree.ElementTree import Element class Debconf(Generator): '''Debconf takes <data>/template.dat and adds entries for @@ -17,12 +17,12 @@ class Debconf(Generator): 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'"' '{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'"' '{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'"' '{print $2}'` fi else VGACARD=nv @@ -30,7 +30,8 @@ class Debconf(Generator): echo ${VGACARD} ''' - def __setup__(self): + def __init__(self, core, datastore): + Generator.__init__(self, core, datastore) self.__provides__['ConfigFile']['/var/spool/debconf/config.dat'] = self.build_config_dat self.repo = DirectoryBacked(self.data, self.core.fam) self.xsensed = {} @@ -48,9 +49,10 @@ class Debconf(Generator): '''Send out X probe''' return self.probes - def accept_probe_data(self, metadata, probedata): + def accept_probe_data(self, client, probedata): + '''Stash probe data for later use''' if probedata.attrib['name'] == "VGA": - self.xsensed[metadata.hostname] = probedata.text + self.xsensed[client] = probedata.text |