[Merge] lp:~morphis/lxc-android-config/bluez5-support into lp:lxc-android-config

[Alfonso Sanchez-Beato]

Review: Needs Fixing

Looks good, but I have a couple of comments.

Diff comments:

> 
> === modified file 'etc/init/ofono.override'
> --- etc/init/ofono.override	2015-09-02 07:50:44 +0000
> +++ etc/init/ofono.override	2015-10-20 06:13:18 +0000
> @@ -9,4 +9,4 @@
>  env OFONO_RIL_DEVICE=ril
>  env OFONO_RIL_NUM_SIM_SLOTS=1
>  
> -exec ofonod -P stktest,provision,sap,udev,dun,smart,hfp
> +exec ofonod -P provision,udev*,dun*,smart*,hfp_bluez5

We need to disable stktest (which creates a fake modem) and sap (which we do not support) too.

> 
> === renamed file 'etc/init/set.pretty-hostname.conf' => 'etc/init/update-machine-info.conf'
> --- etc/init/set.pretty-hostname.conf	2015-09-02 07:50:44 +0000
> +++ etc/init/update-machine-info.conf	2015-10-20 06:13:18 +0000
> @@ -1,19 +1,44 @@
> -# Set pretty hostname
> +# Update machine information
>  #
> -# This sets the pretty hostname in /etc/machine-info to the model name
> -
> -
> -description "Set pretty hostname"
> +# This will update the hostname and the chassis type of the host
> +
> +description "Update machine info"
>  
>  task
>  
>  start on (started dbus and starting bluetooth)
>  
>  script
> -	if [ -x `which getprop` ] && [ ! -s /etc/writable/machine-info ]; then
> -		device=`getprop ro.product.model`
> -		if [ "$device" != "" ]; then
> -			hostnamectl --pretty set-hostname "$device"
> -		fi
> +	if [ -x `which getprop` ]; then
> +		# Only update hostname when machine-info is not present yet
> +		# as otherwise it could have been overriden by the user
> +		if [ ! -s /etc/writable/machine-info ]; then
> +			device=`getprop ro.product.model`
> +			if [ "$device" != "" ]; then
> +				hostnamectl --pretty set-hostname "$device"
> +			fi
> +		fi
> +
> +		# When not chassis type is set yet we update it with the

Typo here?

> +		# value from the touch session configuration. We check this
> +		# always as we need to care about the case where this
> +		# updated upstart job was introduced and the machine-info
> +		# file was already present on the device.
> +		chassis=`hostnamectl | grep Chassis | cut -d':' -f2`
> +		if [ -z "$chassis" ]; then
> +			SESSION_CONF_DIR="/etc/ubuntu-touch-session.d"
> +			machine=`getprop ro.product.device`
> +
> +			if [ -s $SESSION_CONF_DIR/$machine.conf ] ; then
> +				. $SESSION_CONF_DIR/$machine.conf
> +			elif [ -s $SESSION_CONF_DIR/android.conf ] ; then
> +				. $SESSION_CONF_DIR/android.conf
> +			fi
> +
> +			if [ ! -z "$FORM_FACTOR" ] ; then
> +					hostnamectl --pretty set-chassis $FORM_FACTOR

One tab more than needed

> +			fi
> +		fi
> +
>  	fi
>  end script


-- 
https://code.launchpad.net/~morphis/lxc-android-config/bluez5-support/+merge/273785
Your team Ubuntu Phablet Team is subscribed to branch lp:lxc-android-config.