Merge branch 'maint'

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>

Conflicts:
	doc/installation/distributions.txt
	doc/server/snapshots/index.txt
	src/lib/Bcfg2/Server/Plugin/helpers.py
	src/sbin/bcfg2-server

5 files changed, 226 insertions, 97 deletions

diff --git a/src/lib/Bcfg2/Client/Tools/Chkconfig.py b/src/lib/Bcfg2/Client/Tools/Chkconfig.py
index c3dcf7796..0f5f32302 100644
--- a/src/lib/Bcfg2/Client/Tools/Chkconfig.py
+++ b/src/lib/Bcfg2/Client/Tools/Chkconfig.py
@@ -19,25 +19,22 @@ class Chkconfig(Bcfg2.Client.Tools.SvcTool):
     def get_svc_command(self, service, action):
         return "/sbin/service %s %s" % (service.get('name'), action)
 
-    def VerifyService(self, entry, _):
-        """Verify Service status for entry."""
-        if entry.get('status') == 'ignore':
-            return True
-
+    def verify_bootstatus(self, entry, bootstatus):
+        """Verify bootstatus for entry."""
         rv = self.cmd.run("/sbin/chkconfig --list %s " % entry.get('name'))
         if rv.success:
             srvdata = rv.stdout.splitlines()[0].split()
         else:
             # service not installed
-            entry.set('current_status', 'off')
+            entry.set('current_bootstatus', 'service not installed')
             return False
 
         if len(srvdata) == 2:
             # This is an xinetd service
-            if entry.get('status') == srvdata[1]:
+            if bootstatus == srvdata[1]:
                 return True
             else:
-                entry.set('current_status', srvdata[1])
+                entry.set('current_bootstatus', srvdata[1])
                 return False
 
         try:
@@ -46,40 +43,73 @@ class Chkconfig(Bcfg2.Client.Tools.SvcTool):
         except IndexError:
             onlevels = []
 
-        pstatus = self.check_service(entry)
-        if entry.get('status') == 'on':
-            status = (len(onlevels) > 0 and pstatus)
+        if bootstatus == 'on':
+            current_bootstatus = (len(onlevels) > 0)
         else:
-            status = (len(onlevels) == 0 and not pstatus)
+            current_bootstatus = (len(onlevels) == 0)
+        return current_bootstatus
+
+    def VerifyService(self, entry, _):
+        """Verify Service status for entry."""
+        entry.set('target_status', entry.get('status'))  # for reporting
+        bootstatus = self.get_bootstatus(entry)
+        if bootstatus is None:
+            return True
+        current_bootstatus = self.verify_bootstatus(entry, bootstatus)
 
-        if not status:
-            if entry.get('status') == 'on':
-                entry.set('current_status', 'off')
+        svcstatus = self.check_service(entry)
+        if entry.get('status') == 'on':
+            if svcstatus:
+                current_srvstatus = True
+            else:
+                current_srvstatus = False
+        elif entry.get('status') == 'off':
+            if svcstatus:
+                current_srvstatus = False
             else:
-                entry.set('current_status', 'on')
-        return status
+                current_srvstatus = True
+        else:
+            # 'ignore' should verify
+            current_srvstatus = True
+
+        if svcstatus:
+            entry.set('current_status', 'on')
+        else:
+            entry.set('current_status', 'off')
+
+        return current_bootstatus and current_srvstatus
 
     def InstallService(self, entry):
         """Install Service entry."""
-        rcmd = "/sbin/chkconfig %s %s"
-        self.cmd.run("/sbin/chkconfig --add %s" % (entry.attrib['name']))
+        self.cmd.run("/sbin/chkconfig --add %s" % (entry.get('name')))
         self.logger.info("Installing Service %s" % (entry.get('name')))
-        rv = True
-        if (entry.get('status') == 'off' or
-            self.setup["servicemode"] == "build"):
-            rv &= self.cmd.run((rcmd + " --level 0123456") %
-                               (entry.get('name'),
-                                entry.get('status'))).success
-            if entry.get("current_status") == "on" and \
-               self.setup["servicemode"] != "disabled":
-                rv &= self.stop_service(entry).success
+        bootstatus = entry.get('bootstatus')
+        if bootstatus is not None:
+            if bootstatus == 'on':
+                # make sure service is enabled on boot
+                bootcmd = '/sbin/chkconfig %s %s --level 0123456' % \
+                          (entry.get('name'), entry.get('bootstatus'))
+            elif bootstatus == 'off':
+                # make sure service is disabled on boot
+                bootcmd = '/sbin/chkconfig %s %s' % (entry.get('name'),
+                                                     entry.get('bootstatus'))
+            bootcmdrv = self.cmd.run(bootcmd).success
+            if self.setup['servicemode'] == 'disabled':
+                # 'disabled' means we don't attempt to modify running svcs
+                return bootcmdrv
+            buildmode = self.setup['servicemode'] == 'build'
+            if (entry.get('status') == 'on' and not buildmode) and \
+               entry.get('current_status') == 'off':
+                svccmdrv = self.start_service(entry)
+            elif (entry.get('status') == 'off' or buildmode) and \
+                    entry.get('current_status') == 'on':
+                svccmdrv = self.stop_service(entry)
+            else:
+                svccmdrv = True  # ignore status attribute
+            return bootcmdrv and svccmdrv
         else:
