livecd-rootfs

Merge lp:~darkmuggle-deactivatedaccount/livecd-rootfs/lp1543204 into lp:livecd-rootfs

  1. lp1543204
  2. Merge into trunk
Proposed by Ben Howard
Status: Merged
Merged at revision: 1298
Proposed branch: lp:~darkmuggle-deactivatedaccount/livecd-rootfs/lp1543204
Merge into: lp:livecd-rootfs
Diff against target: 24 lines (+3/-0)
2 files modified
debian/changelog (+2/-0)
live-build/ubuntu-cpc/hooks/030-root-tarball.binary (+1/-0)
To merge this branch: bzr merge lp:~darkmuggle-deactivatedaccount/livecd-rootfs/lp1543204
Reviewer Review Type Date Requested Status
Scott Moser Approve
Review via email: mp+285379@code.launchpad.net

Commit message

Create /lib/modules in target filesystem

This allows kernel + initramfs + cloud-initramfs-copymods to use the lxd image. Without /lib/modules present the cloud-initramfs-copymods initramfs
module will not be able to populate /lib/modules/<uname -r>.

Description of the change

Create /lib/modules for MAAS images.

To post a comment you must log in.
Revision history for this message
Scott Moser (smoser) :
review: Approve

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 2016-02-08 16:07:17 +0000
3+++ debian/changelog 2016-02-08 17:24:25 +0000
4@@ -24,6 +24,8 @@
5 [ Ben Howard ]
6 * ubuntu-cpc: fix hooks/032-disk-image.binary call to
7 create_empty_partition, which requires five args due to "-u"
8+ * ubuntu-cpc: in hooks/030-root-tarball.binary create /lib/modules to fix
9+ (LP: 1543204).
10
11 [ Dimitri John Ledkov ]
12 * Do not remove linux-base, when purging all the linux-*, in the tarball
13
14=== modified file 'live-build/ubuntu-cpc/hooks/030-root-tarball.binary'
15--- live-build/ubuntu-cpc/hooks/030-root-tarball.binary 2016-02-08 16:07:17 +0000
16+++ live-build/ubuntu-cpc/hooks/030-root-tarball.binary 2016-02-08 17:24:25 +0000
17@@ -22,6 +22,7 @@
18 env DEBIAN_FRONTEND=noninteractive chroot binary/boot/filesystem.dir apt-get --purge remove --assume-yes '^linux-.*' 'linux-base+'
19 env DEBIAN_FRONTEND=noninteractive chroot binary/boot/filesystem.dir apt-get --purge remove --assume-yes '^grub-.*'
20 env DEBIAN_FRONTEND=noninteractive chroot binary/boot/filesystem.dir apt-get autoremove --purge --assume-yes
21+chroot binary/boot/filesystem.dir mkdir /lib/modules
22
23 chroot binary/boot/filesystem.dir rm /usr/sbin/grub-probe
24 chroot binary/boot/filesystem.dir dpkg-divert --remove --local --rename /usr/sbin/grub-probe

Subscribers

People subscribed via source and target branches