Merge ~smoser/ubuntu/+source/plymouth:bug/1714319-single-copy-of-nss-files into ~usd-import-team/ubuntu/+source/plymouth:ubuntu/devel

[Scott Moser]

[Robie Basak (racb)]

lgtm. Please submittodebian if you haven't already.

review: Approve

b02722f... by Scott Moser on 2017-09-06

releasing package plymouth version 0.9.2-3ubuntu16

Unmerged commits

b02722f... by Scott Moser on 2017-09-06

releasing package plymouth version 0.9.2-3ubuntu16

4b9a902... by Scott Moser on 2017-09-06

update changelog

1bf58d6... by Scott Moser on 2017-09-06

debian/local/plymouth.hook: add only a single copy of nss libs in initramfs.

Two copies of libnss_* were getting into the initramfs. One in /lib
and one in /lib/<arch-dir>. The fix is to not provide a target
directory when copying those files, but rather copy to the
directory that they came from.

LP: #1714319

diff --git a/debian/changelog b/debian/changelog
index f930f2a..8279feb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+plymouth (0.9.2-3ubuntu16) artful; urgency=medium
+
+  * debian/local/plymouth.hook: add only a single copy of nss libs in
+    initramfs.  LP #1714319.
+
+ -- Scott Moser <[e-mail]>  Wed, 06 Sep 2017 10:55:55 -0400
+
 plymouth (0.9.2-3ubuntu15) yakkety; urgency=medium
 
   * Fix hook script to not print warnings about label.so when using the
diff --git a/debian/local/plymouth.hook b/debian/local/plymouth.hook
index f5694d7..2f973ba 100644
--- a/debian/local/plymouth.hook
+++ b/debian/local/plymouth.hook
@@ -186,6 +186,6 @@ for _LIBRARY in /lib/@DEB_HOST_MULTIARCH@/libnss_files*
 do
 	if [ -e "${_LIBRARY}" ]
 	then
-		copy_exec ${_LIBRARY} /lib
+		copy_exec "${_LIBRARY}"
 	fi
 done