Phablet Tools

Merge lp:~morphis/phablet-tools/multiple-silos into lp:phablet-tools

  1. multiple-silos
  2. Merge into trunk
Proposed by Simon Fels on 2015-09-18
Status: Merged
Merged at revision: 342
Proposed branch: lp:~morphis/phablet-tools/multiple-silos
Merge into: lp:phablet-tools
Diff against target: 12 lines (+1/-1)
1 file modified
citrain (+1/-1)
To merge this branch: bzr merge lp:~morphis/phablet-tools/multiple-silos
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2015-09-25
Ubuntu Phablet Team 2015-09-18 Pending
Review via email: mp+271621@code.launchpad.net

Commit Message

Add support to install multiple silos with the citrain utility.

Description of the Change

Add support to install multiple silos with the citrain utility.

To post a comment you must log in.
Timo Jyrinki (timo-jyrinki) wrote :

Ready for landing.

Timo Jyrinki (timo-jyrinki) wrote :

davmor2 has some suggestions still..

PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Dave Morley (davmor2) wrote :

Couple of small things.
1 remove the "-a" from "tee -a" it is not needed we are not appending anything and there is less chance of a mix up.
2 Add a - between silo and $SILO this makes the name more readable.

Other than that works a charm thanks.

lp:~morphis/phablet-tools/multiple-silos updated on 2015-09-25
344. By Simon Fels on 2015-09-25

Use just the silo number to extend the preference file name

Robert Bruce Park (robru) wrote :

Why are you using $1? I don't like the look of that because the script uses `shift` a lot, if a new argument gets added later $1 may not refer to the siloname anymore. It should probably stay as $SILO for future-proofing reasons.

lp:~morphis/phablet-tools/multiple-silos updated on 2015-09-25
345. By Simon Fels on 2015-09-25

Switch back to full silo name in file name

PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'citrain'
2--- citrain 2015-05-07 15:24:45 +0000
3+++ citrain 2015-09-25 06:54:47 +0000
4@@ -95,7 +95,7 @@
5 phablet-config writable-image -r $PASSWORD --ppa $PPA/$DISTRO/$SILO
6 adb shell "echo -e '#\x21/bin/sh\necho $PASSWORD' >/tmp/askpass.sh"
7 adb shell chmod +x /tmp/askpass.sh
8- adb shell "echo -e 'Package: *\nPin: release o=LP-PPA-ci-train-ppa-service-$SILO\nPin-Priority: 1100' | SUDO_ASKPASS=/tmp/askpass.sh sudo -A tee /etc/apt/preferences.d/silo.pref"
9+ adb shell "echo -e 'Package: *\nPin: release o=LP-PPA-ci-train-ppa-service-$SILO\nPin-Priority: 1100' | SUDO_ASKPASS=/tmp/askpass.sh sudo -A tee /etc/apt/preferences.d/silo-$SILO.pref"
10 adb shell SUDO_ASKPASS=/tmp/askpass.sh sudo -A apt-get -o Dir::Etc::SourceList=/dev/null update
11 adb shell SUDO_ASKPASS=/tmp/askpass.sh sudo -A apt-get dist-upgrade --yes
12 adb shell rm -f /tmp/askpass.sh

Subscribers

People subscribed via source and target branches