Adds debian support to iso element

Adds support for debian to iso.
Updated README to further clarify what the element does.

Change-Id: I17ac89cfbc84365860c591fab0e4c78123035983
Co-Authored-By: zhangjian <jian.zhang8@hpe.com>
This commit is contained in:
Gloria 2015-08-12 19:32:46 +08:00 committed by Jane.zhang
parent caf402fd04
commit f30ddfc379
5 changed files with 35 additions and 4 deletions

View File

@ -2,12 +2,13 @@
iso
===
Generates a bootable ISO image from the kernel/ramdisk generated by the
elements ``baremetal`` or ``ramdisk``. It uses isolinux to boot on BIOS
elements ``baremetal``, ``ironic-agent`` or ``ramdisk``. It uses isolinux to boot on BIOS
machines and grub to boot on EFI machines.
This element has been tested on the following distro(s):
* ubuntu
* fedora
* debian
**NOTE**: For other distros, please make sure the ``isolinux.bin`` file
exists at ``/usr/lib/syslinux/isolinux.bin``.
@ -36,6 +37,10 @@ named ``<image-name>.iso`` booting the generated kernel and ramdisk. It also
automatically appends kernel command-line argument 'boot\_method=vmedia'
which is required for Ironic drivers ``iscsi_ilo``.
ironic-agent element
--------------------
When used with ``ironic-agent`` element, this generates a bootable ISO image named ``<image-name>.iso`` which boots the agent kernel and agent ramdisk.
**REFERENCES**
[1] https://bugs.launchpad.net/ubuntu/+source/grub2/+bug/1378658

View File

@ -63,6 +63,11 @@ function build_iso() {
if [ $DISTRO_NAME = "fedora" ]; then
EFI_BOOT_DIR="EFI/fedora"
EXTRA_KERNEL_PARAMS="usbcore.autosuspend=-1"
#debian
elif [ $DISTRO_NAME = "debian" ]; then
EFI_BOOT_DIR="EFI/debian"
EXTRA_KERNEL_PARAMS=""
#ubuntu:
else
EFI_BOOT_DIR="EFI/ubuntu"
EXTRA_KERNEL_PARAMS=""

View File

@ -1 +1,3 @@
syslinux:
syslinux-common:
isolinux:

View File

@ -1,14 +1,27 @@
{
"distro":{
"debian":{
"syslinux": "syslinux",
"syslinux-common": "syslinux-common",
"isolinux": "isolinux"
}
},
"family":{
"debian":{
"syslinux": "syslinux"
"syslinux": "syslinux",
"syslinux-common": "",
"isolinux": ""
},
"redhat":{
"syslinux": ""
"syslinux": "",
"syslinux-common": "",
"isolinux": ""
}
},
"default":{
"syslinux": "syslinux"
"syslinux": "syslinux",
"syslinux-common": "",
"isolinux": ""
}
}

View File

@ -22,9 +22,15 @@ else
SHIM_FILE="/usr/lib/shim/shim.efi.signed"
fi
#fedora
if [ $DISTRO_NAME = "fedora" ]; then
SYSLINUX_FILE="/usr/share/syslinux/isolinux.bin"
LDLINUX_FILE="/usr/share/syslinux/ldlinux.c32"
#debian
elif [ $DISTRO_NAME = "debian" ]; then
SYSLINUX_FILE="/usr/lib/ISOLINUX/isolinux.bin"
LDLINUX_FILE="/usr/lib/syslinux/modules/bios/ldlinux.c32"
#ubuntu
else
SYSLINUX_FILE="/usr/lib/syslinux/isolinux.bin"
LDLINUX_FILE="/usr/lib/syslinux/ldlinux.c32"