cloud mode can overwrite /etc/defaults/landscape-client and thus lose the non-root mode username

The landscape-client initscript, when in cloud mode, overwrites /etc/defaults/landscape-client:

if [ $RUN -eq 0 ]; then
    if [ $CLOUD -eq 1 ]; then
        if landscape-is-cloud-managed; then
            # Install the cloud default configuration file
            cp /usr/share/landscape/cloud-default.conf /etc/landscape/client.conf
            # Override default file for not going in this conditional again at
            # next startup
            echo "RUN=1" > $LANDSCAPE_DEFAULTS

That file, however, can also contain the name of the user to run as when in non-root mode, so the above echo would destroy that. It will also overwrite its own CLOUD=x setting in that file.

I suggest something like the following to change the RUN variable without touching the rest of the file:

sed -i "s/^RUN=.*/RUN=1/" $LANDSCAPE_DEFAULTS