f6a2452d4c
The grub.cfg has two variables [1] GRUB_CMDLINE_LINUX : used on all boots GRUB_CMDLINE_LINUX_DEFAULT : additionally used on all "normal" boots The problem with I2298675dda1f699c572b3423e7274bc8bd7c1c9d is that it appened the values in DIB_BOOTLOADER_DEFAULT_CMDLINE to both of these, resulting in duplicated arguments. I don't think we considered that GRUB_CMDLINE_LINUX_DEFAULT actually already appends to the GRUB_CMDLINE_LINUX values. Make DIB_BOOTLOADER_DEFAULT_CMDLINE only append itself to GRUB_CMDLINE_LINUX_DEFAULT. That seems to line up sensibly with the name of the variable. Documentation is enhanced around this, and a releasenote added. [1] https://help.ubuntu.com/community/Grub2/Setup Change-Id: I76b5442a9090c19a6540ed2d4ab324546f241ebf Closes: #1791736 |
||
---|---|---|
.zuul.d | ||
bin | ||
contrib | ||
diskimage_builder | ||
doc | ||
playbooks/legacy | ||
releasenotes | ||
tests | ||
.gitignore | ||
.gitreview | ||
.testr.conf | ||
babel.cfg | ||
bindep.txt | ||
LICENSE | ||
lower-constraints.txt | ||
pylint.cfg | ||
README.rst | ||
requirements.txt | ||
setup.cfg | ||
setup.py | ||
test-requirements.txt | ||
tox.ini |
Image building tools for OpenStack ================================== ``diskimage-builder`` is a flexible suite of components for building a wide-range of disk images, filesystem images and ramdisk images for use with OpenStack. This repository has the core functionality for building such images, both virtual and bare metal. Images are composed using `elements`; while fundamental elements are provided here, individual projects have the flexibility to customise the image build with their own elements. For example:: $ DIB_RELEASE=trusty disk-image-create -o ubuntu-trusty.qcow2 vm ubuntu will create a bootable Ubuntu Trusty based ``qcow2`` image. ``diskimage-builder`` is useful to anyone looking to produce customised images for deployment into clouds. These tools are the components of `TripleO <https://wiki.openstack.org/wiki/TripleO>`__ that are responsible for building disk images. They are also used extensively to build images for testing OpenStack itself, particularly with `nodepool <https://docs.openstack.org/infra/system-config/nodepool.html>`__. Platforms supported include Ubuntu, CentOS, RHEL and Fedora. Full documentation, the source of which is in ``doc/source/``, is published at: * https://docs.openstack.org/diskimage-builder/latest/ Copyright ========= Copyright 2012 Hewlett-Packard Development Company, L.P. Copyright (c) 2012 NTT DOCOMO, INC. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.