Merge lp:~tai271828/checkbox/160805.change.oem.sru.dist.upgrade.flag into lp:checkbox

[Taihsiang Ho]

change the flag name for checkbox desktop autostarter so it could be optional to dist-upgrade or not.

[Taihsiang Ho (tai271828)]

low risk. this merge only change the flag name used for OEM SRU automation. self-approved.

review: Approve

=== modified file 'checkbox-ng/contrib/checkbox-sru.desktop'
--- checkbox-ng/contrib/checkbox-sru.desktop	2016-04-21 07:48:46 +0000
+++ checkbox-ng/contrib/checkbox-sru.desktop	2016-08-05 12:22:41 +0000
@@ -3,7 +3,7 @@
 Name=CheckBox SRU for Desktop
 Comment=CheckBox can run after login to test a system automatically.
 Icon=checkbox
-Exec=sh -c 'if [ -e /usr/share/oem-automation/flags/first-start-checkbox ]; then sleep 60; sudo apt-get dist-upgrade -y --force-yes -o Dpkg::Options::="--force-confnew" > /home/ubuntu/oem-automation-dist-upgrade.log 2>&1; sudo rm -f /usr/share/oem-automation/flags/first-start-checkbox; sudo reboot; fi; if [ `pidof systemd` ]; then sudo systemctl start checkbox-ci-installed-notifier.service; /usr/bin/checkbox sru --check-config >/tmp/checkbox.log 2>&1; sudo systemctl start checkbox-ci-mailer.service; else sudo initctl emit checkbox-sru-started; /usr/bin/checkbox sru --check-config >/tmp/checkbox.log 2>&1; sudo initctl emit checkbox-sru-finished; fi'
+Exec=sh -c 'if [ -e /usr/share/oem-automation/flags/execute-dist-upgrade ]; then sleep 60; sudo apt-get dist-upgrade -y --force-yes -o Dpkg::Options::="--force-confnew" > /home/ubuntu/oem-automation-dist-upgrade.log 2>&1; sudo rm -f /usr/share/oem-automation/flags/execute-dist-upgrade; sudo reboot; fi; if [ `pidof systemd` ]; then sudo systemctl start checkbox-ci-installed-notifier.service; /usr/bin/checkbox sru --check-config >/tmp/checkbox.log 2>&1; sudo systemctl start checkbox-ci-mailer.service; else sudo initctl emit checkbox-sru-started; /usr/bin/checkbox sru --check-config >/tmp/checkbox.log 2>&1; sudo initctl emit checkbox-sru-finished; fi'
 Terminal=false
 Type=Application
 Categories=