Merge lp:~allenap/maas/quiet-down-lldpd into lp:~maas-committers/maas/trunk

Proposed by Gavin Panella
Status: Merged
Approved by: Gavin Panella
Approved revision: no longer in the source branch.
Merged at revision: 1707
Proposed branch: lp:~allenap/maas/quiet-down-lldpd
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 18 lines (+5/-1)
1 file modified
etc/maas/templates/commissioning-user-data/user_data.template (+5/-1)
To merge this branch: bzr merge lp:~allenap/maas/quiet-down-lldpd
Reviewer Review Type Date Requested Status
Raphaël Badin (community) Approve
Review via email: mp+190941@code.launchpad.net

Commit message

Ensure that apt-get is non-interactive during commissioning.

To post a comment you must log in.
Revision history for this message
Raphaël Badin (rvb) wrote :

Looks good… it is probably worth QAing in the lab.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'etc/maas/templates/commissioning-user-data/user_data.template'
2--- etc/maas/templates/commissioning-user-data/user_data.template 2013-10-07 21:35:59 +0000
3+++ etc/maas/templates/commissioning-user-data/user_data.template 2013-10-14 12:44:33 +0000
4@@ -30,9 +30,13 @@
5
6 mkdir -p "$BIN_D" "$OUT_D" "$SCRIPTS_D" "$IPMI_CONFIG_D"
7
8+# Ensure that invocations of apt-get are not interactive by default,
9+# here and in all subprocesses.
10+export DEBIAN_FRONTEND=noninteractive
11+
12 ### some utility functions ####
13 aptget() {
14- DEBIAN_FRONTEND=noninteractive apt-get --assume-yes -q "$@" </dev/null
15+ apt-get --assume-yes -q "$@" </dev/null
16 }
17
18 add_bin() {