|
 |
775cb0 |
From 058afd893cef267ee5d88f331da5c64708378b8b Mon Sep 17 00:00:00 2001
|
|
|
775cb0 |
From: Peter Jones <pjones@redhat.com>
|
|
|
775cb0 |
Date: Tue, 11 Feb 2014 10:24:48 -0500
|
|
|
775cb0 |
Subject: [PATCH 06/16] Support "devicetree" directive in grub2.
|
|
|
775cb0 |
|
|
|
775cb0 |
Resolves: rhbz#1063534
|
|
|
775cb0 |
|
|
|
775cb0 |
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
|
775cb0 |
---
|
|
|
775cb0 |
new-kernel-pkg | 18 +++++++++++++++++-
|
|
|
775cb0 |
1 file changed, 17 insertions(+), 1 deletion(-)
|
|
|
775cb0 |
|
|
|
775cb0 |
diff --git a/new-kernel-pkg b/new-kernel-pkg
|
|
|
775cb0 |
index 7fec1fe..30477cc 100755
|
|
|
775cb0 |
--- a/new-kernel-pkg
|
|
|
775cb0 |
+++ b/new-kernel-pkg
|
|
|
775cb0 |
@@ -111,6 +111,7 @@ initrd=""
|
|
|
775cb0 |
dracut=""
|
|
|
775cb0 |
dracuthostonly=""
|
|
|
775cb0 |
initrdfile=""
|
|
|
775cb0 |
+devtreefile=""
|
|
|
775cb0 |
moddep=""
|
|
|
775cb0 |
verbose=""
|
|
|
775cb0 |
makedefault=""
|
|
|
775cb0 |
@@ -127,7 +128,7 @@ usage() {
|
|
|
775cb0 |
echo " [--banner=<banner>] [--multiboot=multiboot]" >&2
|
|
|
775cb0 |
echo " [--mbargs=mbargs] [--make-default] [--add-dracut-args]" >&2
|
|
|
775cb0 |
echo " [--add-plymouth-initrd]" >&2
|
|
|
775cb0 |
- echo " [--host-only]" >&2
|
|
|
775cb0 |
+ echo " [--host-only] [--devtree=<devicetree.dtb>]" >&2
|
|
|
775cb0 |
echo " <--install | --remove | --update | --rpmposttrans> <kernel-version>" >&2
|
|
|
775cb0 |
echo " (ex: `basename $0` --mkinitrd --depmod --install 2.4.7-2)" >&2
|
|
|
775cb0 |
exit 1
|
|
|
775cb0 |
@@ -151,6 +152,12 @@ install() {
|
|
|
775cb0 |
fi
|
|
|
775cb0 |
fi
|
|
|
775cb0 |
|
|
|
775cb0 |
+ DEVTREE=""
|
|
|
775cb0 |
+ if [ -f $devtreefile ]; then
|
|
|
775cb0 |
+ [ -n "$verbose" ] && echo "found $devtreefile and using it with grubby"
|
|
|
775cb0 |
+ DEVTREE="--devtree $devtreefile"
|
|
|
775cb0 |
+ fi
|
|
|
775cb0 |
+
|
|
|
775cb0 |
# FIXME: is this a good heuristic to find out if we're on iSeries?
|
|
|
775cb0 |
if [ -d /proc/iSeries ]; then
|
|
|
775cb0 |
[ -n "$verbose" ] && echo "On an iSeries, just making img file"
|
|
|
775cb0 |
@@ -537,6 +544,15 @@ while [ $# -gt 0 ]; do
|
|
|
775cb0 |
initrd="remove"
|
|
|
775cb0 |
;;
|
|
|
775cb0 |
|
|
|
775cb0 |
+ --devtree*)
|
|
|
775cb0 |
+ if [[ $1 == --devtree\=* ]]; then
|
|
|
775cb0 |
+ devtreefile=${1#--devtreefile=}
|
|
|
775cb0 |
+ else
|
|
|
775cb0 |
+ devtreefile=$2
|
|
|
775cb0 |
+ shift
|
|
|
775cb0 |
+ fi
|
|
|
775cb0 |
+ ;;
|
|
|
775cb0 |
+
|
|
|
775cb0 |
--dracut)
|
|
|
775cb0 |
dracut=--dracut
|
|
|
775cb0 |
;;
|
|
|
775cb0 |
--
|
|
|
775cb0 |
1.9.3
|
|
|
775cb0 |
|