Merge lp:~allenap/maas/packaging.fix-patch-02 into lp:~maas-maintainers/maas/packaging

[Gavin Panella]

Fixes a patch that no longer applies cleanly because the OOPS section in the config file was removed.

[Raphaël Badin (rvb)]

It looks good: it applies cleanly now.

Now, I'm told it cannot be avoided but it's painful to get these silly questions about config files I didn't touch when upgrading: http://paste.ubuntu.com/9754896/

I'm +1 on this (since it fixes my immediate problem). But maybe it's worth Andres having a look at this.

(Also, IIRC you need a changelog entry for this)

review: Approve

[Gavin Panella (allenap)]

Thanks. I'll wait for roaksoax to comment too before I land.

[Andres Rodriguez (andreserl)]

review: Approve

[Raphaël Badin (rvb)]

@Andres: don't we need a changelog entry for this?

[Gavin Panella (allenap)]

I don't think it needs a changelog entry. It's just a repair, not a change that anyone's going want to read about.

=== modified file 'debian/patches/02-pserv-config.patch'
--- debian/patches/02-pserv-config.patch	2014-03-28 06:50:05 +0000
+++ debian/patches/02-pserv-config.patch	2015-01-15 10:09:46 +0000
@@ -3,8 +3,9 @@
  include port, logfile, oops directory, cobbler url and username
 Author: Andres Rodriguez <[e-mail]>
 
---- a/etc/maas/pserv.yaml
-+++ b/etc/maas/pserv.yaml
+=== modified file 'etc/maas/pserv.yaml'
+--- a/etc/maas/pserv.yaml	2015-01-14 16:24:44 +0000
++++ b/etc/maas/pserv.yaml	2015-01-15 10:05:50 +0000
 @@ -6,7 +6,7 @@
  ## running server.
  #
@@ -12,18 +13,9 @@
 -logfile: "/dev/null"
 +logfile: "/var/log/maas/pserv.log"
  
- ## OOPS configuration (optional).
+ ## TFTP configuration.
  #
-@@ -15,7 +15,7 @@
-   # or directories other than what the oops machinery creates there.
-   #
-   # directory:
--  directory: "logs/oops"
-+  directory: "/var/log/maas/oops"
-   # reporter:
-   reporter: "maas-pserv"
- 
-@@ -38,8 +38,6 @@
+@@ -18,8 +18,6 @@
    # resource_root: /var/lib/maas/boot-resources/current/
  
    # port: 69
@@ -32,3 +24,4 @@
    # generator: http://localhost/MAAS/api/1.0/pxeconfig/
 -  generator: http://localhost:5243/api/1.0/pxeconfig/
  
+