-            rv &= self.cmd.run(rcmd % (entry.get('name'),
-                                       entry.get('status'))).success
-            if entry.get("current_status") == "off" and \
-               self.setup["servicemode"] != "disabled":
-                rv &= self.start_service(entry).success
-        return rv
+            # when bootstatus is 'None', status == 'ignore'
+            return True
 
     def FindExtra(self):
         """Locate extra chkconfig Services."""
diff --git a/src/lib/Bcfg2/Client/Tools/DebInit.py b/src/lib/Bcfg2/Client/Tools/DebInit.py
index d916b1662..116d4f8b0 100644
--- a/src/lib/Bcfg2/Client/Tools/DebInit.py
+++ b/src/lib/Bcfg2/Client/Tools/DebInit.py
@@ -18,13 +18,8 @@ class DebInit(Bcfg2.Client.Tools.SvcTool):
     svcre = \
         re.compile(r'/etc/.*/(?P<action>[SK])(?P<sequence>\d+)(?P<name>\S+)')
 
-    # implement entry (Verify|Install) ops
-    def VerifyService(self, entry, _):
-        """Verify Service status for entry."""
-
-        if entry.get('status') == 'ignore':
-            return True
-
+    def verify_bootstatus(self, entry, bootstatus):
+        """Verify bootstatus for entry."""
         rawfiles = glob.glob("/etc/rc*.d/[SK]*%s" % (entry.get('name')))
         files = []
 
@@ -54,9 +49,9 @@ class DebInit(Bcfg2.Client.Tools.SvcTool):
                 continue
             if match.group('name') == entry.get('name'):
                 files.append(filename)
-        if entry.get('status') == 'off':
+        if bootstatus == 'off':
             if files:
-                entry.set('current_status', 'on')
+                entry.set('current_bootstatus', 'on')
                 return False
             else:
                 return True
@@ -72,12 +67,45 @@ class DebInit(Bcfg2.Client.Tools.SvcTool):
                         return False
             return True
         else:
-            entry.set('current_status', 'off')
+            entry.set('current_bootstatus', 'off')
             return False
 
+    def VerifyService(self, entry, _):
+        """Verify Service status for entry."""
+        entry.set('target_status', entry.get('status'))  # for reporting
+        bootstatus = self.get_bootstatus(entry)
+        if bootstatus is None:
+            return True
+        current_bootstatus = self.verify_bootstatus(entry, bootstatus)
+
+        svcstatus = self.check_service(entry)
+        if entry.get('status') == 'on':
+            if svcstatus:
+                current_srvstatus = True
+            else:
+                current_srvstatus = False
+        elif entry.get('status') == 'off':
+            if svcstatus:
+                current_srvstatus = False
+            else:
+                current_srvstatus = True
+        else:
+            # 'ignore' should verify
+            current_srvstatus = True
+
+        if svcstatus:
+            entry.set('current_status', 'on')
+        else:
+            entry.set('current_status', 'off')
+
+        return current_bootstatus and current_srvstatus
+
     def InstallService(self, entry):
-        """Install Service for entry."""
+        """Install Service entry."""
         self.logger.info("Installing Service %s" % (entry.get('name')))
+        bootstatus = entry.get('bootstatus')
+
+        # check if init script exists
         try:
             os.stat('/etc/init.d/%s' % entry.get('name'))
         except OSError:
@@ -85,20 +113,41 @@ class DebInit(Bcfg2.Client.Tools.SvcTool):
                               entry.get('name'))
             return False
 
