From fad2ce5b7010f9effeb8a89bb5d5413dc1c6fa40 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Mon, 10 Jun 2013 12:33:32 +0200 Subject: [PATCH] Import patches-unapplied version 2.148 to ubuntu/saucy-proposed Imported using git-ubuntu import. Changelog parent: f08f10f560e24ee4414aacf260a14ed1a440799a New changelog entries: [ Colin Watson ] * live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot: Delete redundant code to create global static groups, which are already created more correctly by base-passwd on every Ubuntu system. * live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot: Fix detection of existing groups not to misfire if there is an existing group with the desired group name as a prefix. [ Oliver Grawert ] * drop daily-build-next PPA, according to didrocks everything from there should be in the saucy archive now, yay. --- debian/changelog | 16 +++++ .../ubuntu-unity-daily-build-next.key.chroot | 14 ---- .../ubuntu-unity-daily-build-next.list.chroot | 2 - .../hooks/02-add_user_to_groups.chroot | 71 +++---------------- 4 files changed, 27 insertions(+), 76 deletions(-) delete mode 100644 live-build/ubuntu-touch/archives/ubuntu-unity-daily-build-next.key.chroot delete mode 100644 live-build/ubuntu-touch/archives/ubuntu-unity-daily-build-next.list.chroot diff --git a/debian/changelog b/debian/changelog index a0613f11..6d1912a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +livecd-rootfs (2.148) saucy; urgency=low + + [ Colin Watson ] + * live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot: Delete + redundant code to create global static groups, which are already created + more correctly by base-passwd on every Ubuntu system. + * live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot: Fix + detection of existing groups not to misfire if there is an existing + group with the desired group name as a prefix. + + [ Oliver Grawert ] + * drop daily-build-next PPA, according to didrocks everything from there + should be in the saucy archive now, yay. + + -- Oliver Grawert Mon, 10 Jun 2013 12:33:32 +0200 + livecd-rootfs (2.147) saucy; urgency=low * sync ubuntu-touch customzation scripts with phablet build tree diff --git a/live-build/ubuntu-touch/archives/ubuntu-unity-daily-build-next.key.chroot b/live-build/ubuntu-touch/archives/ubuntu-unity-daily-build-next.key.chroot deleted file mode 100644 index 26a606b4..00000000 --- a/live-build/ubuntu-touch/archives/ubuntu-unity-daily-build-next.key.chroot +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: SKS 1.1.4 -Comment: Hostname: keyserver.ubuntu.com - -mI0EUKJp4AEEANqa4yLubhYUWP6NFignwYDXfSQDxD1K5m06SyuTuqI37zRI+GaFvaiNCwzK -7Qfx4TikrpNIIIc3c1+rYSsSQQadWqJRvrbs7MixcDQGRb+SQ+bglIdD+1hw9xSvMXGO/dOa -Zv6ZVlLxJiYWAKZuFXtugKQF2yyh0eug6/7wuRYxABEBAAG0MkxhdW5jaHBhZCBQUEEgZm9y -IFVidW50dSBVbml0eSBQUyBpbnRlZ3JhdGlvbiB0ZWFtiLgEEwECACIFAlCiaeACGwMGCwkI -BwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEEVRQo5S1i9FdDMEAKL25MjyO+W7+MJRiEzaV/gd -a41lQsqLFXDWdYFaF1FqrLNa6/E5Ph+oVV6tK8O/HSeXGVgDZeEL6iBX3SvwEgLyGr33z8IZ -22JNS5UIXmwSKO5PIx8Qs6LjOaQtAlZRDwj/5wQo9IqNclSA/hrFNH7XuHeglqITgccPCPEZ -MByN -=VBVL ------END PGP PUBLIC KEY BLOCK----- diff --git a/live-build/ubuntu-touch/archives/ubuntu-unity-daily-build-next.list.chroot b/live-build/ubuntu-touch/archives/ubuntu-unity-daily-build-next.list.chroot deleted file mode 100644 index 28cd25f1..00000000 --- a/live-build/ubuntu-touch/archives/ubuntu-unity-daily-build-next.list.chroot +++ /dev/null @@ -1,2 +0,0 @@ -deb http://ppa.launchpad.net/ubuntu-unity/daily-build-next/ubuntu @DISTRIBUTION@ main -# deb-src http://ppa.launchpad.net/ubuntu-unity/daily-build-next/ubuntu @DISTRIBUTION@ main 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 4c055b3d..2f4b20d3 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 @@ -4,42 +4,14 @@ 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" -/bin/egrep -i "^admin" /etc/group +/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 "^tty" /etc/group -if [ $? -eq 0 ]; then - echo "User tty exists in /etc/group" -else - echo "User tty does not exists in /etc/group must create" - groupadd tty -fi -/bin/egrep -i "^dialout" /etc/group -if [ $? -eq 0 ]; then - echo "User dialout exists in /etc/group" -else - echo "User dialout does not exists in /etc/group must create" - groupadd dialout -fi -/bin/egrep -i "^cdrom" /etc/group -if [ $? -eq 0 ]; then - echo "User cdrom exists in /etc/group" -else - echo "User cdrom does not exists in /etc/group must create" - groupadd cdrom -fi -/bin/egrep -i "^plugdev" /etc/group -if [ $? -eq 0 ]; then - echo "User plugdev exists in /etc/group" -else - echo "User plugdev does not exists in /etc/group must create" - groupadd plugdev -fi -/bin/egrep -i "^audio" /etc/group +/bin/egrep -i "^audio:" /etc/group if [ $? -eq 0 ]; then # Needed to change group id as audio is already created by ubuntu echo "User audio exists in /etc/group, changing gid to be android compatible" @@ -48,84 +20,63 @@ else echo "User audio does not exists in /etc/group must create" groupadd -g 1005 audio fi -/bin/egrep -i "^dip" /etc/group -if [ $? -eq 0 ]; then - echo "User dip exists in /etc/group" -else - echo "User dip does not exists in /etc/group must create" - groupadd dip -fi -/bin/egrep -i "^video" /etc/group -if [ $? -eq 0 ]; then - echo "User video exists in /etc/group" -else - echo "User video does not exists in /etc/group must create" - groupadd video -fi -/bin/egrep -i "^adm" /etc/group -if [ $? -eq 0 ]; then - echo "User adm exists in /etc/group" -else - echo "User adm does not exists in /etc/group must create" - groupadd adm -fi -/bin/egrep -i "^gps" /etc/group +/bin/egrep -i "^gps:" /etc/group if [ $? -eq 0 ]; then echo "User gps exists in /etc/group" else echo "User gps does not exist in /etc/group -- must create" groupadd -g 1021 gps fi -/bin/egrep -i "^radio" /etc/group +/bin/egrep -i "^radio:" /etc/group if [ $? -eq 0 ]; then echo "User radio exists in /etc/group" else echo "User radio does not exist in /etc/group -- must create" groupadd -g 1001 radio fi -/bin/egrep -i "^bluetooth" /etc/group +/bin/egrep -i "^bluetooth:" /etc/group if [ $? -eq 0 ]; then echo "User bluetooth exists in /etc/group" else echo "User bluetooth does not exist in /etc/group -- must create" groupadd -g 1002 bluetooth fi -/bin/egrep -i "^android_net" /etc/group +/bin/egrep -i "^android_net:" /etc/group if [ $? -eq 0 ]; then echo "User android_net exists in /etc/group" else echo "User android_net does not exist in /etc/group -- must create" groupadd -g 3003 android_net fi -/bin/egrep -i "^android_net2" /etc/group +/bin/egrep -i "^android_net2:" /etc/group if [ $? -eq 0 ]; then echo "User android_net2 exists in /etc/group" else echo "User android_net2 does not exist in /etc group -- must create" groupadd -g 3004 android_net2 fi -/bin/egrep -i "^android_net3" /etc/group +/bin/egrep -i "^android_net3:" /etc/group if [ $? -eq 0 ]; then echo "User android_net3 exists in /etc/group" else echo "User android_net3 does not exist in /etc group -- must create" groupadd -g 3002 android_net3 fi -/bin/egrep -i "^android_graphics" /etc/group +/bin/egrep -i "^android_graphics:" /etc/group if [ $? -eq 0 ]; then echo "User android_graphics exists in /etc/group" else echo "User android_graphics does not exist in /etc group -- must create" groupadd -g 1003 android_graphics fi -/bin/egrep -i "^android_input" /etc/group +/bin/egrep -i "^android_input:" /etc/group if [ $? -eq 0 ]; then echo "User android_input exists in /etc/group" else echo "User android_input does not exist in /etc group -- must create" groupadd -g 1004 android_input fi -/bin/egrep -i "^sdcard_rw" /etc/group +/bin/egrep -i "^sdcard_rw:" /etc/group if [ $? -eq 0 ]; then echo "User sdcard_rw exists in /etc/group" else