Merge lp:~ogra/phablet-tools/phablet-tools-phablet-config-changes into lp:phablet-tools

[Oliver Grawert]

add changes to phablet-config autopilot and writable-image functions to work with the new adbd running as phablet (needs latest dbus-property-service on the device)

add changes to phablet-config autopilot and writable-image functions to work with the new adbd running as phablet (needs latest dbus-property-service on the device)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:295
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/359/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-amd64-ci/40/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-armhf-ci/40/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-i386-ci/40/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-tools-ci/359/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ogra/phablet-tools/phablet-tools-phablet-config-changes]

296. By Oliver Grawert on 2014-08-21

fix pep8 issues

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:296
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/360/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-amd64-ci/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-armhf-ci/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-i386-ci/41

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-tools-ci/360/rebuild

review: Approve (continuous-integration)

[Martin Pitt (pitti)]

I have some inline code comments which need to be addressed.

However, even with a fixed is_remote_root() this doesn't seem to work with the non-root adb, I still get AppArmor "DENIED" errors.

[Martin Pitt (pitti)]

review: Needs Fixing

[Martin Pitt (pitti)]

Ah, that's because the previous code was synchronous, but the D-BUS call is asynchronous: When the gdbus returns apparmor_parser is still running in the background (for about one minute). So after that there should be a loop that waits for "pidof apparmor_parser" to be empty, perhaps with a timeout of 5 minutes?

[lp:~ogra/phablet-tools/phablet-tools-phablet-config-changes]

297. By Oliver Grawert on 2014-08-25

fix the check for remote root in phablet-config

[Martin Pitt (pitti)]

Ugly as hell, but I confirmed this to work:

--- phablet-config 2014-08-25 10:47:35 +0000
+++ phablet-config 2014-08-25 11:04:29 +0000
@@ -116,6 +116,10 @@
                     '/com/canonical/PropertyService com.canonical.PropertyService.SetProperty ' \
                     'string:autopilot boolean:%s' % dbusarg
         adb.shell(dbus_call, False)
+ # wait until it is done; it takes a while to start apparmor_parser, so
+ # we need to wait a bit in advance
+ adb.shell('sleep 5; while pidof apparmor_parser; do sleep 5; done',
+ False)
     else:
         if args.dbus_probe == 'enable':
             rfile = '/usr/share/autopilot-touch/apparmor/click.rules'

[Martin Pitt (pitti)]

Meh, LP mistreating spaces. http://paste.ubuntu.com/8139757/ is the patch

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:297
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/363/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-amd64-ci/44
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-armhf-ci/44
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-i386-ci/44

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-tools-ci/363/rebuild

review: Approve (continuous-integration)

[lp:~ogra/phablet-tools/phablet-tools-phablet-config-changes]

298. By Oliver Grawert on 2014-08-25

add check if aa-clickhook has finished (thanks pitti)

299. By Oliver Grawert on 2014-08-25

make adb wait for teh device to come back after "writable reboot" when using the dbus call as well, also wait for teh network to be back

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:299
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/364/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-amd64-ci/45/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-armhf-ci/45/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-i386-ci/45/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-tools-ci/364/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ogra/phablet-tools/phablet-tools-phablet-config-changes]

300. By Oliver Grawert on 2014-08-25

fix indendation in phablet-config

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:299
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/365/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-amd64-ci/46/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-armhf-ci/46/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-i386-ci/46/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-tools-ci/365/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ogra/phablet-tools/phablet-tools-phablet-config-changes]

301. By Oliver Grawert on 2014-08-25

fix indendation even harder, add some spacing too

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:300
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/366/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-amd64-ci/47
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-armhf-ci/47
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-i386-ci/47

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-tools-ci/366/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:301
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/367/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-amd64-ci/48
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-armhf-ci/48
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-i386-ci/48

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-tools-ci/367/rebuild

review: Approve (continuous-integration)

[Martin Pitt (pitti)]

LGTM now, thanks!

review: Approve

[lp:~ogra/phablet-tools/phablet-tools-phablet-config-changes]

302. By Oliver Grawert on 2014-08-28

add support for package installation when sudo passowrd is supplied on cmdline with phablet-config writable-image

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:302
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/368/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-amd64-ci/49/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-armhf-ci/49/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-i386-ci/49/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-tools-ci/368/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ogra/phablet-tools/phablet-tools-phablet-config-changes]

303. By Oliver Grawert on 2014-08-29

fix pep8

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:303
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/370/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-amd64-ci/51/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-armhf-ci/51/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-i386-ci/51/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-tools-ci/370/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ogra/phablet-tools/phablet-tools-phablet-config-changes]

304. By Oliver Grawert on 2014-08-29

more pep8 fixes

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:304
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/371/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-amd64-ci/52
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-armhf-ci/52
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-i386-ci/52

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-tools-ci/371/rebuild

review: Approve (continuous-integration)

[Manuel de la Peña (mandel)]

review: Approve

=== modified file 'phablet-config'
--- phablet-config	2014-06-19 15:10:15 +0000
+++ phablet-config	2014-08-29 08:52:17 +0000
@@ -100,25 +100,63 @@
         sys.exit(1)
 
 
+def is_remote_root(adb):
+    return adb.shell("id -ru").strip() == "0"
+
+
 def _handle_autopilot(adb, args):
