rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-25 04:37:02 +00:00
Code Issues Releases Wiki Activity

Use OS_AUTOFORMAT instead of VMWARE_AUTOFORMAT

Browse Source
This commit is contained in:
niusmallnan
2019-01-21 09:56:40 +08:00
committed by niusmallnan
parent e1782ad081
commit ab7abbf132
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/package-installer
View File

@@ -20,13 +20,14 @@ popd
DIST=$(pwd)/dist
echo "mkdir -p ${DIST}/boot/isolinux/"
mkdir -p ${DIST}/boot/isolinux/
cat scripts/isolinux.cfg | envsubst > ${DIST}/boot/isolinux/isolinux.cfg
cat scripts/isolinux_label.cfg | LABEL=${VERSION} envsubst > ${DIST}/boot/linux-current.cfg
#cat scripts/isolinux_label.cfg | LABEL=debug APPEND="rancher.debug=true" envsubst > ${DIST}/boot/linux-previous.cfg
if [ "$VMWARE_AUTOFORMAT" = 1 ] && [ -e ".make-vmware" ];then
cat scripts/global-vmware.cfg | LABEL=${VERSION} envsubst > ${DIST}/boot/global.cfg
cat scripts/isolinux.cfg | envsubst > ${DIST}/boot/isolinux/isolinux.cfg
cat scripts/isolinux_label.cfg | LABEL=${VERSION} envsubst > ${DIST}/boot/linux-current.cfg
#cat scripts/isolinux_label.cfg | LABEL=debug APPEND="rancher.debug=true" envsubst > ${DIST}/boot/linux-previous.cfg
if [ "$OS_AUTOFORMAT" = "true" ]; then
APPEND_AUTOFORMAT="rancher.state.autoformat=[/dev/sda,/dev/vda] rancher.state.dev=LABEL=RANCHER_STATE rancher.state.wait=true"
cat scripts/global.cfg | APPEND="$APPEND_AUTOFORMAT" envsubst > ${DIST}/boot/global.cfg
else
cat scripts/global.cfg | LABEL=${VERSION} envsubst > ${DIST}/boot/global.cfg
cat scripts/global.cfg | envsubst > ${DIST}/boot/global.cfg
fi
cp scripts/rancher.png ${DIST}/boot/