From 4825764bf07f5bea386ade8347c680644af7692a Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Tue, 10 Mar 2015 12:07:16 +0100 Subject: [PATCH] Import patches-unapplied version 2.292 to ubuntu/vivid-proposed Imported using git-ubuntu import. Changelog parent: 04b6ca0a8a38f019d7533c3d8e0fdf534302e9b2 New changelog entries: [ Michael Vogt ] * live-build/ubuntu-core/hooks/11-remove-extra-packages.chroot: - python2 is no longer required on a snappy system * live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early: - updated md5sums as the ordering of users/groups has changed with the new systemd-sysv [ Oliver Grawert ] * live-build/ubuntu-touch/hooks/00-uid-gid-fix.chroot_early: bump all md5sums to new values, now that debootstrap installs systemd-sysv instead of upstart the ordering and thus the group numbering has changed --- debian/changelog | 16 ++++++++++++++++ .../hooks/00-uid-gid-fix.chroot_early | 8 ++++---- .../hooks/11-remove-extra-packages.chroot | 3 +++ .../hooks/00-uid-gid-fix.chroot_early | 8 ++++---- 4 files changed, 27 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index d871127d..a5a54900 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +livecd-rootfs (2.292) vivid; urgency=low + + [ Michael Vogt ] + * live-build/ubuntu-core/hooks/11-remove-extra-packages.chroot: + - python2 is no longer required on a snappy system + * live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early: + - updated md5sums as the ordering of users/groups has changed with + the new systemd-sysv + + [ Oliver Grawert ] + * live-build/ubuntu-touch/hooks/00-uid-gid-fix.chroot_early: + bump all md5sums to new values, now that debootstrap installs systemd-sysv + instead of upstart the ordering and thus the group numbering has changed + + -- Oliver Grawert Tue, 10 Mar 2015 12:07:16 +0100 + livecd-rootfs (2.291) vivid; urgency=low [ Michael Vogt ] diff --git a/live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early b/live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early index d5f53471..f799bd82 100755 --- a/live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early +++ b/live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early @@ -3,10 +3,10 @@ ERRCNT="" # Known good post-debootstrap values -passwd_bootstrap="9738946debbc125bd6cf3f197582a8a5" -shadow_bootstrap="4d299751999cae6de045390dd568812c" -group_bootstrap="63632e6266046ef7e59a1f090f93a2de" -gshadow_bootstrap="0b17c40c462aba03bed49ce62300de73" +passwd_bootstrap="af34a24499223f08ab713138bec7ff54" +shadow_bootstrap="1fd73103260cbe5a13a4a38320de4129" +group_bootstrap="9edf30f181a6fd1d860cc7f4a71aa640" +gshadow_bootstrap="b9db51ef767ab98db963db69844635dd" # Current post-debootstrap values passwd_hash=$(set -- $(md5sum /etc/passwd) && echo $1) diff --git a/live-build/ubuntu-core/hooks/11-remove-extra-packages.chroot b/live-build/ubuntu-core/hooks/11-remove-extra-packages.chroot index f9c1ffe0..cc6ae423 100644 --- a/live-build/ubuntu-core/hooks/11-remove-extra-packages.chroot +++ b/live-build/ubuntu-core/hooks/11-remove-extra-packages.chroot @@ -9,3 +9,6 @@ apt-get purge -y locales # system-image-cli in vivid does no longer depend on # ubuntu-download-manager apt-get purge -y libicu52 + +# no more py2, yay +apt-get purge -y python python-minimal libpython-stdlib python2.7 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 97bea6ce..909f034e 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="5e8366ef9c178b62079468966f38ce5f" -shadow_bootstrap="1c562aa2ed2f443b9151953e800eca16" -group_bootstrap="11709d548918f428231ce5801f6da521" -gshadow_bootstrap="52170f98470bb898b27f7403b96aae91" +passwd_bootstrap="1050cdb2fcde4d10c86399616f64dfdb" +shadow_bootstrap="7fa48d7fb0e3a1ede9c98ff7b1b33622" +group_bootstrap="63c26ba30ffcd19be36f02a88621ab91" +gshadow_bootstrap="e42acfd7c494c6085b5f3d2b1e353995" # Current post-debootstrap values passwd_hash=$(set -- $(md5sum /etc/passwd) && echo $1)