-    if args.dbus_probe == 'enable':
-        rfile = '/usr/share/autopilot-touch/apparmor/click.rules'
-        adb.shell('aa-clickhook -f --include=%s' % rfile)
+    if not is_remote_root(adb):
+        dbusarg = 'false'
+        if args.dbus_probe == 'enable':
+            dbusarg = 'true'
+        dbus_call = 'dbus-send --system --print-reply --dest=com.canonical.PropertyService ' \
+                    '/com/canonical/PropertyService com.canonical.PropertyService.SetProperty ' \
+                    'string:autopilot boolean:%s' % dbusarg
+        adb.shell(dbus_call, False)
+        # wait until it is done; it takes a while to start apparmor_parser, so
+        # we need to wait a bit in advance
+        adb.shell('sleep 5; while pidof apparmor_parser; do sleep 5; done',
+                  False)
     else:
-        adb.shell('aa-clickhook -f')
+        if args.dbus_probe == 'enable':
+            rfile = '/usr/share/autopilot-touch/apparmor/click.rules'
+            adb.shell('aa-clickhook -f --include=%s' % rfile)
+        else:
+            adb.shell('aa-clickhook -f')
+
+
+def sudo_shell(adb, sudocmd, cmd):
+    adb.shell('%s %s' % (sudocmd, cmd))
 
 
 def _handle_writable_image(adb, args):
-    fname = '/userdata/.writable_image'
-    try:
-        adb.shell('test -e %s' % fname, False)
-    except CalledProcessError as e:
-        adb.shell('touch %s' % fname, False)
-        adb.reboot()
-        adb.wait_for_device()
-        adb.wait_for_network()
-
-    try:
+    if not is_remote_root(adb):
+        dbus_call = 'dbus-send --system --print-reply --dest=com.canonical.PropertyService ' \
+                    '/com/canonical/PropertyService com.canonical.PropertyService.SetProperty ' \
+                    'string:writable boolean:true'
+        adb.shell(dbus_call, False)
+    else:
+        fname = '/userdata/.writable_image'
+        try:
+            adb.shell('test -e %s' % fname, False)
+        except CalledProcessError as e:
+            adb.shell('touch %s' % fname, False)
+            adb.reboot()
+
+    adb.wait_for_device()
+    adb.wait_for_network()
+
+    try:
+        sudocmd = ''
+        tempfile = ''
+        if not is_remote_root(adb):
+            tempfile = adb.shell('mktemp -t sudo_askpass.XXXX').rstrip()
+
+            adb.shell('/bin/echo -e \\"#!/bin/sh\necho %s \\" > %s ' %
+                      (args.sudopassword[0], tempfile), ignore_errors=False)
+            adb.shell("chmod u+x %s" % tempfile)
+            sudocmd = 'SUDO_ASKPASS=%s sudo -A' % tempfile
+
         if args.package_dir:
             tmp_archive = create_temp_dir()
             for package_dir in args.package_dir:
@@ -145,27 +183,31 @@
                 pin_file.write(LOCAL_PIN_FILE)
 
             adb.push(tmp_archive, '/tmp/archive')
-            adb.shell('mv /tmp/archive/00localrepo.list '
-                      '/etc/apt/sources.list.d')
-            adb.shell('mv /tmp/archive/local-pin-1100 '
-                      '/etc/apt/preferences.d')
+            sudo_shell(adb, sudocmd, 'mv /tmp/archive/00localrepo.list '
+                       '/etc/apt/sources.list.d')
+            sudo_shell(adb. sudocmd, 'mv /tmp/archive/local-pin-1100 '
+                       '/etc/apt/preferences.d')
 
         if args.ppa:
             for ppa in args.ppa:
-                adb.shell('add-apt-repository -y %s' % ppa, False)
+                sudo_shell(adb, sudocmd, 'add-apt-repository -y %s' % ppa)
 
         if args.package_dir or args.ppa:
-            adb.shell('apt-get update -qq')
+            sudo_shell(adb, sudocmd, 'apt-get update -qq')
 
         if args.package:
             package = ' '.join(args.package)
-            adb.shell('apt-get install -yq --force-yes %s' % package, False)
+            sudo_shell(adb, sudocmd,
+                       'apt-get install -yq --force-yes %s' % package)
 
         if args.package_dir:
             # Remove the local archive
-            adb.shell('rm /etc/apt/sources.list.d/00localrepo.list')
-            adb.shell('rm /etc/apt/preferences.d/local-pin-1100')
+            sudo_shell(adb, sudocmd,
+                       'rm /etc/apt/sources.list.d/00localrepo.list')
+            sudo_shell(adb, sudocmd,
+                       'rm /etc/apt/preferences.d/local-pin-1100')
             adb.shell('rm -rf /tmp/archive')
+        adb.shell('rm -rf %s' % tempfile)
 
     except CalledProcessError as e:
         print(e)
@@ -243,6 +285,8 @@
                     repository. Can be repeated.''')
     dm.add_argument('-p', '--package', action='append',
                     help='Package to install. Can be repeated.')
+    dm.add_argument('-s', '--sudopassword', action='append',
+                    help='Password to use for sudo on the device.')
     dm.set_defaults(func=_handle_writable_image)
 
     ei = sub.add_parser('edges-intro', help='Enable/disable the edges intro.')