-        if entry.get('status') == 'off':
-            self.cmd.run("/usr/sbin/invoke-rc.d %s stop" % (entry.get('name')))
-            return self.cmd.run("/usr/sbin/update-rc.d -f %s remove" %
-                                entry.get('name')).success
+        if bootstatus is not None:
+            seqcmdrv = True
+            if bootstatus == 'on':
+                # make sure service is enabled on boot
+                bootcmd = '/usr/sbin/update-rc.d %s defaults' % \
+                          entry.get('name')
+                if entry.get('sequence'):
+                    seqcmd = '/usr/sbin/update-rc.d -f %s remove' % \
+                             entry.get('name')
+                    seqcmdrv = self.cmd.run(seqcmd)
+                    start_sequence = int(entry.get('sequence'))
+                    kill_sequence = 100 - start_sequence
+                    bootcmd = '%s %d %d' % (bootcmd, start_sequence,
+                                            kill_sequence)
+            elif bootstatus == 'off':
+                # make sure service is disabled on boot
+                bootcmd = '/usr/sbin/update-rc.d -f %s remove' % \
+                          entry.get('name')
+            bootcmdrv = self.cmd.run(bootcmd)
+            if self.setup['servicemode'] == 'disabled':
+                # 'disabled' means we don't attempt to modify running svcs
+                return bootcmdrv and seqcmdrv
+            buildmode = self.setup['servicemode'] == 'build'
+            if (entry.get('status') == 'on' and not buildmode) and \
+               entry.get('current_status') == 'off':
+                svccmdrv = self.start_service(entry)
+            elif (entry.get('status') == 'off' or buildmode) and \
+                    entry.get('current_status') == 'on':
+                svccmdrv = self.stop_service(entry)
+            else:
+                svccmdrv = True  # ignore status attribute
+            return bootcmdrv and svccmdrv and seqcmdrv
         else:
-            command = "/usr/sbin/update-rc.d %s defaults" % (entry.get('name'))
-            if entry.get('sequence'):
-                if not self.cmd.run("/usr/sbin/update-rc.d -f %s remove" %
-                                    entry.get('name')).success:
-                    return False
-                start_sequence = int(entry.get('sequence'))
-                kill_sequence = 100 - start_sequence
-                command = "%s %d %d" % (command, start_sequence, kill_sequence)
-            return self.cmd.run(command).success
+            # when bootstatus is 'None', status == 'ignore'
+            return True
 
     def FindExtra(self):
         """Find Extra Debian Service entries."""
diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/Directory.py b/src/lib/Bcfg2/Client/Tools/POSIX/Directory.py
index 9d0fe05e0..675a4461a 100644
--- a/src/lib/Bcfg2/Client/Tools/POSIX/Directory.py
+++ b/src/lib/Bcfg2/Client/Tools/POSIX/Directory.py
@@ -36,14 +36,14 @@ class POSIXDirectory(POSIXTool):
                     self.logger.info("POSIX: " + msg)
                     entry.set('qtext', entry.get('qtext', '') + '\n' + msg)
                     for extra in extras:
-                        Bcfg2.Client.XML.SubElement(entry, 'Prune', path=extra)
+                        Bcfg2.Client.XML.SubElement(entry, 'Prune', name=extra)
             except OSError:
                 prune = True
 
         return POSIXTool.verify(self, entry, modlist) and prune
 
     def install(self, entry):
-        """Install device entries."""
+        """Install directory entries."""
         fmode = self._exists(entry)
 
         if fmode and not stat.S_ISDIR(fmode[stat.ST_MODE]):
@@ -67,7 +67,7 @@ class POSIXDirectory(POSIXTool):
 
         if entry.get('prune', 'false') == 'true':
             for pent in entry.findall('Prune'):
-                pname = pent.get('path')
+                pname = pent.get('name')
                 try:
                     self.logger.debug("POSIX: Removing %s" % pname)
                     self._remove(pent)
diff --git a/src/lib/Bcfg2/Client/Tools/RcUpdate.py b/src/lib/Bcfg2/Client/Tools/RcUpdate.py
index 4b78581f7..d6329256e 100644
--- a/src/lib/Bcfg2/Client/Tools/RcUpdate.py
+++ b/src/lib/Bcfg2/Client/Tools/RcUpdate.py
@@ -21,21 +21,38 @@ class RcUpdate(Bcfg2.Client.Tools.SvcTool):
                                           '-s']).stdout.splitlines()
                 if 'started' in line]
 
+    def get_default_svcs(self):
+        """Return a list of services in the 'default' runlevel."""
+        return [line.split()[0]
+                for line in self.cmd.run(['/sbin/rc-update',
+                                          'show']).stdout.splitlines()
+                if 'default' in line]
+
+    def verify_bootstatus(self, entry, bootstatus):
+        """Verify bootstatus for entry."""
+        # get a list of all started services
+        allsrv = self.get_default_svcs()
+        # set current_bootstatus attribute
+        if entry.get('name') in allsrv:
+            entry.set('current_bootstatus', 'on')
+        else:
+            entry.set('current_bootstatus', 'off')
+        if bootstatus == 'on':
+            return entry.get('name') in allsrv
+        else:
+            return entry.get('name') not in allsrv
+
     def VerifyService(self, entry, _):
         """
         Verify Service status for entry.
         Assumes we run in the "default" runlevel.
 
         """
