mirror of
https://github.com/rancher/os.git
synced 2025-09-01 14:48:55 +00:00
previous¤t isolinux/syslinux cfg works for fresh install, and ... the iso only has the smaller os-installer image in it \o/
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
@@ -1,8 +1,6 @@
|
||||
timeout 10 #1s
|
||||
prompt 1
|
||||
TIMEOUT 20 #2s
|
||||
PROMPT 1
|
||||
|
||||
# doesn't work as a softlink?
|
||||
default rancheros-${KERNEL_VERSION}
|
||||
INCLUDE isolinux-current.cfg
|
||||
|
||||
#INCLUDE isolinux-previous.cfg
|
||||
# each INCLUDEd file has a `DEFAULT mylabel` in it, and the last one wins
|
||||
INCLUDE ../linux-previous.cfg
|
||||
INCLUDE ../linux-current.cfg
|
||||
|
@@ -1,8 +1,10 @@
|
||||
|
||||
# TODO: should add ros-version
|
||||
label rancheros-${KERNEL_VERSION}
|
||||
say Booting ... RancherOS ${VERSION} ${KERNEL_VERSION}
|
||||
kernel /boot/vmlinuz-${KERNEL_VERSION}
|
||||
initrd /boot/initrd
|
||||
#TODO,/boot/linuxmods-${KERNEL_VERSION}
|
||||
append quiet rancher.autologin=tty1 rancher.autologin=ttyS0
|
||||
# TODO: should add ros-version to label and initrd
|
||||
DEFAULT rancheros-${LABEL}
|
||||
LABEL rancheros-${LABEL}
|
||||
SAY rancheros-${LABEL}: RancherOS ${VERSION} ${KERNEL_VERSION}
|
||||
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}
|
||||
|
||||
|
@@ -27,8 +27,8 @@ cp ${ARTIFACTS}/vmlinuz-${KERNEL_VERSION} ${CD}/boot/
|
||||
#TODO cp ${ARTIFACTS}/linuxmods-${KERNEL_VERSION} ${CD}/boot/
|
||||
|
||||
cat scripts/isolinux.cfg | envsubst > ${CD}/boot/isolinux/isolinux.cfg
|
||||
cat scripts/isolinux_label.cfg | envsubst > ${CD}/boot/isolinux/isolinux-${KERNEL_VERSION}.cfg
|
||||
cp ${CD}/boot/isolinux/isolinux-${KERNEL_VERSION}.cfg ${CD}/boot/isolinux/isolinux-current.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
|
||||
|
||||
cp /usr/lib/ISOLINUX/isolinux.bin ${CD}/boot/isolinux/
|
||||
cp /usr/lib/syslinux/modules/bios/ldlinux.c32 ${CD}/boot/isolinux/
|
||||
|
Reference in New Issue
Block a user