From 7ff03ccdbb51cad4157fd101150690249d2ac60b Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Mon, 16 Nov 2015 15:44:48 +0100 Subject: [PATCH] Import patches-unapplied version 2.356 to ubuntu/xenial-proposed Imported using git-ubuntu import. Changelog parent: 20edede7eac9b9a4028638f4f44c3d04a0133cc5 New changelog entries: * merge lp:~sil2100/livecd-rootfs/update_hashes to update the passwd db hashes on ubuntu-touch builds (LP: #1516526) --- debian/changelog | 7 +++++++ live-build/ubuntu-touch/hooks/00-uid-gid-fix.chroot_early | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0ac43fd1..94b096e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.356) xenial; urgency=medium + + * merge lp:~sil2100/livecd-rootfs/update_hashes to update the passwd db + hashes on ubuntu-touch builds (LP: #1516526) + + -- Oliver Grawert Mon, 16 Nov 2015 15:44:48 +0100 + livecd-rootfs (2.355) xenial; urgency=medium * fix input group in snappy diff --git a/live-build/ubuntu-touch/hooks/00-uid-gid-fix.chroot_early b/live-build/ubuntu-touch/hooks/00-uid-gid-fix.chroot_early index 4895c452..e0efb47e 100755 --- a/live-build/ubuntu-touch/hooks/00-uid-gid-fix.chroot_early +++ b/live-build/ubuntu-touch/hooks/00-uid-gid-fix.chroot_early @@ -3,10 +3,10 @@ ERRCNT="" # Known good post-debootstrap values -passwd_bootstrap="e6075a0d2a38e214ae5e9a5545f7eda3" +passwd_bootstrap="677bdb95956f6214a0007543fe15a1bf" shadow_bootstrap="7fa48d7fb0e3a1ede9c98ff7b1b33622" -group_bootstrap="5fd842058cd526ddaf51c2a61870c12a" -gshadow_bootstrap="3145b72315c7306edb13bf546bb350b9" +group_bootstrap="eb863998da1d7cad986cea2466ef23a1" +gshadow_bootstrap="5da14ec60af7c53eacadc05859bfd5f4" # Current post-debootstrap values passwd_hash=$(set -- $(md5sum /etc/passwd) && echo $1)