Merge lp:~louis/ubuntu/trusty/cloud-initramfs-tools/fix-trusty-ftbs into lp:ubuntu/trusty/cloud-initramfs-tools

[Louis Bouchard]

Fix Makefile to take into account new overlayroot/etc/update-motd.d added in previous commit that will fix FTBS on trusty-proposed

=== modified file 'Makefile'
--- Makefile	2013-08-27 16:48:53 +0000
+++ Makefile	2013-12-23 15:16:12 +0000
@@ -20,8 +20,14 @@
 		done; done
 	set -e; for d in $(MODULES); do \
 		[ -d "$$d/etc" ] || continue ; \
-		install -m 644 "$$d/etc"/* "$(DESTDIR)/etc" ; \
-		done
+		for f in $$d/etc/*; do \
+		    if [ -d "$$f" ];then \
+		    		install -m 755 -d "$(DESTDIR)/etc/$${f##*/}" ; \
+				install "$$f"/* "$(DESTDIR)/etc/$${f##*/}" ; \
+				continue ; \
+				fi ;\
+			install -m 644 -t "$(DESTDIR)/etc" "$$f" ;\
+			done; done
 	set -e; for d in $(MODULES); do \
 		[ -d "$$d/tools" ] || continue ; \
 		mkdir -p "$(ULIB_PRE)$$d/" && \
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-08-27 16:48:53 +0000
+++ debian/changelog	2013-12-23 15:16:12 +0000
@@ -1,3 +1,21 @@
+cloud-initramfs-tools (0.21ubuntu2) UNRELEASED; urgency=low
+
+  * Fix Makefile to avoid FTBS caused by subdir in overlayroot/etc
+    Makefile now takes into account when subdirectories are present in
+    the overlayroot directory.
+
+ -- Louis Bouchard <[e-mail]>  Thu, 19 Dec 2013 16:09:38 +0100
+
+cloud-initramfs-tools (0.21ubuntu1) trusty; urgency=low
+
+  * === added directory overlayroot/etc/update-motd.d,
+    debian/overlayroot.install, overlayroot/etc/update-motd.d/97-
+    overlayroot:
+    - add an update-motd message, when booted in an overlayroot
+      environment
+
+ -- Dustin Kirkland <[e-mail]>  Fri, 15 Nov 2013 12:05:58 -0600
+
 cloud-initramfs-tools (0.20ubuntu1) saucy; urgency=low
 
   * debian/control: depend on cloud-utils or cloud-guest-utils.
 
=== modified file 'debian/overlayroot.install'
--- debian/overlayroot.install	2012-07-23 09:38:46 +0000
+++ debian/overlayroot.install	2013-12-23 15:16:12 +0000
@@ -1,4 +1,5 @@
 etc/overlayroot.conf
+etc/update-motd.d
 usr/sbin/overlayroot-chroot
 usr/share/initramfs-tools/hooks/overlayroot
 usr/share/initramfs-tools/scripts/*/overlayroot
 
=== added directory 'overlayroot/etc/update-motd.d'
=== added file 'overlayroot/etc/update-motd.d/97-overlayroot'
--- overlayroot/etc/update-motd.d/97-overlayroot	1970-01-01 00:00:00 +0000
+++ overlayroot/etc/update-motd.d/97-overlayroot	2013-12-23 15:16:12 +0000
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+(egrep "overlayroot|/media/root-ro|/media/root-rw" /proc/mounts 2>/dev/null | sort -r) || true
+echo