rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-24 20:09:21 +00:00
Code Issues Releases Wiki Activity

make ros install --append work

Browse Source 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
Sven Dowideit
2016-12-07 20:55:38 +10:00
parent 85bdaa6145
commit 1a0e818328
5 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/isolinux.cfg
View File

@@ -1,6 +1,9 @@
TIMEOUT 20 #2s
PROMPT 1
# doesn't appear to work here?
INCLUDE ../global.cfg
# each INCLUDEd file has a `DEFAULT mylabel` in it, and the last one wins
INCLUDE ../linux-previous.cfg
INCLUDE ../linux-current.cfg

3
scripts/isolinux_label.cfg
View File

@@ -6,5 +6,6 @@ LABEL rancheros-${LABEL}
KERNEL /boot/vmlinuz-${KERNEL_VERSION}
INITRD /boot/initrd
#TODO - once we work out how to append it for qemu-dev,/boot/linuxmods-${KERNEL_VERSION}
APPEND quiet rancher.autologin=tty1 rancher.autologin=ttyS0 ${APPEND}
#APPEND quiet rancher.autologin=tty1 rancher.autologin=ttyS0 ${APPEND}
#INCLUDE global.cfg

3
scripts/package-iso
View File

@@ -28,7 +28,8 @@ cp ${ARTIFACTS}/vmlinuz-${KERNEL_VERSION} ${CD}/boot/
cat scripts/isolinux.cfg | envsubst > ${CD}/boot/isolinux/isolinux.cfg
cat scripts/isolinux_label.cfg | LABEL=${VERSION} envsubst > ${CD}/boot/linux-current.cfg
cat scripts/isolinux_label.cfg | LABEL=debug APPEND="rancher.debug=true" envsubst > ${CD}/boot/linux-previous.cfg
#cat scripts/isolinux_label.cfg | LABEL=debug APPEND="rancher.debug=true" envsubst > ${CD}/boot/linux-previous.cfg
cat scripts/global.cfg | LABEL=${VERSION} envsubst > ${CD}/boot/global.cfg
cp /usr/lib/ISOLINUX/isolinux.bin ${CD}/boot/isolinux/
cp /usr/lib/syslinux/modules/bios/ldlinux.c32 ${CD}/boot/isolinux/