diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-06-03 17:29:42 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-06-03 17:29:42 +0000 |
| commit | 200e0951c766664e51104c098b43ccd83e9b03ca (patch) | |
| tree | e9b8e2a22c0a471ae2592389445b32ce972bc6b1 | |
| parent | 0487c382acb6373d26180eb954559c406d5ad528 (diff) | |
| parent | 374c0788c83a8384223dc75333422fc6d4a20b14 (diff) | |
Merge "Fix kernel parameter setting"
| -rw-r--r-- | build/build_perf_image.sh | 2 | ||||
| -rwxr-xr-x | build/overcloud-full.sh | 8 | ||||
| -rw-r--r-- | build/setkernelparam.sh | 27 |
3 files changed, 1 insertions, 36 deletions
diff --git a/build/build_perf_image.sh b/build/build_perf_image.sh index 0a3e3d0f..6ca9fbf8 100644 --- a/build/build_perf_image.sh +++ b/build/build_perf_image.sh @@ -32,7 +32,7 @@ fi if [ "$CATEGORY" == "kernel" ]; then LIBGUESTFS_BACKEND=direct virt-customize \ - --run-command "bash -x /root/setkernelparam.sh $KEY $VALUE" \ + --run-command "grubby --update-kernel=ALL --args=$KEY=$VALUE" \ -a $IMAGE fi diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index d0ee3f01..065201f8 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -29,13 +29,5 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "echo 'nf_conntrack_proto_sctp' > /etc/modules-load.d/nf_conntrack_proto_sctp.conf" \ -a overcloud-full_build.qcow2 -################################### -##### Add CPU pinning script ##### -################################### - -LIBGUESTFS_BACKEND=direct virt-customize \ - --upload ../setkernelparam.sh:/root \ - -a overcloud-full_build.qcow2 - mv -f overcloud-full_build.qcow2 overcloud-full.qcow2 popd > /dev/null diff --git a/build/setkernelparam.sh b/build/setkernelparam.sh deleted file mode 100644 index b6986d6c..00000000 --- a/build/setkernelparam.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -############################################################################## -# Copyright (c) 2016 Red Hat Inc. -# Michael Chapman <michapma@redhat.com> -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -GRUBCONF='/boot/grub2/grub.conf' - -if [ "$1" == "" ]; then - echo "No kernel parameter name provided, not modifying grub.conf" - exit 1 -fi - -if [ "$2" == "" ]; then - echo "No kernel parameter value provided, not modifying grub.conf" - exit 1 -fi - -echo "Setting $1=$2 in $GRUBCONF" -echo "GRUB_CMDLINE_LINUX=\"\$GRUB_CMDLINE_LINUX $1=$2\"" >> /etc/default/grub -grub2-mkconfig > $GRUBCONF -exit 0 |