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

Merge pull request #663 from robbertkl/master

Browse Source 
Avoid hardcoded reference to /scripts
This commit is contained in:
Ivan Mikushin 2015-12-11 18:40:21 +05:00
commit 6698e4f46e
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,9 @@
#!/bin/bash #!/bin/bash
set -e -x set -e -x
. $(dirname $0)/build.conf SCRIPTS_DIR=$(dirname ${0})
. "${SCRIPTS_DIR}/build.conf"
VERSION=${VERSION:?"VERSION not set"} 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
@ -20,7 +22,7 @@ do
done done
DIST=${DIST:-/dist} DIST=${DIST:-/dist}
CLOUD_CONFIG=${CLOUD_CONFIG:-/scripts/conf/empty.yml} CLOUD_CONFIG=${CLOUD_CONFIG:-"${SCRIPTS_DIR}/conf/empty.yml"}
CONSOLE=tty0 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.
@ -148,7 +150,7 @@ 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_DIR}/seed-data" ${BASE_DIR} ${CLOUD_CONFIG} ${FILES}
;; ;;
"amazon-ebs-pv"|"amazon-ebs-hvm") "amazon-ebs-pv"|"amazon-ebs-hvm")
CONSOLE=ttyS0 CONSOLE=ttyS0
@ -157,13 +159,13 @@ if [ -n ${ENV} ]; then
install_grub install_grub
fi fi
# AWS Networking recommends disabling. # AWS Networking recommends disabling.
/scripts/seed-data ${BASE_DIR} ${CLOUD_CONFIG} ${FILES} "${SCRIPTS_DIR}/seed-data" ${BASE_DIR} ${CLOUD_CONFIG} ${FILES}
;; ;;
"googlecompute") "googlecompute")
CONSOLE=ttyS0 CONSOLE=ttyS0
format_and_mount format_and_mount
install_grub install_grub
/scripts/seed-data ${BASE_DIR} ${CLOUD_CONFIG} ${FILES} "${SCRIPTS_DIR}/seed-data" ${BASE_DIR} ${CLOUD_CONFIG} ${FILES}
;; ;;
"bootstrap") "bootstrap")
CONSOLE=ttyS0 CONSOLE=ttyS0

4
scripts/installer/seed-data
View File

@ -2,6 +2,8 @@
set -e -x set -e -x
SCRIPTS_DIR=$(dirname ${0})
BASE_DIR=${1} BASE_DIR=${1}
CLOUD_DATA=${2} CLOUD_DATA=${2}
IFS=',' read -ra FILES <<< "${3}" IFS=',' read -ra FILES <<< "${3}"
@ -12,7 +14,7 @@ if [ -z ${BASE_DIR} ]; then
fi fi
mkdir -p ${BASE_DIR}/var/lib/rancher/conf/cloud-config.d mkdir -p ${BASE_DIR}/var/lib/rancher/conf/cloud-config.d
if [ "$CLOUD_DATA" != "/scripts/conf/empty.yml" ]; then if [ "${CLOUD_DATA}" != "${SCRIPTS_DIR}/conf/empty.yml" ]; then
cp ${CLOUD_DATA} ${BASE_DIR}/var/lib/rancher/conf/cloud-config.d/ cp ${CLOUD_DATA} ${BASE_DIR}/var/lib/rancher/conf/cloud-config.d/
fi fi