Merge lp:~cjwatson/launchpad-buildd/modprobe-nbd into lp:launchpad-buildd

Proposed by Colin Watson on 2016-01-05
Status: Merged
Merged at revision: 186
Proposed branch: lp:~cjwatson/launchpad-buildd/modprobe-nbd
Merge into: lp:launchpad-buildd
Diff against target: 26 lines (+6/-0)
2 files modified
debian/changelog (+2/-0)
debian/launchpad-buildd.init (+4/-0)
To merge this branch: bzr merge lp:~cjwatson/launchpad-buildd/modprobe-nbd
Reviewer Review Type Date Requested Status
William Grant code 2016-01-05 Approve on 2016-01-08
Review via email: mp+281681@code.launchpad.net

Commit message

Try to load the nbd module when starting launchpad-buildd (LP: #1531171).

Description of the change

Try to load the nbd module when starting launchpad-buildd. This should generally be harmless, and it would let cloud image builds use qemu-nbd for performance.

To post a comment you must log in.
William Grant (wgrant) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-11-25 15:00:43 +0000
3+++ debian/changelog 2016-01-05 17:51:00 +0000
4@@ -6,6 +6,8 @@
5 that now.
6 * Configure systemd-timesyncd to use the NTP server configured in
7 /etc/launchpad-buildd/default.
8+ * Try to load the nbd module when starting launchpad-buildd
9+ (LP: #1531171).
10
11 -- Colin Watson <cjwatson@ubuntu.com> Mon, 16 Nov 2015 18:12:29 +0000
12
13
14=== modified file 'debian/launchpad-buildd.init'
15--- debian/launchpad-buildd.init 2015-11-16 18:13:05 +0000
16+++ debian/launchpad-buildd.init 2016-01-05 17:51:00 +0000
17@@ -75,6 +75,10 @@
18 CONF=$1
19 PIDFILE="$PIDROOT"/"$CONF".pid
20 LOGFILE="$LOGROOT"/"$CONF".log
21+
22+ # Useful for certain kinds of image builds.
23+ modprobe nbd || true
24+
25 su - buildd -c "BUILDD_SLAVE_CONFIG=$CONFROOT/$CONF PYTHONPATH=/usr/lib/launchpad-buildd twistd --no_save --pidfile $PIDFILE --python $TACFILE --logfile $LOGFILE --umask 022"
26 }
27

Subscribers

People subscribed via source and target branches

to all changes: