Merge lp:~gerboland/ubuntu-touch-session/fix-unity8 into lp:ubuntu-touch-session

Proposed by Gerry Boland
Status: Superseded
Proposed branch: lp:~gerboland/ubuntu-touch-session/fix-unity8
Merge into: lp:ubuntu-touch-session
Diff against target: 722 lines (+659/-1)
7 files modified
debian/ubuntu-touch-session.install (+3/-0)
debian/ubuntu-touch-session.install.orig (+8/-0)
lxc-overrides/init.rc (+503/-0)
lxc-overrides/lxc-android-config.override (+32/-0)
lxc-overrides/ueventd.rc (+105/-0)
upstart-session/maliit-server.conf (+5/-0)
upstart-session/unity8.conf (+3/-1)
To merge this branch: bzr merge lp:~gerboland/ubuntu-touch-session/fix-unity8
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team Pending
Review via email: mp+182431@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

83. By Gerry Boland

Fix unity8 not starting - have it start when dbus started

82. By Gerry Boland

Configure maliit-server upstart session for Mir: specify QPA plugin, start on unity8 start, and stop on unity8 stop or session quit

81. By Ricardo Mendoza

Correct import path

80. By Ricardo Mendoza

Add missing files

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/ubuntu-touch-session.install'
2--- debian/ubuntu-touch-session.install 2013-07-16 19:29:18 +0000
3+++ debian/ubuntu-touch-session.install 2013-08-27 15:49:22 +0000
4@@ -7,3 +7,6 @@
5 upstart-session/* /usr/share/upstart/sessions/
6 ubuntu-touch-session-setup.conf /etc/init/
7 ubuntu-touch-session.conf /etc/init/
8+lxc-overrides/init.rc /var/lib/lxc/android/overrides/
9+lxc-overrides/ueventd.rc /var/lib/lxc/android/overrides/
10+lxc-overrides/lxc-android-config.override /etc/init/
11
12=== added file 'debian/ubuntu-touch-session.install.orig'
13--- debian/ubuntu-touch-session.install.orig 1970-01-01 00:00:00 +0000
14+++ debian/ubuntu-touch-session.install.orig 2013-08-27 15:49:22 +0000
15@@ -0,0 +1,8 @@
16+upstart-app-launch/* /usr/share/upstart/sessions/
17+etc/dbus-1/system.d
18+startup-scripts/* /usr/bin/
19+*.override /etc/init
20+ubuntu-touch-session.d/* /etc/ubuntu-touch-session.d/
21+upstart-session/* /usr/share/upstart/sessions/
22+ubuntu-touch-session-setup.conf /etc/init/
23+ubuntu-touch-session.conf /etc/init/
24
25=== added file 'libpeerconnection.log'
26=== added directory 'lxc-overrides'
27=== added file 'lxc-overrides/init.rc'
28--- lxc-overrides/init.rc 1970-01-01 00:00:00 +0000
29+++ lxc-overrides/init.rc 2013-08-27 15:49:22 +0000
30@@ -0,0 +1,503 @@
31+# Copyright (C) 2012 The Android Open Source Project
32+#
33+# IMPORTANT: Do not create world writable files or directories.
34+# This is a common source of Android security bugs.
35+#
36+
37+import /init.usb.rc
38+import /init.${ro.hardware}.rc
39+import /init.trace.rc
40+
41+on early-init
42+ # Set init and its forked children's oom_adj.
43+ write /proc/1/oom_adj -16
44+
45+ # Set the security context for the init process.
46+ # This should occur before anything else (e.g. ueventd) is started.
47+ setcon u:r:init:s0
48+
49+ start ueventd
50+
51+# create mountpoints
52+ mkdir /mnt 0775 root system
53+
54+on init
55+
56+sysclktz 0
57+
58+loglevel 3
59+
60+# setup the global environment
61+ export PATH /sbin:/vendor/bin:/system/sbin:/system/bin:/system/xbin
62+ export LD_LIBRARY_PATH /vendor/lib:/system/lib
63+ export ANDROID_BOOTLOGO 1
64+ export ANDROID_ROOT /system
65+ export ANDROID_ASSETS /system/app
66+ export ANDROID_DATA /data
67+ export ANDROID_STORAGE /storage
68+ export ASEC_MOUNTPOINT /mnt/asec
69+ export LOOP_MOUNTPOINT /mnt/obb
70+ export BOOTCLASSPATH /system/framework/core.jar:/system/framework/core-junit.jar:/system/framework/bouncycastle.jar:/system/framework/ext.jar:/system/framework/framework.jar:/system/framework/telephony-common.jar:/system/framework/mms-common.jar:/system/framework/android.policy.jar:/system/framework/services.jar:/system/framework/apache-xml.jar
71+
72+# Backward compatibility
73+ symlink /system/etc /etc
74+ symlink /sys/kernel/debug /d
75+
76+# Right now vendor lives on the same filesystem as system,
77+# but someday that may change.
78+ symlink /system/vendor /vendor
79+
80+# Create cgroup mount point for cpu accounting
81+ mkdir /acct
82+ mount cgroup none /acct cpuacct
83+ mkdir /acct/uid
84+
85+ mkdir /system
86+ mkdir /data 0771 system system
87+ mkdir /cache 0771 system cache
88+ mkdir /config 0500 root root
89+
90+ # See storage config details at http://source.android.com/tech/storage/
91+ mkdir /mnt/shell 0700 shell shell
92+ mkdir /storage 0050 root sdcard_r
93+
94+ # Directory for putting things only root should see.
95+ mkdir /mnt/secure 0700 root root
96+ # Create private mountpoint so we can MS_MOVE from staging
97+ mount tmpfs tmpfs /mnt/secure mode=0700,uid=0,gid=0
98+
99+ # Directory for staging bindmounts
100+ mkdir /mnt/secure/staging 0700 root root
101+
102+ # Directory-target for where the secure container
103+ # imagefile directory will be bind-mounted
104+ mkdir /mnt/secure/asec 0700 root root
105+
106+ # Secure container public mount points.
107+ mkdir /mnt/asec 0700 root system
108+ mount tmpfs tmpfs /mnt/asec mode=0755,gid=1000
109+
110+ # Filesystem image public mount points.
111+ mkdir /mnt/obb 0700 root system
112+ mount tmpfs tmpfs /mnt/obb mode=0755,gid=1000
113+
114+ write /proc/sys/kernel/panic_on_oops 1
115+ write /proc/sys/kernel/hung_task_timeout_secs 0
116+ write /proc/cpu/alignment 4
117+ write /proc/sys/kernel/sched_latency_ns 10000000
118+ write /proc/sys/kernel/sched_wakeup_granularity_ns 2000000
119+ write /proc/sys/kernel/sched_compat_yield 1
120+ write /proc/sys/kernel/sched_child_runs_first 0
121+ write /proc/sys/kernel/randomize_va_space 2
122+ write /proc/sys/kernel/kptr_restrict 2
123+ write /proc/sys/kernel/dmesg_restrict 1
124+ write /proc/sys/vm/mmap_min_addr 32768
125+ write /proc/sys/kernel/sched_rt_runtime_us 950000
126+ write /proc/sys/kernel/sched_rt_period_us 1000000
127+
128+# Create cgroup mount points for process groups
129+ mkdir /dev/cpuctl
130+ mount cgroup none /dev/cpuctl cpu
131+ chown system system /dev/cpuctl
132+ chown system system /dev/cpuctl/tasks
133+ chmod 0660 /dev/cpuctl/tasks
134+ write /dev/cpuctl/cpu.shares 1024
135+ write /dev/cpuctl/cpu.rt_runtime_us 950000
136+ write /dev/cpuctl/cpu.rt_period_us 1000000
137+
138+ mkdir /dev/cpuctl/apps
139+ chown system system /dev/cpuctl/apps/tasks
140+ chmod 0666 /dev/cpuctl/apps/tasks
141+ write /dev/cpuctl/apps/cpu.shares 1024
142+ write /dev/cpuctl/apps/cpu.rt_runtime_us 800000
143+ write /dev/cpuctl/apps/cpu.rt_period_us 1000000
144+
145+ mkdir /dev/cpuctl/apps/bg_non_interactive
146+ chown system system /dev/cpuctl/apps/bg_non_interactive/tasks
147+ chmod 0666 /dev/cpuctl/apps/bg_non_interactive/tasks
148+ # 5.0 %
149+ write /dev/cpuctl/apps/bg_non_interactive/cpu.shares 52
150+ write /dev/cpuctl/apps/bg_non_interactive/cpu.rt_runtime_us 700000
151+ write /dev/cpuctl/apps/bg_non_interactive/cpu.rt_period_us 1000000
152+
153+# Allow everybody to read the xt_qtaguid resource tracking misc dev.
154+# This is needed by any process that uses socket tagging.
155+ chmod 0644 /dev/xt_qtaguid
156+
157+# Create /dev/fd link for Ubuntu
158+ symlink /proc/self/fd /dev/fd
159+
160+on fs
161+# mount mtd partitions
162+ # Mount /system rw first to give the filesystem a chance to save a checkpoint
163+ mount yaffs2 mtd@system /system
164+ mount yaffs2 mtd@system /system ro remount
165+ mount yaffs2 mtd@userdata /data nodev
166+ mount yaffs2 mtd@cache /cache nosuid nodev
167+
168+on post-fs
169+ # once everything is setup, no need to modify /
170+ mount rootfs rootfs / ro remount
171+ # mount shared so changes propagate into child namespaces
172+ mount rootfs rootfs / shared rec
173+ mount tmpfs tmpfs /mnt/secure private rec
174+
175+ # We chown/chmod /cache again so because mount is run as root + defaults
176+ chown system cache /cache
177+ chmod 0771 /cache
178+ # We restorecon /cache in case the cache partition has been reset.
179+ restorecon /cache
180+
181+ # This may have been created by the recovery system with odd permissions
182+ chown system cache /cache/recovery
183+ chmod 0770 /cache/recovery
184+ # This may have been created by the recovery system with the wrong context.
185+ restorecon /cache/recovery
186+
187+ #change permissions on vmallocinfo so we can grab it from bugreports
188+ chown root log /proc/vmallocinfo
189+ chmod 0440 /proc/vmallocinfo
190+
191+ chown root log /proc/slabinfo
192+ chmod 0440 /proc/slabinfo
193+
194+ #change permissions on kmsg & sysrq-trigger so bugreports can grab kthread stacks
195+ chown root system /proc/kmsg
196+ chmod 0440 /proc/kmsg
197+ chown root system /proc/sysrq-trigger
198+ chmod 0220 /proc/sysrq-trigger
199+ chown system log /proc/last_kmsg
200+ chmod 0440 /proc/last_kmsg
201+
202+ # create the lost+found directories, so as to enforce our permissions
203+ mkdir /cache/lost+found 0770 root root
204+
205+on post-fs-data
206+ # We chown/chmod /data again so because mount is run as root + defaults
207+ chown system system /data
208+ chmod 0771 /data
209+ # We restorecon /data in case the userdata partition has been reset.
210+ restorecon /data
211+
212+ # Create dump dir and collect dumps.
213+ # Do this before we mount cache so eventually we can use cache for
214+ # storing dumps on platforms which do not have a dedicated dump partition.
215+ mkdir /data/dontpanic 0750 root log
216+
217+ # Collect apanic data, free resources and re-arm trigger
218+ copy /proc/apanic_console /data/dontpanic/apanic_console
219+ chown root log /data/dontpanic/apanic_console
220+ chmod 0640 /data/dontpanic/apanic_console
221+
222+ copy /proc/apanic_threads /data/dontpanic/apanic_threads
223+ chown root log /data/dontpanic/apanic_threads
224+ chmod 0640 /data/dontpanic/apanic_threads
225+
226+ write /proc/apanic_console 1
227+
228+ # create basic filesystem structure
229+ mkdir /data/misc 01771 system misc
230+ mkdir /data/misc/adb 02750 system shell
231+ mkdir /data/misc/bluedroid 0770 bluetooth net_bt_stack
232+ mkdir /data/misc/bluetooth 0770 system system
233+ mkdir /data/misc/keystore 0700 keystore keystore
234+ mkdir /data/misc/keychain 0771 system system
235+ mkdir /data/misc/sms 0770 system radio
236+ mkdir /data/misc/vpn 0770 system vpn
237+ mkdir /data/misc/systemkeys 0700 system system
238+ # give system access to wpa_supplicant.conf for backup and restore
239+ mkdir /data/misc/wifi 0770 wifi wifi
240+ chmod 0660 /data/misc/wifi/wpa_supplicant.conf
241+ mkdir /data/local 0751 root root
242+
243+ # For security reasons, /data/local/tmp should always be empty.
244+ # Do not place files or directories in /data/local/tmp
245+ mkdir /data/local/tmp 0771 shell shell
246+ mkdir /data/data 0771 system system
247+ mkdir /data/app-private 0771 system system
248+ mkdir /data/app-asec 0700 root root
249+ mkdir /data/app-lib 0771 system system
250+ mkdir /data/app 0771 system system
251+ mkdir /data/property 0700 root root
252+ mkdir /data/ssh 0750 root shell
253+ mkdir /data/ssh/empty 0700 root root
254+ mkdir /data/radio 0770 radio radio
255+
256+ # create dalvik-cache and double-check the perms, so as to enforce our permissions
257+ mkdir /data/dalvik-cache 0771 system system
258+ chown system system /data/dalvik-cache
259+ chmod 0771 /data/dalvik-cache
260+
261+ # create resource-cache and double-check the perms
262+ mkdir /data/resource-cache 0771 system system
263+ chown system system /data/resource-cache
264+ chmod 0771 /data/resource-cache
265+
266+ # create the lost+found directories, so as to enforce our permissions
267+ mkdir /data/lost+found 0770 root root
268+
269+ # create directory for DRM plug-ins - give drm the read/write access to
270+ # the following directory.
271+ mkdir /data/drm 0770 drm drm
272+
273+ # If there is no fs-post-data action in the init.<device>.rc file, you
274+ # must uncomment this line, otherwise encrypted filesystems
275+ # won't work.
276+ # Set indication (checked by vold) that we have finished this action
277+ #setprop vold.post_fs_data_done 1
278+
279+# Include extra init file
280+ import /init.cm.rc
281+
282+on boot
283+# basic network init
284+ ifup lo
285+ hostname localhost
286+ domainname localdomain
287+
288+# set RLIMIT_NICE to allow priorities from 19 to -20
289+ setrlimit 13 40 40
290+
291+# Memory management. Basic kernel parameters, and allow the high
292+# level system server to be able to adjust the kernel OOM driver
293+# parameters to match how it is managing things.
294+ write /proc/sys/vm/overcommit_memory 1
295+ write /proc/sys/vm/min_free_order_shift 4
296+ chown root system /sys/module/lowmemorykiller/parameters/adj
297+ chmod 0664 /sys/module/lowmemorykiller/parameters/adj
298+ chown root system /sys/module/lowmemorykiller/parameters/minfree
299+ chmod 0664 /sys/module/lowmemorykiller/parameters/minfree
300+
301+ # Tweak background writeout
302+ write /proc/sys/vm/dirty_expire_centisecs 200
303+ write /proc/sys/vm/dirty_background_ratio 5
304+
305+ # Permissions for System Server and daemons.
306+ chown radio system /sys/android_power/state
307+ chown radio system /sys/android_power/request_state
308+ chown radio system /sys/android_power/acquire_full_wake_lock
309+ chown radio system /sys/android_power/acquire_partial_wake_lock
310+ chown radio system /sys/android_power/release_wake_lock
311+ chown system system /sys/power/autosleep
312+ chown system system /sys/power/state
313+ chown system system /sys/power/wakeup_count
314+ chown radio system /sys/power/wake_lock
315+ chown radio system /sys/power/wake_unlock
316+ chmod 0660 /sys/power/state
317+ chmod 0660 /sys/power/wake_lock
318+ chmod 0660 /sys/power/wake_unlock
319+
320+ chown system system /sys/devices/system/cpu/cpufreq/interactive/timer_rate
321+ chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/timer_rate
322+ chown system system /sys/devices/system/cpu/cpufreq/interactive/min_sample_time
323+ chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/min_sample_time
324+ chown system system /sys/devices/system/cpu/cpufreq/interactive/hispeed_freq
325+ chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/hispeed_freq
326+ chown system system /sys/devices/system/cpu/cpufreq/interactive/go_hispeed_load
327+ chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/go_hispeed_load
328+ chown system system /sys/devices/system/cpu/cpufreq/interactive/above_hispeed_delay
329+ chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/above_hispeed_delay
330+ chown system system /sys/devices/system/cpu/cpufreq/interactive/boost
331+ chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/boost
332+ chown system system /sys/devices/system/cpu/cpufreq/interactive/boostpulse
333+ chown system system /sys/devices/system/cpu/cpufreq/interactive/input_boost
334+ chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/input_boost
335+
336+ # Assume SMP uses shared cpufreq policy for all CPUs
337+ chown system system /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
338+ chmod 0664 /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
339+ chown system system /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
340+ chmod 0664 /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
341+ chown system system /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq
342+ chmod 0664 /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq
343+
344+ chown system system /sys/class/timed_output/vibrator/enable
345+ chown system system /sys/class/leds/keyboard-backlight/brightness
346+ chown system system /sys/class/leds/lcd-backlight/brightness
347+ chown system system /sys/class/leds/button-backlight/brightness
348+ chown system system /sys/class/leds/jogball-backlight/brightness
349+ chown system system /sys/class/leds/red/brightness
350+ chown system system /sys/class/leds/green/brightness
351+ chown system system /sys/class/leds/blue/brightness
352+ chown system system /sys/class/leds/red/device/grpfreq
353+ chown system system /sys/class/leds/red/device/grppwm
354+ chown system system /sys/class/leds/red/device/blink
355+ chown system system /sys/class/leds/red/brightness
356+ chown system system /sys/class/leds/green/brightness
357+ chown system system /sys/class/leds/blue/brightness
358+ chown system system /sys/class/leds/red/device/grpfreq
359+ chown system system /sys/class/leds/red/device/grppwm
360+ chown system system /sys/class/leds/red/device/blink
361+ chown system system /sys/class/timed_output/vibrator/enable
362+ chown system system /sys/module/sco/parameters/disable_esco
363+ chown system system /sys/kernel/ipv4/tcp_wmem_min
364+ chown system system /sys/kernel/ipv4/tcp_wmem_def
365+ chown system system /sys/kernel/ipv4/tcp_wmem_max
366+ chown system system /sys/kernel/ipv4/tcp_rmem_min
367+ chown system system /sys/kernel/ipv4/tcp_rmem_def
368+ chown system system /sys/kernel/ipv4/tcp_rmem_max
369+ # Temporarily allowing any user to use the vibrator driver
370+ ## Until we have a common way to access it via platform-api
371+ chmod 0666 /sys/class/timed_output/vibrator/enable
372+ chown root radio /proc/cmdline
373+ chmod 0444 /proc/cmdline
374+
375+# Define TCP buffer sizes for various networks
376+# ReadMin, ReadInitial, ReadMax, WriteMin, WriteInitial, WriteMax,
377+ setprop net.tcp.buffersize.default 4096,87380,704512,4096,16384,110208
378+ setprop net.tcp.buffersize.wifi 524288,1048576,2097152,262144,524288,1048576
379+ setprop net.tcp.buffersize.lte 4096,87380,1220608,4096,16384,563200
380+ setprop net.tcp.buffersize.umts 4096,87380,563200,4096,16384,110208
381+ setprop net.tcp.buffersize.hspa 4096,87380,704512,4096,16384,110208
382+ setprop net.tcp.buffersize.hsupa 4096,87380,704512,4096,16384,262144
383+ setprop net.tcp.buffersize.hsdpa 4096,87380,704512,4096,16384,262144
384+ setprop net.tcp.buffersize.hspap 4096,87380,1220608,4096,16384,393216
385+ setprop net.tcp.buffersize.edge 4096,26280,35040,4096,16384,35040
386+ setprop net.tcp.buffersize.gprs 4096,8760,11680,4096,8760,11680
387+ setprop net.tcp.buffersize.evdo 4096,87380,563200,4096,16384,262144
388+ setprop net.tcp.buffersize.evdo_b 4096,87380,704512,4096,16384,262144
389+
390+# adb force hack
391+ setprop persist.sys.usb.config adb
392+
393+# Set this property so surfaceflinger is not started by system_init
394+ setprop system_init.startsurfaceflinger 0
395+
396+ class_start core
397+ class_start main
398+
399+on nonencrypted
400+ class_start late_start
401+
402+on charger
403+ class_start charger
404+
405+on property:vold.decrypt=trigger_reset_main
406+ class_reset main
407+
408+on property:vold.decrypt=trigger_load_persist_props
409+ load_persist_props
410+
411+on property:vold.decrypt=trigger_post_fs_data
412+ trigger post-fs-data
413+
414+on property:vold.decrypt=trigger_restart_min_framework
415+ class_start main
416+
417+on property:vold.decrypt=trigger_restart_framework
418+ class_start main
419+ class_start late_start
420+
421+on property:vold.decrypt=trigger_shutdown_framework
422+ class_reset late_start
423+ class_reset main
424+
425+## Daemon processes to be run by init.
426+##
427+service ueventd /sbin/ueventd
428+ class core
429+ critical
430+ seclabel u:r:ueventd:s0
431+
432+on property:selinux.reload_policy=1
433+ restart ueventd
434+ restart installd
435+
436+service console /system/bin/sh
437+ class core
438+ console
439+ disabled
440+ user shell
441+ group log
442+
443+on property:ro.debuggable=1
444+ start console
445+
446+# adbd is controlled via property triggers in init.<platform>.usb.rc
447+service adbd /sbin/adbd
448+ class core
449+ socket adbd stream 660 system system
450+ disabled
451+ seclabel u:r:adbd:s0
452+
453+# adbd on at boot in emulator
454+on property:ro.kernel.qemu=1
455+ start adbd
456+
457+service servicemanager /system/bin/servicemanager
458+ class core
459+ user system
460+ group system
461+ critical
462+ onrestart restart zygote
463+ onrestart restart media
464+ onrestart restart drm
465+
466+
467+service debuggerd /system/bin/debuggerd
468+ class main
469+
470+service ril-daemon /system/bin/rild
471+ class main
472+ socket rild stream 660 root radio
473+ socket rild-debug stream 660 radio system
474+ user root
475+ group radio cache inet misc audio sdcard_r sdcard_rw qcom_oncrpc qcom_diag log
476+
477+service drm /system/bin/drmserver
478+ class main
479+ user drm
480+ group drm system inet drmrpc
481+
482+service media /system/bin/mediaserver
483+ class main
484+ user media
485+ group audio camera inet net_bt net_bt_admin net_bw_acct drmrpc qcom_diag
486+ ioprio rt 4
487+
488+service installd /system/bin/installd
489+ class main
490+ socket installd stream 600 system system
491+
492+service racoon /system/bin/racoon
493+ class main
494+ socket racoon stream 600 system system
495+ # IKE uses UDP port 500. Racoon will setuid to vpn after binding the port.
496+ group vpn net_admin inet
497+ disabled
498+ oneshot
499+
500+service mtpd /system/bin/mtpd
501+ class main
502+ socket mtpd stream 600 system system
503+ user vpn
504+ group vpn net_admin inet net_raw
505+ disabled
506+ oneshot
507+
508+service dumpstate /system/bin/dumpstate -s
509+ class main
510+ socket dumpstate stream 0660 shell log
511+ disabled
512+ oneshot
513+
514+service sshd /system/bin/start-ssh
515+ class main
516+ disabled
517+
518+service mdnsd /system/bin/mdnsd
519+ class main
520+ user mdnsr
521+ group inet net_raw
522+ socket mdnsd stream 0660 mdnsr inet
523+ disabled
524+ oneshot
525+
526+service sensorservice /system/bin/sensorservice
527+ class main
528+ user system
529+ group graphics audio camera inet net_bt net_bt_admin net_bw_acct drmrpc input
530+
531+service ubuntuappmanager /system/bin/ubuntuappmanager
532+ class main
533+
534
535=== added file 'lxc-overrides/lxc-android-config.override'
536--- lxc-overrides/lxc-android-config.override 1970-01-01 00:00:00 +0000
537+++ lxc-overrides/lxc-android-config.override 2013-08-27 15:49:22 +0000
538@@ -0,0 +1,32 @@
539+start on started cgroup-lite
540+stop on runlevel [06]
541+
542+pre-start script
543+ for link in socket cpuctl graphics; do
544+ rm -r /dev/$link >/dev/null 2>&1 || true
545+ done
546+end script
547+
548+post-start script
549+ lxc-wait -n android -s RUNNING
550+ sleep 2
551+ pid=$(lxc-info -n android|grep ^pid|sed 's/^pid:.* //')
552+ devpath="/proc/$pid/root/dev"
553+ for link in socket cpuctl; do
554+ mkdir -p /dev/$link || true
555+ for file in $(ls $devpath/$link); do
556+ ln -s $devpath/$link/$file /dev/$link/$file || true
557+ done
558+ done
559+ mkdir -p /dev/graphics
560+ for file in $(ls $devpath/graphics); do
561+ ln -s /dev/$file /dev/graphics/$file || true
562+ done
563+ initctl emit android
564+end script
565+
566+exec lxc-start -n android -d -- /init
567+
568+pre-stop script
569+ exec lxc-stop -n android
570+end script
571
572=== added file 'lxc-overrides/ueventd.rc'
573--- lxc-overrides/ueventd.rc 1970-01-01 00:00:00 +0000
574+++ lxc-overrides/ueventd.rc 2013-08-27 15:49:22 +0000
575@@ -0,0 +1,105 @@
576+/dev/null 0666 root root
577+/dev/zero 0666 root root
578+/dev/full 0666 root root
579+/dev/ptmx 0666 root root
580+/dev/tty 0666 root root
581+/dev/random 0666 root root
582+/dev/urandom 0666 root root
583+/dev/ashmem 0666 root root
584+/dev/binder 0666 root root
585+
586+# Anyone can read the logs, but if they're not in the "logs"
587+# group, then they'll only see log entries for their UID.
588+/dev/alog/* 0666 root log
589+
590+# the msm hw3d client device node is world writable/readable.
591+/dev/msm_hw3dc 0666 root root
592+
593+# the DIAG device node is not world writable/readable.
594+/dev/diag 0660 system qcom_diag
595+
596+# gpu driver for adreno200 is globally accessible
597+/dev/kgsl 0666 root root
598+
599+# kms driver for drm based gpu
600+/dev/dri/* 0666 root graphics
601+
602+# these should not be world writable
603+/dev/diag_arm9 0660 radio radio
604+/dev/android_adb 0660 adb adb
605+/dev/android_adb_enable 0660 adb adb
606+/dev/ttyMSM0 0600 bluetooth bluetooth
607+/dev/uhid 0660 system net_bt_stack
608+/dev/uinput 0660 system net_bt_stack
609+/dev/alarm 0664 system radio
610+/dev/tty0 0660 root system
611+/dev/graphics/* 0666 root graphics
612+/dev/msm_hw3dm 0660 system graphics
613+/dev/input/* 0660 root input
614+/dev/eac 0660 root audio
615+/dev/cam 0660 root camera
616+/dev/pmem 0660 system graphics
617+/dev/pmem_adsp* 0660 system audio
618+/dev/pmem_camera* 0660 system camera
619+/dev/oncrpc/* 0660 root system
620+/dev/adsp/* 0660 system audio
621+/dev/snd/* 0660 system audio
622+/dev/mt9t013 0660 system system
623+/dev/msm_camera/* 0660 system camera
624+/dev/akm8976_daemon 0640 compass system
625+/dev/akm8976_aot 0640 compass system
626+/dev/akm8973_daemon 0640 compass system
627+/dev/akm8973_aot 0640 compass system
628+/dev/bma150 0640 compass system
629+/dev/cm3602 0640 compass system
630+/dev/akm8976_pffd 0640 compass system
631+/dev/lightsensor 0640 system system
632+/dev/msm_pcm_out* 0660 system audio
633+/dev/msm_pcm_in* 0660 system audio
634+/dev/msm_pcm_ctl* 0660 system audio
635+/dev/msm_snd* 0660 system audio
636+/dev/msm_mp3* 0660 system audio
637+/dev/audience_a1026* 0660 system audio
638+/dev/tpa2018d1* 0660 system audio
639+/dev/msm_audpre 0660 system audio
640+/dev/msm_audio_ctl 0660 system audio
641+/dev/htc-acoustic 0660 system audio
642+/dev/vdec 0660 system audio
643+/dev/q6venc 0660 system audio
644+/dev/snd/dsp 0660 system audio
645+/dev/snd/dsp1 0660 system audio
646+/dev/snd/mixer 0660 system audio
647+/dev/smd0 0640 radio radio
648+/dev/qmi 0640 radio radio
649+/dev/qmi0 0640 radio radio
650+/dev/qmi1 0640 radio radio
651+/dev/qmi2 0640 radio radio
652+/dev/bus/usb/* 0660 root usb
653+/dev/mtp_usb 0660 root mtp
654+/dev/usb_accessory 0660 root usb
655+/dev/tun 0660 system vpn
656+
657+# CDMA radio interface MUX
658+/dev/ts0710mux* 0640 radio radio
659+/dev/ppp 0660 radio vpn
660+
661+# sysfs properties
662+/sys/devices/virtual/input/input* enable 0660 root input
663+/sys/devices/virtual/input/input* poll_delay 0660 root input
664+/sys/devices/virtual/usb_composite/* enable 0664 root system
665+
666+/sys/devices/system/cpu/cpufreq ondemand/boostfreq 0664 system system
667+/sys/devices/system/cpu/cpufreq ondemand/boostpulse 0664 system system
668+/sys/devices/system/cpu/cpufreq ondemand/boosttime 0664 system system
669+/sys/devices/system/cpu/cpufreq ondemand/sampling_rate 0664 system system
670+/sys/devices/system/cpu/cpufreq ondemand/io_is_busy 0664 system system
671+/sys/devices/system/cpu/cpufreq ondemand/down_differential 0664 system system
672+/sys/devices/system/cpu/cpufreq ondemand/powersave_bias 0664 system system
673+/sys/devices/system/cpu/cpufreq ondemand/sampling_down_factor 0664 system system
674+
675+/sys/devices/system/cpu/cpufreq interactive/boostpulse 0664 system system
676+/sys/devices/system/cpu/cpufreq interactive/timer_rate 0664 system system
677+/sys/devices/system/cpu/cpufreq interactive/min_sample_rate 0664 system system
678+/sys/devices/system/cpu/cpufreq interactive/hispeed_freq 0664 system system
679+/sys/devices/system/cpu/cpufreq interactive/go_hispeed_load 0664 system system
680+/sys/devices/system/cpu/cpufreq interactive/above_hispeed_delay 0664 system system
681
682=== modified file 'upstart-session/maliit-server.conf'
683--- upstart-session/maliit-server.conf 2013-07-11 19:27:47 +0000
684+++ upstart-session/maliit-server.conf 2013-08-27 15:49:22 +0000
685@@ -4,11 +4,16 @@
686 start on started dbus
687 stop on session-end
688
689+# if unity8 dies, need to restart maliit also
690+start on starting unity8
691+stop on stopping unity8
692+
693 respawn
694
695 script
696 # FIXME(ricmm) We start too early on fast devices
697 # thus the app manager is not always up.
698 sleep 1
699+ export QT_QPA_PLATFORM=ubuntumirclient
700 exec maliit-server
701 end script
702
703=== modified file 'upstart-session/unity8.conf'
704--- upstart-session/unity8.conf 2013-08-23 13:28:58 +0000
705+++ upstart-session/unity8.conf 2013-08-27 15:49:22 +0000
706@@ -1,7 +1,7 @@
707 description "Unity Shell v8"
708 author "Ricardo Mendoza <ricmm@ubuntu.com>"
709
710-start on xsession SESSION=ubuntu-touch and started maliit-server
711+start on xsession SESSION=ubuntu-touch and started dbus
712 stop on desktop-end
713
714 respawn
715@@ -13,5 +13,7 @@
716
717 script
718 sleep 2
719+ export QML2_IMPORT_PATH=/usr/lib/arm-linux-gnueabihf/qt5/imports/
720+ export QT_QPA_PLATFORM=ubuntumirserver
721 exec unity8
722 end script

Subscribers

People subscribed via source and target branches