openstack
/
fuel-main
Code Issues Proposed changes

Merge "ubuntu: use kernel 3.13 (lts-trusty)"

This commit is contained in:
Jenkins 2014-11-27 19:34:16 +00:00 committed by Gerrit Code Review
parent 1a78474473 2102c17615
commit 85ab18e740
3 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.mk
View File

@ -107,8 +107,8 @@ UBUNTU_RELEASE:=precise
UBUNTU_MAJOR:=12
UBUNTU_MINOR:=04
UBUNTU_RELEASE_NUMBER:=$(UBUNTU_MAJOR).$(UBUNTU_MINOR)
UBUNTU_KERNEL_FLAVOR?=lts-saucy
UBUNTU_NETBOOT_FLAVOR?=saucy-netboot
UBUNTU_KERNEL_FLAVOR?=lts-trusty
UBUNTU_NETBOOT_FLAVOR?=trusty-netboot
UBUNTU_ARCH:=amd64
UBUNTU_IMAGE_RELEASE:=$(UBUNTU_MAJOR)$(UBUNTU_MINOR)
SEPARATE_IMAGES?=/boot,ext2 /,ext4

12
packages/deb/debian-boot/01_mount_target_proc.sh Executable file
View File

@ -0,0 +1,12 @@
#!/bin/sh
# Work around the kernel (linux-image-3.13.0) installation failure.
# The pre-install script tries to check if the CPU can actually run
# a 64-bit kernel. That script checks for CPU features via /proc/cpuinfo
# without checking if /proc is mounted.
# As a work around put this script into /usr/lib/post-base-installer.d
# directory so that debian-installer calls it before attempting to install
# the kernel package.
if [ ! -d /target/proc/1 ]; then
mkdir -p /target/proc
mount -t proc proc /target/proc
fi

11
packages/deb/debian-boot/initrd.mk
View File

@ -1,8 +1,19 @@
NETBOOT_PATH=$(LOCAL_MIRROR)/ubuntu/installer-amd64/current/images/netboot/ubuntu-installer/amd64
# script which mounts /proc in /target. linux-image* preinst script uses
# /proc without checking if its mounted, hence this work around:
hook_script:=$(SOURCE_DIR)/packages/deb/debian-boot/01_mount_target_proc.sh
# Debian installer runs scripts located in this directory before installing
# the kernel (and after the base has been installed)
hook_target_dir:=/usr/lib/post-base-installer.d
$(BUILD_DIR)/packages/deb/debian-boot/initrd.done:\
$(BUILD_DIR)/mirror/ubuntu/boot.done
mkdir -p $(@D)
cd $(@D) && gunzip -c $(NETBOOT_PATH)/initrd.gz | sudo cpio -di
cd $(@D) && sudo patch -p1 < $(SOURCE_DIR)/packages/deb/debian-boot/preseed-retry.patch
# copy helper script into a directory where the installer expects to find it
sudo mkdir -p $(@D)$(hook_target_dir)
sudo cp $(hook_script) $(@D)$(hook_target_dir)
cd $(@D) && sudo find . | sudo cpio --create --format='newc' > $(BUILD_DIR)/packages/deb/debian-boot/initrd.gz
$(ACTION.TOUCH)