rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-11 19:42:24 +00:00
Code Issues Releases Wiki Activity

Merge pull request #533 from imikushin/serial-console

Browse Source 
choose appropriate console for install type
This commit is contained in:
Ivan Mikushin 2015-08-27 16:43:24 +05:00
commit 35996641e8
1 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,10 +2,11 @@
set -e -x set -e -x
. $(dirname $0)/version . $(dirname $0)/version
VERSION=${VERSION:?"VERSION not set"}
while getopts "i:f:c:d:t:r:o:p:" OPTION while getopts "i:f:c:d:t:r:o:p:" OPTION
do do
case $OPTION in case ${OPTION} in
i) DIST="$OPTARG" ;; i) DIST="$OPTARG" ;;
f) FILES="$OPTARG" ;; f) FILES="$OPTARG" ;;
c) CLOUD_CONFIG="$OPTARG" ;; c) CLOUD_CONFIG="$OPTARG" ;;
@ -20,6 +21,7 @@ done
DIST=${DIST:-/dist} DIST=${DIST:-/dist}
CLOUD_CONFIG=${CLOUD_CONFIG:-/scripts/conf/empty.yml} CLOUD_CONFIG=${CLOUD_CONFIG:-/scripts/conf/empty.yml}
CONSOLE=tty0
BASE_DIR="/mnt/new_img" BASE_DIR="/mnt/new_img"
# TODO: Change this to a number so that users can specify. # TODO: Change this to a number so that users can specify.
# Will need to make it so that our builds and packer APIs remain consistent. # Will need to make it so that our builds and packer APIs remain consistent.
@ -56,7 +58,7 @@ mount_device()
mount_opts=${PARTITION} mount_opts=${PARTITION}
fi fi
mount $mount_opts ${BASE_DIR} mount ${mount_opts} ${BASE_DIR}
trap "umount ${BASE_DIR}" EXIT trap "umount ${BASE_DIR}" EXIT
} }
@ -72,25 +74,25 @@ install_grub() {
grub2_config(){ grub2_config(){
local grub_cfg=${BASE_DIR}/boot/grub/grub.cfg local grub_cfg=${BASE_DIR}/boot/grub/grub.cfg
local append_line="${1}" local append_line="${1}"
cat >$grub_cfg <<EOF cat >${grub_cfg} <<EOF
set default="0" set default="0"
set timeout="1" set timeout="1"
#set fallback=1 #set fallback=1
menuentry "RancherOS-current" { menuentry "RancherOS-current" {
set root=(hd0,msdos1) set root=(hd0,msdos1)
linux /boot/vmlinuz-${VERSION}-rancheros ${append_line} console=ttyS0 console=tty0 linux /boot/vmlinuz-${VERSION}-rancheros ${append_line} console=${CONSOLE}
initrd /boot/initrd-${VERSION}-rancheros initrd /boot/initrd-${VERSION}-rancheros
} }
EOF EOF
if [ ! -z $ROLLBACK_VERSION ]; then if [ ! -z ${ROLLBACK_VERSION} ]; then
sed -i 's/^#set/set/' ${grub_cfg} sed -i 's/^#set/set/' ${grub_cfg}
cat >>$grub_cfg <<EOF cat >>${grub_cfg} <<EOF
menuentry "RancherOS-rollback" { menuentry "RancherOS-rollback" {
set root=(hd0,msdos1) set root=(hd0,msdos1)
linux /boot/vmlinuz-${ROLLBACK_VERSION}-rancheros ${append_line} console=ttyS0 console=tty0 linux /boot/vmlinuz-${ROLLBACK_VERSION}-rancheros ${append_line} console=${CONSOLE}
initrd /boot/initrd-${ROLLBACK_VERSION}-rancheros initrd /boot/initrd-${ROLLBACK_VERSION}-rancheros
} }
EOF EOF
@ -100,15 +102,15 @@ fi
install_rancher() install_rancher()
{ {
cp ${DIST}/initrd /mnt/new_img/boot/initrd-${VERSION}-rancheros cp ${DIST}/initrd ${BASE_DIR}/boot/initrd-${VERSION}-rancheros
cp ${DIST}/vmlinuz /mnt/new_img/boot/vmlinuz-${VERSION}-rancheros cp ${DIST}/vmlinuz ${BASE_DIR}/boot/vmlinuz-${VERSION}-rancheros
} }
pvgrub_config() pvgrub_config()
{ {
local grub_file=/mnt/new_img/boot/grub/menu.lst local grub_file=${BASE_DIR}/boot/grub/menu.lst
local append_line="${1}" local append_line="${1}"
cat > $grub_file<<EOF cat > ${grub_file}<<EOF
default 0 default 0
timeout 0 timeout 0
#fallback 1 #fallback 1
@ -117,17 +119,17 @@ hiddenmenu
title RancherOS ${VERSION}-(current) title RancherOS ${VERSION}-(current)
root (hd0) root (hd0)
kernel /boot/vmlinuz-${VERSION}-rancheros ${append_line} console=ttyS0 console=tty0 kernel /boot/vmlinuz-${VERSION}-rancheros ${append_line} console=${CONSOLE}
initrd /boot/initrd-${VERSION}-rancheros initrd /boot/initrd-${VERSION}-rancheros
EOF EOF
if [ ! -z $ROLLBACK_VERSION ]; then if [ ! -z ${ROLLBACK_VERSION} ]; then
sed -i 's/^#\(fallback\)/\1/' $grub_file sed -i 's/^#\(fallback\)/\1/' ${grub_file}
cat >> $grub_file<<EOF cat >> ${grub_file}<<EOF
title RancherOS ${ROLLBACK_VERSION}-(rollback) title RancherOS ${ROLLBACK_VERSION}-(rollback)
root (hd0) root (hd0)
kernel /boot/vmlinuz-${ROLLBACK_VERSION}-rancheros ${append_line} console=ttyS0 console=tty0 kernel /boot/vmlinuz-${ROLLBACK_VERSION}-rancheros ${append_line} console=${CONSOLE}
initrd /boot/initrd-${ROLLBACK_VERSION}-rancheros initrd /boot/initrd-${ROLLBACK_VERSION}-rancheros
EOF EOF
fi fi
@ -146,22 +148,25 @@ if [ -n ${ENV} ]; then
"generic") "generic")
format_and_mount format_and_mount
install_grub install_grub
/scripts/seed-data $BASE_DIR $CLOUD_CONFIG $FILES /scripts/seed-data ${BASE_DIR} ${CLOUD_CONFIG} ${FILES}
;; ;;
"amazon-ebs-pv"|"amazon-ebs-hvm") "amazon-ebs-pv"|"amazon-ebs-hvm")
CONSOLE=ttyS0
format_and_mount format_and_mount
if [ "${ENV}" == "amazon-ebs-hvm" ]; then if [ "${ENV}" == "amazon-ebs-hvm" ]; then
install_grub install_grub
fi fi
# AWS Networking recommends disabling. # AWS Networking recommends disabling.
/scripts/seed-data $BASE_DIR $CLOUD_CONFIG $FILES /scripts/seed-data ${BASE_DIR} ${CLOUD_CONFIG} ${FILES}
;; ;;
"googlecompute") "googlecompute")
CONSOLE=ttyS0
format_and_mount format_and_mount
install_grub install_grub
/scripts/seed-data $BASE_DIR $CLOUD_CONFIG $FILES /scripts/seed-data ${BASE_DIR} ${CLOUD_CONFIG} ${FILES}
;; ;;
"bootstrap") "bootstrap")
CONSOLE=ttyS0
mount_device true mount_device true
create_boot_dirs create_boot_dirs
KERNEL_ARGS="${KERNEL_ARGS} rancher.cloud_init.datasources=[ec2,gce]" KERNEL_ARGS="${KERNEL_ARGS} rancher.cloud_init.datasources=[ec2,gce]"