rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-06-22 04:57:04 +00:00
Code Issues Releases Wiki Activity

choose appropriate console for install type

Browse Source 
tty0 or ttyS0
This commit is contained in:
Ivan Mikushin 2015-08-25 17:01:13 +05:00
parent a60eb06307
commit c62ca5f891
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,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.
@ -80,7 +81,7 @@ default ros
label ros label ros
kernel /boot/vmlinuz-${VERSION}-rancheros kernel /boot/vmlinuz-${VERSION}-rancheros
initrd /boot/initrd-${VERSION}-rancheros initrd /boot/initrd-${VERSION}-rancheros
append ${append_line} console=ttyS0 console=tty0 append ${append_line} console=${CONSOLE}
EOF EOF
@ -90,7 +91,7 @@ cat >>${extlinux_conf} <<EOF
label ros-fallback label ros-fallback
kernel /boot/vmlinuz-${ROLLBACK_VERSION}-rancheros kernel /boot/vmlinuz-${ROLLBACK_VERSION}-rancheros
initrd /boot/initrd-${ROLLBACK_VERSION}-rancheros initrd /boot/initrd-${ROLLBACK_VERSION}-rancheros
append ${append_line} console=ttyS0 console=tty0 append ${append_line} console=${CONSOLE}
EOF EOF
fi fi
@ -116,7 +117,7 @@ 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
@ -126,7 +127,7 @@ if [ ! -z ${ROLLBACK_VERSION} ]; then
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
@ -148,6 +149,7 @@ if [ -n ${ENV} ]; then
/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_extlinux install_extlinux
@ -156,11 +158,13 @@ if [ -n ${ENV} ]; then
/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_extlinux install_extlinux
/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]"