From 4f2c87a4f14a5e047d24cb102606d3f0af7dfd8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Mon, 18 Apr 2016 12:27:04 +0200 Subject: [PATCH] Import patches-unapplied version 2.403 to ubuntu/xenial-proposed Imported using git-ubuntu import. Changelog parent: 9fff6129dd29855f95d8ecdcd5b8109be58807fe New changelog entries: * Follow up on recent changes from the new network-manager packages and add the nm-openvpn user to touch. This should essentially fix the image build failures. --- debian/changelog | 8 ++++++++ live-build/ubuntu-touch/hooks/00-uid-gid-fix.chroot_early | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/debian/changelog b/debian/changelog index d9c852fa..3bfa4ae9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.403) xenial; urgency=medium + + * Follow up on recent changes from the new network-manager packages and add + the nm-openvpn user to touch. This should essentially fix the image build + failures. + + -- Łukasz 'sil2100' Zemczak Mon, 18 Apr 2016 12:27:04 +0200 + livecd-rootfs (2.402) xenial; urgency=medium * Update the passwd, shadow, group and gshadow bootstrap hashes for touch. 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 553f402d..a0fdadb3 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 @@ -52,6 +52,7 @@ systemd-timesync:x:111:113:systemd Time Synchronization,,,:/run/systemd:/bin/fal systemd-network:x:112:117:systemd Network Management,,,:/run/systemd/netif:/bin/false systemd-resolve:x:113:118:systemd Resolver,,,:/run/systemd/resolve:/bin/false systemd-bus-proxy:x:114:119:systemd Bus Proxy,,,:/run/systemd:/bin/false +nm-openvpn:x:115:120:NetworkManager OpenVPN,,,:/var/lib/openvpn/chroot:/bin/false EOF else echo "/etc/passwd post-debootstrap hash doesn't match record" >&2 @@ -99,6 +100,7 @@ systemd-timesync:*:16372:0:99999:7::: systemd-network:*:16372:0:99999:7::: systemd-resolve:*:16372:0:99999:7::: systemd-bus-proxy:*:16372:0:99999:7::: +nm-openvpn:*:16909:0:99999:7::: EOF else echo "/etc/shadow post-debootstrap hash doesn't match record" >&2 @@ -183,6 +185,7 @@ systemd-network:x:117: systemd-resolve:x:118: systemd-bus-proxy:x:119: input:x:121: +nm-openvpn:x:120: EOF else echo "/etc/group post-debootstrap hash doesn't match record" >&2 @@ -267,6 +270,7 @@ systemd-network:!:: systemd-resolve:!:: systemd-bus-proxy:!:: input:!:: +nm-openvpn:!:: EOF else echo "/etc/gshadow post-debootstrap hash doesn't match record" >&2