rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-01 06:40:31 +00:00
Code Issues Releases Wiki Activity

Merge pull request #820 from imikushin/kexec-kernel-args

Browse Source 
Add --append to `ros os upgrade` to pass kernel args for --kexec
This commit is contained in:
Darren Shepherd
2016-04-04 13:41:11 -07:00
parent 5694f371d5 5a8d0e7f34
commit 07faa92c7f
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/installer/lay-down-os
View File

@@ -6,7 +6,7 @@ SCRIPTS_DIR=$(dirname ${0})
. "${SCRIPTS_DIR}/build.conf"
VERSION=${VERSION:?"VERSION not set"}
while getopts "i:f:c:d:t:r:o:p:k" OPTION
while getopts "i:f:c:d:t:r:o:p:k:a" OPTION
do
case ${OPTION} in
i) DIST="$OPTARG" ;;
@@ -17,6 +17,7 @@ do
p) PARTITION="$OPTARG" ;;
r) ROLLBACK_VERSION="$OPTARG" ;;
k) KEXEC=y ;;
a) APPEND="$OPTARG" ;;
t) ENV="$OPTARG" ;;
*) exit 1 ;;
esac
@@ -195,5 +196,8 @@ pvgrub_config "${KERNEL_ARGS}"
install_rancher
if [ "$KEXEC" = "y" ]; then
kexec -l ${DIST}/vmlinuz --initrd=${DIST}/initrd -f
if [ "$APPEND" = "" ]; then
APPEND=$(cat /proc/cmdline)
fi
kexec -l ${DIST}/vmlinuz --initrd=${DIST}/initrd --append="$APPEND" -f
fi