-        if entry.get('status') == 'ignore':
+        entry.set('target_status', entry.get('status'))  # for reporting
+        bootstatus = self.get_bootstatus(entry)
+        if bootstatus is None:
             return True
-
-        # get a list of all started services
-        allsrv = self.get_enabled_svcs()
-
-        # check if service is enabled
-        result = self.cmd.run(["/sbin/rc-update", "show", "default"]).stdout
-        is_enabled = entry.get("name") in result
+        current_bootstatus = self.verify_bootstatus(entry, bootstatus)
 
         # check if init script exists
         try:
@@ -45,39 +62,56 @@ class RcUpdate(Bcfg2.Client.Tools.SvcTool):
                               entry.get('name'))
             return False
 
-        # check if service is enabled
-        is_running = entry.get('name') in allsrv
-
-        if entry.get('status') == 'on' and not (is_enabled and is_running):
-            entry.set('current_status', 'off')
-            return False
-
-        elif entry.get('status') == 'off' and (is_enabled or is_running):
+        svcstatus = self.check_service(entry)
+        if entry.get('status') == 'on':
+            if svcstatus:
+                current_srvstatus = True
+            else:
+                current_srvstatus = False
+        elif entry.get('status') == 'off':
+            if svcstatus:
+                current_srvstatus = False
+            else:
+                current_srvstatus = True
+        else:
+            # 'ignore' should verify
+            current_srvstatus = True
+
+        if svcstatus:
             entry.set('current_status', 'on')
-            return False
+        else:
+            entry.set('current_status', 'off')
 
-        return True
+        return current_bootstatus and current_srvstatus
 
     def InstallService(self, entry):
-        """
-        Install Service entry
-
-        """
+        """Install Service entry."""
         self.logger.info('Installing Service %s' % entry.get('name'))
-        if entry.get('status') == 'on':
-            if entry.get('current_status') == 'off':
-                self.start_service(entry)
-            # make sure it's enabled
-            cmd = '/sbin/rc-update add %s default'
-            return self.cmd.run(cmd % entry.get('name')).success
-        elif entry.get('status') == 'off':
-            if entry.get('current_status') == 'on':
-                self.stop_service(entry)
-            # make sure it's disabled
-            cmd = '/sbin/rc-update del %s default'
-            return self.cmd.run(cmd % entry.get('name')).success
-
-        return False
+        bootstatus = entry.get('bootstatus')
+        if bootstatus is not None:
+            if bootstatus == 'on':
+                # make sure service is enabled on boot
+                bootcmd = '/sbin/rc-update add %s default'
+            elif bootstatus == 'off':
+                # make sure service is disabled on boot
+                bootcmd = '/sbin/rc-update del %s default'
+            bootcmdrv = self.cmd.run(bootcmd % entry.get('name')).success
+            if self.setup['servicemode'] == 'disabled':
+                # 'disabled' means we don't attempt to modify running svcs
+                return bootcmdrv
+            buildmode = self.setup['servicemode'] == 'build'
+            if (entry.get('status') == 'on' and not buildmode) and \
+               entry.get('current_status') == 'off':
+                svccmdrv = self.start_service(entry)
+            elif (entry.get('status') == 'off' or buildmode) and \
+                    entry.get('current_status') == 'on':
+                svccmdrv = self.stop_service(entry)
+            else:
+                svccmdrv = True  # ignore status attribute
+            return bootcmdrv and svccmdrv
+        else:
+            # when bootstatus is 'None', status == 'ignore'
+            return True
 
     def FindExtra(self):
         """Locate extra rc-update services."""
diff --git a/src/lib/Bcfg2/Client/Tools/__init__.py b/src/lib/Bcfg2/Client/Tools/__init__.py
index 473d2bf09..885e22761 100644
--- a/src/lib/Bcfg2/Client/Tools/__init__.py
+++ b/src/lib/Bcfg2/Client/Tools/__init__.py
@@ -510,6 +510,22 @@ class SvcTool(Tool):
         """
         return '/etc/init.d/%s %s' % (service.get('name'), action)
 
+    def get_bootstatus(self, service):
+        """ Return the bootstatus attribute if it exists.
+
+        :param service: The service entry
+        :type service: lxml.etree._Element
+        :returns: string or None - Value of bootstatus if it exists. If
+                  bootstatus is unspecified and status is not *ignore*,
+                  return value of status. If bootstatus is unspecified
+                  and status is *ignore*, return None.
+        """
+        if service.get('bootstatus') is not None:
+            return service.get('bootstatus')
+        elif service.get('status') != 'ignore':
+            return service.get('status')
+        return None
+
     def start_service(self, service):
         """ Start a service.