Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions group_vars/on_imagebuild
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Change this if you have an apt-cacher, apt-cacher-ng or apt-proxy
# Change this if you have an apt-cacher, apt-cacher-ng or apt-proxy
# server running to speed up build times significantly
# e.g. apt_server: 192.168.100.5:3142
apt_server: archive.ubuntu.com
Expand All @@ -7,7 +7,7 @@ debootstrap_arch: amd64
debootstrap_release: trusty
debootstrap_apt_server: http://{{ apt_server }}/ubuntu

ubuntu_kernel_version: 3.16.0-25-generic
ubuntu_kernel_version: 3.19.0-56-generic

# Do not change ansible_dependencies!
ansible_dependencies: "python,python-apt"
Expand Down
6 changes: 3 additions & 3 deletions roles/initrd/provision_initrd/files/local
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ mountroot()
modprobe tmpfs
modprobe squashfs
modprobe overlayfs
mkdir upper lower # upper=overlay, lower=base squashfs, mount on ${rootmnt}
mount -t tmpfs tmpfs upper # put overlay files into a tmpfs so they don't get blown away on switch_root
mkdir upper lower work # upper=overlay, lower=base squashfs, work=empty for new command syntax, mount on ${rootmnt}
mount -t tmpfs tmpfs upper work # put overlay files into a tmpfs so they don't get blown away on switch_root
CB=$(cat /proc/cmdline)
CB="${CB##*API_CB=}"
CB="${CB%% *}"
Expand All @@ -125,7 +125,7 @@ mountroot()
mount -n -t squashfs -o loop base.squashfs.img lower
echo "Mounting overlayfs onto ${rootmnt}"
logger "Mounting overlayfs onto ${rootmnt}"
mount -t overlayfs overlayfs ${rootmnt} -o rw,upperdir=upper,lowerdir=lower
mount -t overlay overlayfs -o rw,upperdir=upper,lowerdir=lower,workdir=work ${rootmnt}

mountroot_status="$?"
echo "overlayfs mount complete"
Expand Down
2 changes: 1 addition & 1 deletion vars/discovery_overlay.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#provisioner: roles/overlay/provision_discovery_overlay

overlayfs_archive_name: "discovery.overlay.cpio"
overlayfs_archive_name: "discovery.3.19.0-56-generic.overlay.cpio"

discovery_overlay_package_manifest:
- { package: "dmidecode", version: "2.12-2" }
Expand Down