Merge lp:~semiosis/ubuntu/precise/glusterfs/fix-for-876648 into lp:ubuntu/precise/glusterfs

[Louis Zuckerman]

added two upstart jobs to glusterfs-server package:
- glusterfs-server.conf: the glusterd management daemon (replaces debian initscript)
- mounting-glusterfs.conf: blocks mounting glusterfs filesystems until glusterfs-server is started

[Clint Byrum (clint-fewbar)]

Wow this is great, thanks so much for submitting.

One nit-pick.. you need to run 'update-maintainer' in the package root so that the Maintainer is changed to the ubuntu developers, since we have patched the package. Just run that, and bzr commit/push, and it will be ready to be sponsored.

review: Needs Fixing

[lp:~semiosis/ubuntu/precise/glusterfs/fix-for-876648]

22. By Louis Zuckerman on 2012-01-29

updated maintaner to ubuntu developers

[Louis Zuckerman (semiosis)]

> Wow this is great, thanks so much for submitting.
>
> One nit-pick.. you need to run 'update-maintainer' in the package root so that
> the Maintainer is changed to the ubuntu developers, since we have patched the
> package. Just run that, and bzr commit/push, and it will be ready to be
> sponsored.

Done. I also fixed a typo in the mounting-glusterfs description.

[lp:~semiosis/ubuntu/precise/glusterfs/fix-for-876648]

23. By Louis Zuckerman on 2012-01-29

fixed a typo in the mounting-glusterfs description

Unmerged revisions

23. By Louis Zuckerman on 2012-01-29

fixed a typo in the mounting-glusterfs description

22. By Louis Zuckerman on 2012-01-29

updated maintaner to ubuntu developers

21. By Louis Zuckerman on 2012-01-28

Added Ubuntu upstart jobs providing support for local glusterfs mounts
(LP: #876648)

=== modified file 'debian/changelog'
--- debian/changelog	2012-01-07 14:19:57 +0000
+++ debian/changelog	2012-01-29 12:55:28 +0000
@@ -1,3 +1,10 @@
+glusterfs (3.2.5-1ubuntu1) precise; urgency=low
+
+  * Added Ubuntu upstart jobs providing support for local glusterfs mounts
+    (LP: #876648)
+
+ -- Louis Zuckerman <[e-mail]>  Sat, 28 Jan 2012 15:32:55 -0500
+
 glusterfs (3.2.5-1) unstable; urgency=low
 
   [ Louis Zuckerman ]

=== modified file 'debian/control'
--- debian/control	2011-11-05 11:33:56 +0000
+++ debian/control	2012-01-29 12:55:28 +0000
@@ -1,7 +1,8 @@
 Source: glusterfs
 Section: admin
 Priority: optional
-Maintainer: Patrick Matthäi <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Patrick Matthäi <[e-mail]>
 Uploaders: Matthias Albert <[e-mail]>,
 Build-Depends: cdbs (>= 0.4.90~),
  debhelper (>= 7),

=== added file 'debian/glusterfs-server.mounting-glusterfs.upstart'
--- debian/glusterfs-server.mounting-glusterfs.upstart	1970-01-01 00:00:00 +0000
+++ debian/glusterfs-server.mounting-glusterfs.upstart	2012-01-29 12:55:28 +0000
@@ -0,0 +1,7 @@
+author "Louis Zuckerman <[e-mail]>"
+description "Block the mounting event for glusterfs filesystems until glusterfs-server is running"
+
+start on mounting TYPE=glusterfs
+task
+exec start wait-for-state WAIT_FOR=glusterfs-server WAITER=mounting-glusterfs
+

=== added file 'debian/glusterfs-server.upstart'
--- debian/glusterfs-server.upstart	1970-01-01 00:00:00 +0000
+++ debian/glusterfs-server.upstart	2012-01-29 12:55:28 +0000
@@ -0,0 +1,10 @@
+author "Louis Zuckerman <[e-mail]>"
+description "GlusterFS Management Daemon"
+
+start on runlevel [2345]
+stop on runlevel [016]
+
+expect fork
+
+exec /usr/sbin/glusterd -p /var/run/glusterd.pid
+

=== modified file 'debian/rules'
--- debian/rules	2011-06-26 21:00:42 +0000
+++ debian/rules	2012-01-29 12:55:28 +0000
@@ -24,6 +24,9 @@
 	rm -f debian/tmp/usr/lib/glusterfs/glusterfs/python/syncdaemon/*.pyc
 	rm -f debian/tmp/usr/lib/glusterfs/glusterfs/python/syncdaemon/*.pyo
 
+binary-install/glusterfs-server::
+	dh_installinit -pglusterfs-server --upstart-only --no-start --name mounting-glusterfs
+
 clean::
 	dh $@