ubuntu template: add sudo group and cleanup minor devttydir issue

Always add the user to the 'sudo' group as it's been around since at least Ubuntu 10.04. In addition make the user part of the admin group until 12.04 where it's been removed. Also fix a minor layout issue with devttydir. Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>

ubuntu template: add sudo group and cleanup minor devttydir issue
96bd45c8 · Stéphane Graber · Daniel Lezcano · 39aa5856 · 96bd45c8
Commit 96bd45c8 authored Jul 31, 2012 by Stéphane Graber Committed by Daniel Lezcano Jul 31, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 5 deletions

lxc-ubuntu.in templates/lxc-ubuntu.in +10 -5

No files found.
--- a/templates/lxc-ubuntu.in
+++ b/templates/lxc-ubuntu.in
@@ -55,9 +55,9 @@ EOF
 EOF
    if [ "$release" = "precise" ]; then
-        group="sudo"
+        groups="sudo"
    else
-        group="admin"
+        groups="sudo admin"
        # suppress log level output for udev
        sed -i "s/=\"err\"/=0/" $rootfs/etc/udev/udev.conf
@@ -67,9 +67,14 @@ EOF
        rm -f $rootfs/etc/init/tty{5,6}.conf
    fi
-    chroot $rootfs groupadd --system $group >/dev/null 2>&1 || true
+    chroot $rootfs useradd --create-home -s /bin/bash ubuntu
-    chroot $rootfs useradd --create-home -s /bin/bash -G $group ubuntu
    echo "ubuntu:ubuntu" | chroot $rootfs chpasswd
+    for group in $groups; do
+        chroot $rootfs groupadd --system $group >/dev/null 2>&1 || true
+        chroot $rootfs adduser ubuntu $group >/dev/null 2>&1 || true
+    done
    if [ -n "$auth_key" -a -f "$auth_key" ]; then
 	u_path="/home/ubuntu/.ssh"
 	root_u_path="$rootfs/$u_path"
@@ -307,7 +312,7 @@ EOF
    cat <<EOF >> $path/config
 lxc.utsname = $name
-lxc.devttydir = $ttydir
+lxc.devttydir =$ttydir
 lxc.tty = 4
 lxc.pts = 1024
 lxc.rootfs = $rootfs