From 39986bad6c2ae7bb15a31acd0159da537ef431d3 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Mon, 26 Aug 2013 16:53:29 +0200 Subject: [PATCH] do not forcefully use the admin group on touch images. this group was dropped in favour of the sudo group several releases ago --- debian/changelog | 7 +++++++ .../ubuntu-touch/hooks/02-add_user_to_groups.chroot | 9 +-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0ffacfad..0ac9276c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.177) UNRELEASED; urgency=low + + * do not forcefully use the admin group on touch images. this group was + dropped in favour of the sudo group several releases ago + + -- Oliver Grawert Mon, 26 Aug 2013 16:51:13 +0200 + livecd-rootfs (2.176) saucy; urgency=low * preserve a symlink of media-info for backwards compatibility 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 875b23d6..f2fed7cc 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,15 +2,8 @@ USER=phablet -DEFGROUPS="tty,admin,adm,dialout,cdrom,plugdev,audio,dip,video,gps,radio,bluetooth,android_net,android_net2,android_net3,android_graphics,android_input,sdcard_rw" +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" -/bin/egrep -i "^admin:" /etc/group -if [ $? -eq 0 ]; then - echo "User admin exists in /etc/group" -else - echo "User admin does not exists in /etc/group must create" - groupadd admin -fi /bin/egrep -i "^audio:" /etc/group if [ $? -eq 0 ]; then # Needed to change group id as audio is already created by ubuntu