Merge lp:~townsend/unity8-preview-lxc/fix-setup into lp:unity8-preview-lxc

[Christopher Townsend]

Rework the creation of the unity8-lxc container since the Ubuntu Desktop Next ISO has been deprecated.
Many fixes for working with the systemd based containers.

[Stephen M. Webb (bregma)]

Other than problems mentioned on IRC (looking for the Xenial image but the image has not yet been created as the archives are not open when I tested this) and the long delay on startup, this works well and is cleaner than the original.

review: Approve

=== modified file 'bin/unity8-lxc-compositor'
--- bin/unity8-lxc-compositor	2015-06-17 12:43:39 +0000
+++ bin/unity8-lxc-compositor	2015-10-22 16:22:57 +0000
@@ -38,6 +38,21 @@
 lxc-wait -t 0 -s RUNNING -n $CONTAINER_NAME || lxc-start -n $CONTAINER_NAME -d && \
   lxc-wait -t 5 -s RUNNING -n $CONTAINER_NAME
 
+# Wait for systemd to be (almost) up and running before proceeding
+(cat << EOF
+i=0
+echo \$i
+while [ \$i -lt "20" ]; do
+  pgrep agetty
+  if [ \$? -eq "0" ]; then
+    break
+  fi
+  i=\$[\$i+1]
+  sleep 1
+done
+EOF
+) | lxc-attach -n $CONTAINER_NAME -- bash
+
 lxc-attach -n $CONTAINER_NAME -- /usr/sbin/unity-system-compositor.sleep $* &
 
 PARENT_PID=$!

=== modified file 'bin/unity8-lxc-session'
--- bin/unity8-lxc-session	2015-06-17 12:43:39 +0000
+++ bin/unity8-lxc-session	2015-10-22 16:22:57 +0000
@@ -47,13 +47,11 @@
   cgm movepid \$cgroup $SUDO_USER \$\$
 done
 
-rm -Rf /run/systemd
-cp -R /var/lib/host-systemd /run/systemd
+cp -R /var/lib/host-systemd/users /run/systemd/
+cp -R /var/lib/host-systemd/seats /run/systemd/
+cp -R /var/lib/host-systemd/sessions /run/systemd/
 
-if [ ! -L /dev/shm ] && [ -e /dev/shm ]; then
-  rmdir /dev/shm 2>/dev/null || mv /dev/shm /dev/shm.bak
-  ln -s /run/shm /dev/shm
-fi
+cp -R /var/lib/host-udev /run/udev/
 
 sudo -u $SUDO_USER -E /usr/bin/lightdm-unity8-session
 EOF

=== modified file 'bin/unity8-lxc-setup'
--- bin/unity8-lxc-setup	2015-06-29 14:55:53 +0000
+++ bin/unity8-lxc-setup	2015-10-22 16:22:57 +0000
@@ -30,8 +30,6 @@
 from distro_info import UbuntuDistroInfo, DistroDataOutdated
 
 CONTAINER_NAME = "unity8-lxc"
-ISO_URL = "http://cdimage.ubuntu.com/ubuntu-desktop-next/daily-live/" \
-          "current/RELEASE-desktop-ARCH.iso.zsync"
 SKIP_JOB = ["bluetooth", "lightdm", "plymouth", "plymouth-upstart-bridge",
             "plymouth-shutdown", "ubiquity"]
 
