diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2013-07-27 15:56:23 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2013-07-27 15:57:03 -0500 |
| commit | 330f3ba3fa22b39ee1dcc6bbbbbe29a0a18778ab (patch) | |
| tree | ab587c3a46ef588e72ccad144465ee9b44391ad3 /debian | |
| parent | 1c86a3668d017bcaeda602cbc5c5bee84d701647 (diff) | |
| download | bcfg2-330f3ba3fa22b39ee1dcc6bbbbbe29a0a18778ab.tar.gz bcfg2-330f3ba3fa22b39ee1dcc6bbbbbe29a0a18778ab.tar.bz2 bcfg2-330f3ba3fa22b39ee1dcc6bbbbbe29a0a18778ab.zip | |
debian: Apply patches from Arto Jantunen
Get rid of some stuff that's no longer necessary and doesn't exist in
the downstream Debian packages.
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/bcfg2-server.postinst | 17 | ||||
| -rw-r--r-- | debian/bcfg2.default | 2 |
2 files changed, 1 insertions, 18 deletions
diff --git a/debian/bcfg2-server.postinst b/debian/bcfg2-server.postinst index 2f65fe847..77dea5f22 100644 --- a/debian/bcfg2-server.postinst +++ b/debian/bcfg2-server.postinst @@ -40,21 +40,4 @@ esac #DEBHELPER# -# We do a restart manually here because with autogenerated code -# we get this traceback (eg something isn't done yet): -# This happens due to debhelper bug #546293, fixed in version 7.4.2. -## Setting up bcfg2-server (1.0.0~rc3+r5542-0.1+dctest8) ... -## Starting Configuration Management Server: Traceback (most recent call last): -## File "/usr/sbin/bcfg2-server", line 12, in <module> -## import Bcfg2.Server.Plugins.Metadata -## ImportError: No module named Server.Plugins.Metadata -## * bcfg2-server -if [ -x "/etc/init.d/bcfg2-server" ]; then - if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then - invoke-rc.d bcfg2-server start || exit $? - else - /etc/init.d/bcfg2-server start || exit $? - fi -fi - exit 0 diff --git a/debian/bcfg2.default b/debian/bcfg2.default index 0164e5531..8ed0da74a 100644 --- a/debian/bcfg2.default +++ b/debian/bcfg2.default @@ -20,7 +20,7 @@ #BCFG2_INIT=1 # BCFG2_AGENT: -# Bcfg2 no longer supports agent mode please use the Agent+SSH method +# Bcfg2 no longer supports agent mode, please see NEWS.Debian # BCFG2_CRON: # Set the frequency of cron runs. |