From 69a5210a5346c66ab135dad2cb19014094c2e1ab Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Wed, 9 Sep 2015 13:20:10 +0200 Subject: [PATCH] Import patches-unapplied version 2.342 to ubuntu/wily-proposed Imported using git-ubuntu import. Changelog parent: a96c01b1d43d116eb0031c585e5ea4a59c096ba9 New changelog entries: * ubuntu-touch, ubuntu-desktop-next: drop systemd-journal-remote from group files, update md5sums in 00-uid-gid-fix.chroot_early --- debian/changelog | 7 +++++++ .../ubuntu-desktop-next/hooks/00-uid-gid-fix.chroot_early | 8 +++----- live-build/ubuntu-touch/hooks/00-uid-gid-fix.chroot_early | 8 +++----- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7bf917a5..e339b53f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.342) wily; urgency=medium + + * ubuntu-touch, ubuntu-desktop-next: drop systemd-journal-remote from group + files, update md5sums in 00-uid-gid-fix.chroot_early + + -- Oliver Grawert Wed, 09 Sep 2015 13:20:10 +0200 + livecd-rootfs (2.341) wily; urgency=medium * add ppp and watchdog packages to snappy diff --git a/live-build/ubuntu-desktop-next/hooks/00-uid-gid-fix.chroot_early b/live-build/ubuntu-desktop-next/hooks/00-uid-gid-fix.chroot_early index c3f901d1..5615383b 100755 --- a/live-build/ubuntu-desktop-next/hooks/00-uid-gid-fix.chroot_early +++ b/live-build/ubuntu-desktop-next/hooks/00-uid-gid-fix.chroot_early @@ -3,10 +3,10 @@ ERRCNT="" # Known good post-debootstrap values -passwd_bootstrap="1050cdb2fcde4d10c86399616f64dfdb" +passwd_bootstrap="e6075a0d2a38e214ae5e9a5545f7eda3" shadow_bootstrap="7fa48d7fb0e3a1ede9c98ff7b1b33622" -group_bootstrap="63c26ba30ffcd19be36f02a88621ab91" -gshadow_bootstrap="e42acfd7c494c6085b5f3d2b1e353995" +group_bootstrap="5fd842058cd526ddaf51c2a61870c12a" +gshadow_bootstrap="3145b72315c7306edb13bf546bb350b9" # Current post-debootstrap values passwd_hash=$(set -- $(md5sum /etc/passwd) && echo $1) @@ -154,7 +154,6 @@ users:x:100: nogroup:x:65534: input:x:101: systemd-journal:x:102: -systemd-journal-remote:x:103: systemd-timesync:x:104: systemd-network:x:105: systemd-resolve:x:106: @@ -232,7 +231,6 @@ users:*:: nogroup:*:: input:!:: systemd-journal:!:: -systemd-journal-remote:!:: systemd-timesync:!:: systemd-network:!:: systemd-resolve:!:: 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 909f034e..4895c452 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="1050cdb2fcde4d10c86399616f64dfdb" +passwd_bootstrap="e6075a0d2a38e214ae5e9a5545f7eda3" shadow_bootstrap="7fa48d7fb0e3a1ede9c98ff7b1b33622" -group_bootstrap="63c26ba30ffcd19be36f02a88621ab91" -gshadow_bootstrap="e42acfd7c494c6085b5f3d2b1e353995" +group_bootstrap="5fd842058cd526ddaf51c2a61870c12a" +gshadow_bootstrap="3145b72315c7306edb13bf546bb350b9" # Current post-debootstrap values passwd_hash=$(set -- $(md5sum /etc/passwd) && echo $1) @@ -182,7 +182,6 @@ systemd-timesync:x:113: systemd-network:x:117: systemd-resolve:x:118: systemd-bus-proxy:x:119: -systemd-journal-remote:x:120: input:x:121: EOF else @@ -267,7 +266,6 @@ systemd-timesync:!:: systemd-network:!:: systemd-resolve:!:: systemd-bus-proxy:!:: -systemd-journal-remote:!:: input:!:: EOF else