Merge lp:~davidhackerdvm/session-manager/ubuntu-session-update into lp:session-manager

[David Hacker]

Allow session-manager to source /system/etc/ubuntu-sessions.d/$device.conf
  if /etc/ubuntu-sessions/$device.conf is not in session-manager package

[Ricardo Salveti (rsalveti)]

While I agree this is useful for people creating new ports, I'd like to get the configs merged at the package itself if possible.

In case this is a requirement for you, can you change the logic to only look for the /system based file in case the one available at the package doesn't exist?

Thanks.

review: Needs Fixing

[David Hacker (davidhackerdvm)]

Updated with logic to only use the android system/etc/ubuntu-sessions.d if etc/ubuntu-sessions.d doesn't exist.

[Ricardo Salveti (rsalveti)]

10 +[ -e /etc/ubuntu-session.d/$device.conf ] && . /etc/ubuntu-session.d/$device.conf ||
11 +. /system/etc/ubuntu-session.d/$device.conf

Looks better. I'd just like to have another check at the /system/etc/ubuntu-session.d/$device.conf file before sourcing it (as we might have the case where none of the files are available, which will break with an error instead of using the default values).

Add the extra check and we can merge this MR.

And to update the MR you don't need to create a new one, just do another commit to the lp:~davidhackerdvm/session-manager/ubuntu-session-update branch and push it to launchpad (the MR will be automatically updated).

review: Needs Fixing

[Oliver Grawert (ogra)]

you should drop the || and just make the override the next line below ...
i.e. copy the existing line and add a /system in front of the paths, that way you have a proper override chain:

in code defaults -> shipped defaults from the package -> porter/maintainer defaults

[lp:~davidhackerdvm/session-manager/ubuntu-session-update]

50. By David Hacker on 2013-04-09

Ensure that /system/etc/ubuntu-session.d/$device.conf exists before sourcing

Unmerged revisions

50. By David Hacker on 2013-04-09

Ensure that /system/etc/ubuntu-session.d/$device.conf exists before sourcing

49. By David Hacker on 2013-04-04

Allow session-manager to source /system/etc/ubuntu-sessions.d/$device.conf
if /etc/ubuntu-sessions/$device.conf is not in session-manager package

* This will allow porters to test thier configs prior to submitting to
  the session-manager package

48. By David Hacker on 2013-03-27

Allow ubuntu-sessions to also ready /system/etc/ubunutu-sessions.d/$(device).conf

* This will allow the device specific config to be included in the android base build
  and not require future changes to add .conf files to session-manager package

=== modified file 'ubuntu-session'
--- ubuntu-session	2013-03-22 13:49:23 +0000
+++ ubuntu-session	2013-04-09 20:23:21 +0000
@@ -66,7 +66,9 @@
 FORM_FACTOR="phone"
 
 # override defaults by sourcing /etc/ubuntu-session.d/$device.conf
-[ -e /etc/ubuntu-session.d/$device.conf ] && . /etc/ubuntu-session.d/$device.conf
+# or counterpart in android file system if the config is not in session-manager yet
+[ -e /etc/ubuntu-session.d/$device.conf ] && . /etc/ubuntu-session.d/$device.conf || 
+[ -e /system/etc/ubuntu-session.d/$device.conf ] && . /system/etc/ubuntu-session.d/$device.conf
 
 grep -q GRID_UNIT_PX $bashrc || echo "export GRID_UNIT_PX=${GRID_UNIT_PX}" >> $bashrc
 grep -q QTWEBKIT_DPR $bashrc || echo "export QTWEBKIT_DPR=${QTWEBKIT_DPR}" >> $bashrc