@@ -39,18 +37,9 @@
 # Argument parsing
 parser = argparse.ArgumentParser(description="Unity8 inside LXC")
 parser.add_argument(
-    "--rebuild-all", action="store_true",
-    help=("Wipe and replace the container rootfs and configuration."))
-parser.add_argument(
-    "--rebuild-config", action="store_true",
-    help=("Wipe and regenerate the container configuration."))
-parser.add_argument(
-    "--rebuild-rootfs", action="store_true",
+    "--rebuild", action="store_true",
     help=("Wipe and replace the container rootfs."))
 parser.add_argument(
-    "--redownload", action="store_true",
-    help=("Re-download the ISO image instead of using the local version."))
-parser.add_argument(
     "--test", type=int, metavar="SECONDS", default=None,
     help=("Test mode, argument is time in seconds for the session."))
 parser.add_argument(
@@ -68,17 +57,10 @@
 container = lxc.Container(CONTAINER_NAME)
 container_path = "%s/%s" % (lxc.default_config_path, CONTAINER_NAME)
 rootfs_path = "%s/rootfs" % container_path
-iso_filename = "%s/ubuntu-next.iso" % container_path
-iso_path = "%s/iso" % container_path
-squashfs_path = "%s/squashfs" % container_path
 
 (distro, version, codename) = platform.linux_distribution()
 
-if not os.path.exists(iso_filename):
-    args.redownload = True
-
 # Actions
-generate_config = True
 generate_rootfs = True
 
 def start_container(wait_for_network=True):
@@ -100,102 +82,22 @@
 
 # Deal with existing containers
 if container.defined:
-    generate_config = False
     generate_rootfs = False
 
     if not args.test and container.running:
         print("Stopping the existing container.")
         container.stop()
 
-    if args.rebuild_all:
-        args.rebuild_config = True
-        args.rebuild_rootfs = True
-
-    if args.rebuild_config:
-        generate_config = True
-        container.clear_config()
-
-    if args.rebuild_rootfs:
+    if args.rebuild:
+        print("Deleting current unity8-lxc container...")
         generate_rootfs = True
-        if os.path.exists(rootfs_path):
-            shutil.rmtree(rootfs_path)
+        container.destroy()
+        del container
+        container = lxc.Container(CONTAINER_NAME)
 
-if not generate_config and not generate_rootfs and not args.test and not args.update_lxc:
+if not generate_rootfs and not args.test and not args.update_lxc:
     parser.error("The container already exists.")
 
-
-if generate_config:
-    # Setup the container config
-    ## Load the default LXC config keys
-    container.load_config("/usr/share/lxc/config/ubuntu.common.conf")
-
-    ## Setup the network ##
-    container.append_config_item("lxc.network.type", "veth")
-    container.append_config_item("lxc.network.link", "lxcbr0")
-    container.append_config_item("lxc.network.hwaddr", "00:16:3e:xx:xx:xx")
-
-    ## Architecture
-    container.set_config_item("lxc.arch", "x86_64")
-
-    ## Rootfs path
-    container.set_config_item("lxc.rootfs", rootfs_path)
-
-    ## Hostname
-    container.set_config_item("lxc.utsname", CONTAINER_NAME)
-
-    ## Devices
-    ### /dev/tty*
-    container.append_config_item("lxc.cgroup.devices.allow", "c 4:* rwm")
-
-    ### /dev/input/*
-    container.append_config_item("lxc.cgroup.devices.allow", "c 13:* rwm")
-    container.append_config_item("lxc.mount.entry",
-                                 "/dev/input dev/input none bind,create=dir")
-
-    ### /dev/dri/*
-    container.append_config_item("lxc.cgroup.devices.allow", "c 226:* rwm")
-    container.append_config_item("lxc.mount.entry",
-                                 "/dev/dri dev/dri none bind,create=dir")
-
-    ### /dev/snd/*
-    container.append_config_item("lxc.cgroup.devices.allow", "c 116:* rwm")
-    container.append_config_item("lxc.mount.entry",
-                                 "/dev/snd dev/snd none bind,create=dir")
-
-    ## Enable cgmanager access
-    container.set_config_item("lxc.mount.auto", "cgroup:mixed proc:mixed sys:mixed")
-
-    ## Allow nested containers
-    container.set_config_item("lxc.aa_profile", "lxc-container-default-with-nesting")
-
-    ## Disable the lxc autodev
-    container.append_config_item("lxc.autodev", "0")
-
-    # Setup the /home bind-mount
-    container.append_config_item("lxc.mount.entry", "/home home none bind")
-
-    # Setup the /etc/shadow bind-mount
-    container.append_config_item("lxc.mount.entry",
-                                 "/etc/shadow etc/shadow none bind")
-
-    # Setup the local time and timezone
-    container.append_config_item("lxc.mount.entry",
-                                 "/etc/localtime etc/localtime none bind")
-    container.append_config_item("lxc.mount.entry",
-                                 "/etc/timezone etc/timezone none bind")
-
-    # Setup up /run/udev
-    container.append_config_item("lxc.mount.entry",
-                                 "/run/udev var/lib/host-udev none bind,ro,create=dir")
-
-    # Setup /run/systemd
-    container.append_config_item("lxc.mount.entry",
-                                 "/run/systemd var/lib/host-systemd none bind,ro,create=dir")
-
-    ## Dump it all to disk
-    container.save_config()
-
-
 if generate_rootfs:
     # Setup the container rootfs
 
@@ -213,44 +115,11 @@
     except DistroDataOutdated:
         current_release = UbuntuDistroInfo().stable()
 
-    ## Download the ISO image
-    if args.redownload:
-        iso_url = ISO_URL.replace("ARCH", architecture)
-        iso_url = iso_url.replace("RELEASE", current_release)
-
-        ### Use zsync to fetch the ISO
-        cmd = "cd %s && zsync -i %s -o %s %s" % (container_path, iso_filename, iso_filename, iso_url)
-        os.system(cmd)
-
-        ### Remove the ISO backup since it's not needed
-        if os.path.exists(iso_filename+".zs-old"):
-            os.remove(iso_filename+".zs-old")
-
-    if not os.path.exists(iso_filename):
-        parser.error("No Unity 8 Desktop Next ISO exists!")
-
-    ## Mount the ISO
-    if not os.path.exists(iso_path):
-        os.mkdir(iso_path)
-    subprocess.call(["mount", "-o", "loop,ro", iso_filename, iso_path])
-
-    if not os.path.exists(squashfs_path):
-        os.mkdir(squashfs_path)
-    subprocess.call(["mount", "-o", "loop,ro",
-                     os.path.join(iso_path, "casper", "filesystem.squashfs"),
-                     squashfs_path])
-
-    ## Unpack the ISO
-    print("Unpacking the ISO image...")
-    subprocess.call(["rsync", "-aA", "--hard-links", "--numeric-ids",
-                     "%s/" % squashfs_path, "%s/" % rootfs_path])
-
-    ## Unmount the ISO
-    subprocess.call(["umount", squashfs_path])
-    os.rmdir(squashfs_path)
-
-    subprocess.call(["umount", iso_path])
-    os.rmdir(iso_path)
+    print("Creating the new unity8-lxc container...")
+    container.create("download", 0,
+                     {"dist": "ubuntu",
+                      "release": current_release,
+                      "arch": architecture})
 
     ## Configure
     print("Configuring the Unity8 LXC...")
@@ -262,7 +131,7 @@
     ### Generate /etc/hosts
     with open(os.path.join(rootfs_path, "etc", "hosts"), "w+") as fd:
         fd.write("""127.0.0.1   localhost
-127.0.1.1   unity8-mir
+127.0.1.1   unity8-lxc
 
 # The following lines are desirable for IPv6 capable hosts
 ::1     localhost ip6-localhost ip6-loopback
@@ -270,76 +139,54 @@
 ff02::2 ip6-allrouters
 """)
 
-    ### Disable some upstart jobs
+    # Generate the package install policy override
+    with open(os.path.join(rootfs_path, 'usr', 'sbin', 'policy-rc.d'), 'w+') as fd:
+        fd.write("""#!/bin/sh
+while true; do
+case \"$1\" in
+  -*) shift ;;
+  makedev) exit 0;;
+  *)  exit 101;;
+esac
+done
+""")
+        fd.close()
+
+    os.chmod(os.path.join(rootfs_path, 'usr', 'sbin', 'policy-rc.d'), 0o755)
+
+    start_container()
+
+    # Remove the default ubuntu user in the container
+    container.attach_wait(lxc.attach_run_command,
+                          ["userdel", "-r", "ubuntu"])
+
+    # Copy the ubuntu-desktop-next metapackage to the rootfs
+    lxc_archive = os.path.join(rootfs_path, 'tmp', 'ubuntu-desktop-next.deb')
+    glob_name = "ubuntu-desktop-next_*_%s.deb" % architecture
+    metapackage = glob.glob(os.path.join('/', 'usr', 'share', 'unity8-lxc', glob_name))
+    shutil.copy(metapackage[0], lxc_archive)
+   
+    container.attach_wait(lxc.attach_run_command,
+                          ["apt-get", "update"])
+
+    container.attach_wait(lxc.attach_run_command,
+                          ["dpkg", "-i", os.path.join('/', 'tmp', 'ubuntu-desktop-next.deb')])
+    container.attach_wait(lxc.attach_run_command,
+                          ["apt-get", "install", "-f", "-y"])
+
+    container.attach_wait(lxc.attach_run_command,
+                          ["systemctl", "disable", "lightdm.service"]) 
+    container.stop()
+
+    # Disable some upstart jobs
     for job in glob.glob("%s/etc/init/*.conf" % rootfs_path):
         if os.path.basename(job).rsplit(".conf", 1)[0] in SKIP_JOB:
             with open("%s.override" % job.rsplit(".conf", 1)[0], "w+") as fd:
                 fd.write("manual")
 
-    ### Create any missing devices
-    for i in range(64):
-        tty_path = os.path.join(rootfs_path, "dev", "tty%s" % i)
-        if not os.path.exists(tty_path):
-            os.mknod(tty_path, 0o620 | stat.S_IFCHR, device=os.makedev(4, i))
-            os.chown(tty_path, 0, 5)
-
-    ### Generate /run/udev
-    with open(os.path.join(rootfs_path, "etc", "init", "udev-db.conf"), "w+") as fd:
-        fd.write("""start on starting udev
-pre-start script
-    rm -Rf /run/udev
-    cp -R /var/lib/host-udev /run/udev
-end script
-""")
-
-    ### Switch back to upstart instead of systemd
-    with open(os.path.join(rootfs_path, "etc", "X11", "default-display-manager"), "w+") as fd:
-        fd.write("")
-
-    os.chdir(container_path)
-
-    files = glob.glob("%s/upstart-sysv_*.deb" % container_path)
-
-    upstart_file = ""
-
-    if files:
-       upstart_file = files[0]
-
-    if args.redownload or not os.path.exists(upstart_file):
-        if os.path.exists(upstart_file):
-            os.remove(upstart_file)
-
-        rmadison_cmd = "rmadison -s %s upstart-sysv | cut -d '|' -f 2 | tr -d '[[:space:]]'" % current_release
-        upstart_sysv_ver = subprocess.getoutput(rmadison_cmd)
-        upstart_file = "upstart-sysv_%s_%s.deb" % (upstart_sysv_ver, architecture)
-
-        dget_url = "http://archive.ubuntu.com/ubuntu/pool/main/u/upstart/%s" % upstart_file
-        subprocess.call(["dget", dget_url])
-
-    if args.rebuild_rootfs:
-        rootfs_archive_path = os.path.join(rootfs_path, "var", "cache", "apt", "archives")
-        shutil.copy(upstart_file, rootfs_archive_path)
-
-    start_container(False)
-
-    print("Generating locale...")
-    r = os.popen("locale", "r").read().split("\n")
-    locale = ["locale-gen"]
-
-    for i in r:
-        if i == "":
-          break
-        i = i.split('=')[1].replace("\"", "")
-        if not i in locale and i != "":
-            locale.append(i)
-
-    container.attach_wait(lxc.attach_run_command, locale)
-
-    print("Switching to upstart...")
-    container.attach_wait(lxc.attach_run_command,
-                          ["apt-get", "install", "upstart-sysv", "-y", "--no-download", "--ignore-missing"])
-
-    container.stop()
+    with open(os.path.join(container_path, 'config'), 'a') as fd:
+        fd.write("lxc.include = " + os.path.join('/', 'usr', 'share', 'unity8-lxc', 'unity8-lxc.conf'))
+        fd.close()
 
 if args.test:
     # Start a test session

=== added directory 'data'
=== added file 'data/ubuntu-desktop-next_1.249_amd64.deb'
Binary files data/ubuntu-desktop-next_1.249_amd64.deb	1970-01-01 00:00:00 +0000 and data/ubuntu-desktop-next_1.249_amd64.deb	2015-10-22 16:22:57 +0000 differ
=== added file 'data/ubuntu-desktop-next_1.249_i386.deb'
Binary files data/ubuntu-desktop-next_1.249_i386.deb	1970-01-01 00:00:00 +0000 and data/ubuntu-desktop-next_1.249_i386.deb	2015-10-22 16:22:57 +0000 differ
=== added file 'data/unity8-autodev'
--- data/unity8-autodev	1970-01-01 00:00:00 +0000
+++ data/unity8-autodev	2015-10-22 16:22:57 +0000
@@ -0,0 +1,12 @@
+#!/usr/bin/python3
+
+import os
+import stat
+
+rootfs_path = os.environ['LXC_ROOTFS_MOUNT']
+
+for i in range(64):
+    tty_path = os.path.join(rootfs_path, "dev", "tty%s" % i)
+    if not os.path.exists(tty_path):
+        os.mknod(tty_path, 0o620 | stat.S_IFCHR, device=os.makedev(4, i))
+        os.chown(tty_path, 0, 5)

=== added file 'data/unity8-lxc.conf'
--- data/unity8-lxc.conf	1970-01-01 00:00:00 +0000
+++ data/unity8-lxc.conf	2015-10-22 16:22:57 +0000
@@ -0,0 +1,20 @@
+lxc.cgroup.devices.allow = c 4:* rwm
+lxc.cgroup.devices.allow = c 13:* rwm
+lxc.mount.entry = /dev/input dev/input none bind,create=dir
+lxc.cgroup.devices.allow = c 226:* rwm
+lxc.mount.entry = /dev/dri dev/dri none bind,create=dir
+lxc.cgroup.devices.allow = c 116:* rwm
+lxc.mount.entry = /dev/snd dev/snd none bind,create=dir
+lxc.cgroup.devices.allow = c 189:* rwm
+lxc.mount.entry = /dev/bus dev/bus none bind,create=dir
+lxc.aa_profile = lxc-container-default-with-nesting
+lxc.mount.entry = /home home none bind
+lxc.mount.entry = /etc/shadow etc/shadow none bind
+lxc.mount.entry = /etc/localtime etc/localtime none bind
+lxc.mount.entry = /etc/timezone etc/timezone none bind
+lxc.mount.entry = tmpfs run tmpfs rw,nodev,noexec,nosuid,size=104857600
+lxc.mount.entry = none run/user tmpfs rw,nodev,noexec,nosuid,size=104857600,mode=0755,create=dir
+lxc.mount.entry = /run/udev var/lib/host-udev none bind,ro,create=dir
+lxc.mount.entry = /run/systemd var/lib/host-systemd none bind,ro,create=dir
+lxc.mount.entry = /usr/lib/locale usr/lib/locale none bind
+lxc.hook.autodev = /usr/share/unity8-lxc/unity8-autodev

=== modified file 'debian/control'
--- debian/control	2015-06-17 12:43:39 +0000
+++ debian/control	2015-10-22 16:22:57 +0000
@@ -8,7 +8,7 @@
 
 Package: unity8-lxc
 Architecture: all
-Depends: python3, python3-lxc, sudo, python3-distro-info, zsync, devscripts, ${misc:Depends}
+Depends: python3, python3-lxc, sudo, python3-distro-info, ${misc:Depends}
 Description: Unity8 LXC integration
  This package contains the scripts required to setup and run a Unity8
  desktop inside an LXC container.

=== modified file 'debian/install'
--- debian/install	2014-09-30 18:09:11 +0000
+++ debian/install	2015-10-22 16:22:57 +0000
@@ -2,3 +2,4 @@
 bin/* usr/bin/
 xsessions/* usr/share/xsessions/
 unity-greeter/* usr/share/unity-greeter/
+data/* usr/share/unity8-lxc/

=== modified file 'debian/unity8-lxc.postinst'
--- debian/unity8-lxc.postinst	2014-11-20 19:49:17 +0000
+++ debian/unity8-lxc.postinst	2015-10-22 16:22:57 +0000
@@ -4,10 +4,6 @@
 
 CONTAINER_NAME="unity8-lxc"
 
-if [ -e /var/lib/lxc/$CONTAINER_NAME/config ]; then
-    unity8-lxc-setup --rebuild-config
-fi
-
 if [ ! -d /var/lib/lxc/$CONTAINER_NAME ]; then
     echo "**** Please run 'sudo unity8-lxc-setup' to setup the Unity8 LXC ****"
 fi

=== modified file 'docs/unity8-lxc-setup.1'
--- docs/unity8-lxc-setup.1	2014-08-26 17:44:12 +0000
+++ docs/unity8-lxc-setup.1	2015-10-22 16:22:57 +0000
@@ -1,4 +1,4 @@
-.TH unity8-lxc-setup 1 2014-08-26 "unity8-lxc-setup"
+.TH unity8-lxc-setup 1 2015-10-22 "unity8-lxc-setup"
 .SH NAME
 unity8-lxc-setup \- administers the LXC for the Unity 8 desktop session
 
@@ -23,26 +23,13 @@
 .TP
 
 .TP
-.B --rebuild-all
-Wipe and replace the container rootfs and configuration.
-.TP
-
-.TP
-.B --rebuild-config
-Wipe and regenerate the container configuration.
-.TP
-
-.TP
-.B --rebuild-root
+
+.TP
+.B --rebuild
 Wipe and replace the container rootfs.
 .TP
 
 .TP
-.B --redownload
-Re-download the Unity 8 desktop preview ISO image instead of using the local version.
-.TP
-
-.TP
 .B --test SECONDS
 Test mode, argument is time in seconds for the session.
 .TP
@@ -60,6 +47,6 @@
 Written by Stéphane Graber and Christopher Townsend.
 
 .SH COPYRIGHT
-Copyright 2014 Canonical Ltd.  License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.
+Copyright 2014-2015 Canonical Ltd.  License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.
 .P
 This is free software: you are free to change and redistribute it.  There is NO WARRANTY, to the extent permitted by law.