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

Proposed by Louis Bouchard
Status: Merged
Merged at revision: 23
Proposed branch: lp:~louis/ubuntu/trusty/cloud-initramfs-tools/fix-trusty-ftbs
Merge into: lp:ubuntu/trusty/cloud-initramfs-tools
Diff against target: 66 lines (+31/-2)
4 files modified
Makefile (+8/-2)
debian/changelog (+18/-0)
debian/overlayroot.install (+1/-0)
overlayroot/etc/update-motd.d/97-overlayroot (+4/-0)
To merge this branch: bzr merge lp:~louis/ubuntu/trusty/cloud-initramfs-tools/fix-trusty-ftbs
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+199958@code.launchpad.net

Description of the change

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

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2013-08-27 16:48:53 +0000
3+++ Makefile 2013-12-23 15:16:12 +0000
4@@ -20,8 +20,14 @@
5 done; done
6 set -e; for d in $(MODULES); do \
7 [ -d "$$d/etc" ] || continue ; \
8- install -m 644 "$$d/etc"/* "$(DESTDIR)/etc" ; \
9- done
10+ for f in $$d/etc/*; do \
11+ if [ -d "$$f" ];then \
12+ install -m 755 -d "$(DESTDIR)/etc/$${f##*/}" ; \
13+ install "$$f"/* "$(DESTDIR)/etc/$${f##*/}" ; \
14+ continue ; \
15+ fi ;\
16+ install -m 644 -t "$(DESTDIR)/etc" "$$f" ;\
17+ done; done
18 set -e; for d in $(MODULES); do \
19 [ -d "$$d/tools" ] || continue ; \
20 mkdir -p "$(ULIB_PRE)$$d/" && \
21
22=== modified file 'debian/changelog'
23--- debian/changelog 2013-08-27 16:48:53 +0000
24+++ debian/changelog 2013-12-23 15:16:12 +0000
25@@ -1,3 +1,21 @@
26+cloud-initramfs-tools (0.21ubuntu2) UNRELEASED; urgency=low
27+
28+ * Fix Makefile to avoid FTBS caused by subdir in overlayroot/etc
29+ Makefile now takes into account when subdirectories are present in
30+ the overlayroot directory.
31+
32+ -- Louis Bouchard <louis.bouchard@ubuntu.com> Thu, 19 Dec 2013 16:09:38 +0100
33+
34+cloud-initramfs-tools (0.21ubuntu1) trusty; urgency=low
35+
36+ * === added directory overlayroot/etc/update-motd.d,
37+ debian/overlayroot.install, overlayroot/etc/update-motd.d/97-
38+ overlayroot:
39+ - add an update-motd message, when booted in an overlayroot
40+ environment
41+
42+ -- Dustin Kirkland <kirkland@ubuntu.com> Fri, 15 Nov 2013 12:05:58 -0600
43+
44 cloud-initramfs-tools (0.20ubuntu1) saucy; urgency=low
45
46 * debian/control: depend on cloud-utils or cloud-guest-utils.
47
48=== modified file 'debian/overlayroot.install'
49--- debian/overlayroot.install 2012-07-23 09:38:46 +0000
50+++ debian/overlayroot.install 2013-12-23 15:16:12 +0000
51@@ -1,4 +1,5 @@
52 etc/overlayroot.conf
53+etc/update-motd.d
54 usr/sbin/overlayroot-chroot
55 usr/share/initramfs-tools/hooks/overlayroot
56 usr/share/initramfs-tools/scripts/*/overlayroot
57
58=== added directory 'overlayroot/etc/update-motd.d'
59=== added file 'overlayroot/etc/update-motd.d/97-overlayroot'
60--- overlayroot/etc/update-motd.d/97-overlayroot 1970-01-01 00:00:00 +0000
61+++ overlayroot/etc/update-motd.d/97-overlayroot 2013-12-23 15:16:12 +0000
62@@ -0,0 +1,4 @@
63+#!/bin/sh
64+
65+(egrep "overlayroot|/media/root-ro|/media/root-rw" /proc/mounts 2>/dev/null | sort -r) || true
66+echo

Subscribers

People subscribed via source and target branches