launchpad-reviewers team mailing list archive

[Julian Edwards <julian.edwards@xxxxxxxxxxxxx>]

Julian Edwards has proposed merging lp:~julian-edwards/maas/packaging into lp:~maas-maintainers/maas/packaging.

Commit message:
Make the trunk packaging branch also work on the older precise release.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #1052805 in MAAS: "Packaging build broken: no file to patch"
  https://bugs.launchpad.net/maas/+bug/1052805

For more details, see:
https://code.launchpad.net/~julian-edwards/maas/packaging/+merge/163459

This makes maas-dhcp install properly on precise, as the upstart script needs to be different.  This will enable the same packaging to be used for backports of trunk.
-- 
https://code.launchpad.net/~julian-edwards/maas/packaging/+merge/163459
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~julian-edwards/maas/packaging into lp:~maas-maintainers/maas/packaging.

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-08 22:50:06 +0000
+++ debian/changelog	2013-05-13 05:26:26 +0000
@@ -1,4 +1,4 @@
-maas (1.4+bzr1473+dfsg-0ubuntu2) UNRELEASED; urgency=low
+maas (1.4+bzr1475+dfsg-0ubuntu3) UNRELEASED; urgency=low
 
   * UNRELEASED
 
@@ -6,7 +6,12 @@
   * Add missing dependency on iproute to maas-region-controller, for use of
     /sbin/ip in postinst.
 
- -- Andres Rodriguez <andreserl@xxxxxxxxxx>  Wed, 20 Mar 2013 13:08:04 -0400
+  [ Julian Edwards ]
+  * debian/maas-dhcp.maas-dhcp-server.upstart:
+    - Detect 12.04 as the host OS and install with correct permissions. This
+      allows the same packaging to be used in the 12.04 backport.
+
+ -- Julian Edwards <julian.edwards@xxxxxxxxxxxxx>  Mon, 13 May 2013 12:42:59 +1000
 
 maas (1.3+bzr1455+dfsg-0ubuntu1) raring; urgency=low
 

=== modified file 'debian/maas-dhcp.maas-dhcp-server.upstart'
--- debian/maas-dhcp.maas-dhcp-server.upstart	2012-09-26 06:58:18 +0000
+++ debian/maas-dhcp.maas-dhcp-server.upstart	2013-05-13 05:26:26 +0000
@@ -37,6 +37,7 @@
 
 respawn
 script
+    . /etc/os-release
     INTERFACES=`cat "${INTERFACES_FILE}"`
 
     # Allow dhcp server to write lease and pid file.
@@ -47,14 +48,26 @@
     # the daemon will run under an unprivileged user).
     # In Precise, ownership was supposed to be dhcp:dhcp.
     mkdir -p $LEASES_DIR
-    chown root:root $LEASES_DIR
+    if [ "$VERSION_ID" = "12.04" ]; then
+        chown dhcpd:dhcpd $LEASES_DIR
+    else
+        chown root:root $LEASES_DIR
+    fi
     [ -e $LEASES_FILE ] || touch $LEASES_FILE
     for LFILE in $LEASES_FILE $LEASES_FILE~; do
         if [ -e $LFILE ]; then
-            chown root:root $LFILE
+            if [ "$VERSION_ID" = "12.04" ]; then
+                chown dhcpd:dhcpd $LFILE
+            else
+                chown root:root $LFILE
+            fi
             chmod a+r $LFILE
         fi
     done
 
-    exec /usr/sbin/dhcpd -user dhcpd -group dhcpd -f -q -4 -pf $PID_FILE -cf $CONFIG_FILE -lf $LEASES_FILE $INTERFACES
+    if [ "$VERSION_ID" = "12.04" ]; then
+        exec /usr/sbin/dhcpd -f -q -4 -pf $PID_FILE -cf $CONFIG_FILE -lf $LEASES_FILE $INTERFACES
+    else
+        exec /usr/sbin/dhcpd -user dhcpd -group dhcpd -f -q -4 -pf $PID_FILE -cf $CONFIG_FILE -lf $LEASES_FILE $INTERFACES
+    fi
 end script