Merge lp:~tom-gall/linaro/live-helper-netbook-efl-add-default-settings into lp:~linaro-maintainers/linaro/live-helper.config.maverick.netbook-efl

Proposed by Tom Gall
Status: Merged
Merged at revision: 45
Proposed branch: lp:~tom-gall/linaro/live-helper-netbook-efl-add-default-settings
Merge into: lp:~linaro-maintainers/linaro/live-helper.config.maverick.netbook-efl
Diff against target: 51 lines (+30/-0)
4 files modified
chroot_local-hooks/01-setup_user_linaro.sh (+6/-0)
chroot_local-hooks/02-add_linaro_to-admin.sh (+5/-0)
chroot_local-hooks/03-check_sudoers_for_admin.sh (+10/-0)
chroot_local-includes/etc/gdm/custom.conf (+9/-0)
To merge this branch: bzr merge lp:~tom-gall/linaro/live-helper-netbook-efl-add-default-settings

Description of the change

- Add default linaro user with linaro as the pw
- check that admin group exists, if not create it
- check sudoers, add admin to sudoers if necessary
- utilize /etc/gdm/custom.conf to autologin with linaro user id

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'chroot_local-hooks/01-setup_user_linaro.sh'
2--- chroot_local-hooks/01-setup_user_linaro.sh 1970-01-01 00:00:00 +0000
3+++ chroot_local-hooks/01-setup_user_linaro.sh 2010-10-11 04:43:39 +0000
4@@ -0,0 +1,6 @@
5+#!/bin/sh
6+
7+echo "I: create linaro user"
8+adduser --gecos linaro --disabled-password linaro
9+echo "I: set linaro user password"
10+echo "linaro:linaro" | chpasswd
11
12=== added file 'chroot_local-hooks/02-add_linaro_to-admin.sh'
13--- chroot_local-hooks/02-add_linaro_to-admin.sh 1970-01-01 00:00:00 +0000
14+++ chroot_local-hooks/02-add_linaro_to-admin.sh 2010-10-11 04:43:39 +0000
15@@ -0,0 +1,5 @@
16+#!/bin/sh
17+
18+echo "I: add linaro to admin group"
19+usermod -G admin linaro
20+
21
22=== added file 'chroot_local-hooks/03-check_sudoers_for_admin.sh'
23--- chroot_local-hooks/03-check_sudoers_for_admin.sh 1970-01-01 00:00:00 +0000
24+++ chroot_local-hooks/03-check_sudoers_for_admin.sh 2010-10-11 04:43:39 +0000
25@@ -0,0 +1,10 @@
26+#!/bin/sh
27+
28+# check to make sure sudoers file has ref for admin
29+ADMINEXISTS="$(awk '$1 == "%admin" { print $1 }' /etc/sudoers)"
30+if [ "%admin" != "$ADMINEXISTS" ]; then
31+ # append admin entry to sudoers
32+ echo "# Members of the admin group may gain root privileges" >> /etc/sudoers
33+ echo "%admin ALL=(ALL) ALL" >> /etc/sudoers
34+fi
35+
36
37=== added directory 'chroot_local-includes/etc'
38=== added directory 'chroot_local-includes/etc/gdm'
39=== added file 'chroot_local-includes/etc/gdm/custom.conf'
40--- chroot_local-includes/etc/gdm/custom.conf 1970-01-01 00:00:00 +0000
41+++ chroot_local-includes/etc/gdm/custom.conf 2010-10-11 04:43:39 +0000
42@@ -0,0 +1,9 @@
43+[daemon]
44+DefaultSession=une-efl
45+
46+AutomaticLoginEnable=true
47+AutomaticLogin=linaro
48+
49+[greeter]
50+Include=linaro
51+

Subscribers

People subscribed via source and target branches

to all changes: