From 17b8a1df96557cf0b527d346c90d0f041a2c677d Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Wed, 16 Jul 2014 14:15:21 +0200 Subject: [PATCH] Import patches-unapplied version 2.223 to ubuntu/utopic-proposed Imported using git-ubuntu import. Changelog parent: 8d7dc2cd7f84030aa8045ef29a1b35f869b5e682 New changelog entries: * add android_cache group (GID 2001) so that after we switch developer mode to default to the phablet user it is still possible to adb push image tarballs to the /cache partition --- debian/changelog | 8 ++++++++ .../ubuntu-touch/hooks/02-add_user_to_groups.chroot | 9 ++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 0a1247c7..f038a9db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.223) utopic; urgency=medium + + * add android_cache group (GID 2001) so that after we switch developer mode + to default to the phablet user it is still possible to adb push image + tarballs to the /cache partition + + -- Oliver Grawert Wed, 16 Jul 2014 14:15:21 +0200 + livecd-rootfs (2.222) utopic; urgency=medium * Precompiling apparmor policies on touch diff --git a/live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot b/live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot index 7d0d3ec7..62e26615 100755 --- a/live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot +++ b/live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot @@ -2,7 +2,7 @@ USER=phablet -DEFGROUPS="tty,sudo,adm,dialout,cdrom,plugdev,audio,dip,video,gps,radio,bluetooth,android_net,android_net2,android_net3,android_graphics,android_input,sdcard_rw,android_media,android_nvram" +DEFGROUPS="tty,sudo,adm,dialout,cdrom,plugdev,audio,dip,video,gps,radio,bluetooth,android_net,android_net2,android_net3,android_graphics,android_input,sdcard_rw,android_media,android_nvram, android_cache" /bin/egrep -i "^audio:" /etc/group if [ $? -eq 0 ]; then @@ -91,6 +91,13 @@ else echo "User android_nvram does not exist in /etc group -- must create" groupadd -g 9997 android_nvram fi +/bin/egrep -i "^android_cache:" /etc/group +if [ $? -eq 0 ]; then + echo "User android_cache exists in /etc/group" +else + echo "User android_cache does not exist in /etc group -- must create" + groupadd -g 2001 android_cache +fi echo "I: add $USER to ($DEFGROUPS) groups" usermod -a -G ${DEFGROUPS} ${USER}