Skip to content

M
mkimage-profiles
You need to sign in or sign up before continuing.
Commit 5fd76345 authored by Anton Midyukov's avatar Anton Midyukov
Browse files
Options

grub, syslinux: initrd setup arguments support

parent 27e167b2
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 22 deletions
features.in/grub/cfg.in/20install2.cfg
View file @ 5fd76345
...@@ -3,7 +3,7 @@ default='linux' ...@@ -3,7 +3,7 @@ default='linux'
menuentry $"Install "'@distro@' --hotkey 'i' --id 'linux' { menuentry $"Install "'@distro@' --hotkey 'i' --id 'linux' {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux$linux_suffix /boot/vmlinuz$KFLAVOUR changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ vga=@bootvga@ @bootargs@ $EFI_BOOTARGS lang=$lang linux$linux_suffix /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ vga=@bootvga@ @bootargs@ $EFI_BOOTARGS lang=$lang
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
features.in/grub/cfg.in/25install-vnc-connect.cfg
View file @ 5fd76345
menuentry $"VNC install "'@distro@'$" (edit to set server IP address)" --id 'vncconnect' { menuentry $"VNC install "'@distro@'$" (edit to set server IP address)" --id 'vncconnect' {
linux$linux_suffix /boot/vmlinuz$KFLAVOUR changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ showopts @bootargs@ $EFI_BOOTARGS headless no_alt_virt_keyboard vncconnect=IP lang=$lang linux$linux_suffix /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ showopts @bootargs@ $EFI_BOOTARGS headless no_alt_virt_keyboard vncconnect=IP lang=$lang
initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
features.in/grub/cfg.in/25install-vnc-listen.cfg
View file @ 5fd76345
menuentry $"VNC install "'@distro@'$" (edit to set password and connect here)" --id 'vncpasswd' { menuentry $"VNC install "'@distro@'$" (edit to set password and connect here)" --id 'vncpasswd' {
linux$linux_suffix /boot/vmlinuz$KFLAVOUR changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ showopts @bootargs@ $EFI_BOOTARGS headless no_alt_virt_keyboard vncpassword=VNCPWD lang=$lang linux$linux_suffix /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ showopts @bootargs@ $EFI_BOOTARGS headless no_alt_virt_keyboard vncpassword=VNCPWD lang=$lang
initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
features.in/grub/cfg.in/30live.cfg
View file @ 5fd76345
menuentry $"LiveCD (no hard disk needed)" --id 'live' { menuentry $"LiveCD (no hard disk needed)" --id 'live' {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux$linux_suffix /boot/vmlinuz$KFLAVOUR changedisk fastboot live automatic=method:cdrom ramdisk_size=@live_size@ stagename=live showopts lowmem vga=@bootvga@ @bootargs@ $EFI_BOOTARGS lang=$lang linux$linux_suffix /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live ramdisk_size=@live_size@ showopts lowmem vga=@bootvga@ @bootargs@ $EFI_BOOTARGS lang=$lang
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
......
features.in/grub/cfg.in/32live_rw.cfg
View file @ 5fd76345
menuentry $"LiveCD with sessions support" --id 'session' { menuentry $"LiveCD with sessions support" --id 'session' {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux$linux_suffix /boot/vmlinuz$KFLAVOUR changedisk fastboot live automatic=method:cdrom ramdisk_size=@live_size@ stagename=live showopts live_rw vga=@bootvga@ @bootargs@ $EFI_BOOTARGS lang=$lang linux$linux_suffix /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live ramdisk_size=@live_size@ showopts live_rw vga=@bootvga@ @bootargs@ $EFI_BOOTARGS lang=$lang
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
features.in/grub/cfg.in/80rescue.cfg
View file @ 5fd76345
menuentry $"Rescue LiveCD" --id 'rescue' { menuentry $"Rescue LiveCD" --id 'rescue' {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux$linux_suffix /boot/vmlinuz$KFLAVOUR changedisk fastboot live automatic=method:cdrom ramdisk_size=@rescue_size@ stagename=rescue splash=0 showopts @rescue_bootargs@ $EFI_BOOTARGS linux$linux_suffix /boot/vmlinuz$KFLAVOUR changedisk fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ splash=0 showopts @rescue_bootargs@ $EFI_BOOTARGS
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
features.in/grub/cfg.in/82rescue_rw.cfg
View file @ 5fd76345
menuentry $"Rescue with sessions support" --id 'rescue_session' { menuentry $"Rescue with sessions support" --id 'rescue_session' {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux$linux_suffix /boot/vmlinuz$KFLAVOUR changedisk fastboot live automatic=method:cdrom,label:ALT* ramdisk_size=@rescue_size@ stagename=rescue splash=0 showopts @rescue_bootargs@ $EFI_BOOTARGS live_rw linux$linux_suffix /boot/vmlinuz$KFLAVOUR changedisk fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ splash=0 showopts @rescue_bootargs@ $EFI_BOOTARGS live_rw
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
features.in/grub/cfg.in/83rescue_fm.cfg
View file @ 5fd76345
menuentry $"Forensic mode (leave disks alone)" --id 'rescue_forensic' { menuentry $"Forensic mode (leave disks alone)" --id 'rescue_forensic' {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux$linux_suffix /boot/vmlinuz changedisk fastboot live automatic=method:cdrom ramdisk_size=@rescue_size@ splash=0 showopts stagename=rescue @rescue_bootargs@ $EFI_BOOTARGS max_loop=16 forensic hash=@rescue_hash@ linux$linux_suffix /boot/vmlinuz fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ splash=0 showopts @rescue_bootargs@ $EFI_BOOTARGS max_loop=16 forensic hash=@rescue_hash@
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd$linux_suffix /boot/full.cz initrd$linux_suffix /boot/full.cz
} }
features.in/grub/cfg.in/84rescue_remote.cfg
View file @ 5fd76345
menuentry $"Rescue with remote SSH access (DHCP)" --id 'rescue_remote' { menuentry $"Rescue with remote SSH access (DHCP)" --id 'rescue_remote' {
linux$linux_suffix /boot/vmlinuz$KFLAVOUR changedisk fastboot live automatic=method:cdrom ramdisk_size=@rescue_size@ splash=0 showopts stagename=rescue @rescue_bootargs@ $EFI_BOOTARGS max_loop=16 ip=dhcp port=22 rootpw=AUTO hash=@rescue_hash@ linux$linux_suffix /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ splash=0 showopts @rescue_bootargs@ $EFI_BOOTARGS max_loop=16 ip=dhcp port=22 rootpw=AUTO hash=@rescue_hash@
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
features.in/grub/cfg.in/85mediacheck.cfg
View file @ 5fd76345
menuentry $"Check this media for defects" --id 'mediachk' { menuentry $"Check this media for defects" --id 'mediachk' {
linux$linux_suffix /boot/vmlinuz changedisk live quiet lowmem automatic=method:cdrom mediacheck=1 stagename=mediacheck showopts @bootargs@ $EFI_BOOTARGS linux$linux_suffix /boot/vmlinuz live @initrd_bootargs@ @stagename@=mediacheck quiet lowmem mediacheck=1 showopts @bootargs@ $EFI_BOOTARGS
initrd$linux_suffix /boot/full.cz initrd$linux_suffix /boot/full.cz
} }
features.in/grub/generate.mk
View file @ 5fd76345
...@@ -31,6 +31,11 @@ ifneq ($(words $(KFLAVOURS)),1) ...@@ -31,6 +31,11 @@ ifneq ($(words $(KFLAVOURS)),1)
GRUB_CFG := $(GRUB_CFG) kernel GRUB_CFG := $(GRUB_CFG) kernel
endif endif
ifeq (initrd-propagator,$(STAGE1_INITRD))
STAGE1_INITRD_BOOTARGS := changedisk automatic=method:cdrom
STAGE1_INITRD_STAGE2_OPTION := stagename
endif
DSTDIR := $(BUILDDIR)/stage1/files/boot/grub/.in DSTDIR := $(BUILDDIR)/stage1/files/boot/grub/.in
DSTCFGS := $(DSTDIR)/*.cfg DSTCFGS := $(DSTDIR)/*.cfg
...@@ -109,6 +114,8 @@ bootargs: clean ...@@ -109,6 +114,8 @@ bootargs: clean
sed -i "s,@initrd@,initrd," $(DSTCFGS); \ sed -i "s,@initrd@,initrd," $(DSTCFGS); \
sed -i "s,@initrd_ext@,img," $(DSTCFGS); \ sed -i "s,@initrd_ext@,img," $(DSTCFGS); \
fi fi
@sed -i "s|@initrd_bootargs@|$(STAGE1_INITRD_BOOTARGS)|g" $(DSTCFGS)
@sed -i "s,@stagename@,$(STAGE1_INITRD_STAGE2_OPTION),g" $(DSTCFGS)
clean: copy clean: copy
@if [ "$(GRUB_UI)" = gfxboot ]; then \ @if [ "$(GRUB_UI)" = gfxboot ]; then \
......
features.in/syslinux/cfg.in/20install2.cfg
View file @ 5fd76345
...@@ -3,5 +3,5 @@ default linux ...@@ -3,5 +3,5 @@ default linux
label linux label linux
menu label ^Install @relname@ menu label ^Install @relname@
kernel /boot/vmlinuz kernel /boot/vmlinuz
append initrd=/boot/@initrd@ changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ showopts vga=@bootvga@ @bootargs@ append initrd=/boot/@initrd@ fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ showopts vga=@bootvga@ @bootargs@
features.in/syslinux/cfg.in/25grub-install-vnc-connect.cfg
View file @ 5fd76345
label vncconnect label vncconnect
menu label VNC client (edit to set server IP address) menu label VNC client (edit to set server IP address)
kernel /boot/vmlinuz kernel /boot/vmlinuz
append initrd=/boot/@initrd@ changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ showopts @bootargs@ headless no_alt_virt_keyboard vncconnect=IP append initrd=/boot/@initrd@ fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ showopts @bootargs@ headless no_alt_virt_keyboard vncconnect=IP
features.in/syslinux/cfg.in/25grub-install-vnc-listen.cfg
View file @ 5fd76345
label vncpasswd label vncpasswd
menu label Install @relname@ (headless with DHCP+VNC) (password VNCPWD) menu label Install @relname@ (headless with DHCP+VNC) (password VNCPWD)
kernel /boot/vmlinuz kernel /boot/vmlinuz
append initrd=/boot/@initrd@ changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ showopts @bootargs@ headless no_alt_virt_keyboard vncpassword=VNCPWD append initrd=/boot/@initrd@ fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ showopts @bootargs@ headless no_alt_virt_keyboard vncpassword=VNCPWD
features.in/syslinux/cfg.in/25install-vnc-connect.cfg
View file @ 5fd76345
label vncconnect label vncconnect
menu label ^VNC install (edit to set server IP address) menu label ^VNC install (edit to set server IP address)
kernel /boot/vmlinuz kernel /boot/vmlinuz
append initrd=/boot/@initrd@ changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ showopts @bootargs@ headless no_alt_virt_keyboard vncconnect=IP append initrd=/boot/@initrd@ fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ showopts @bootargs@ headless no_alt_virt_keyboard vncconnect=IP
features.in/syslinux/cfg.in/25install-vnc-listen.cfg
View file @ 5fd76345
label vncpasswd label vncpasswd
menu label VNC install (<Tab>, set pass^word and connect here) menu label VNC install (<Tab>, set pass^word and connect here)
kernel /boot/vmlinuz kernel /boot/vmlinuz
append initrd=/boot/@initrd@ changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ showopts @bootargs@ headless no_alt_virt_keyboard vncpassword=VNCPWD append initrd=/boot/@initrd@ fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ showopts @bootargs@ headless no_alt_virt_keyboard vncpassword=VNCPWD
features.in/syslinux/cfg.in/30live.cfg
View file @ 5fd76345
label live label live
menu label ^LiveCD (no hard disk needed) menu label ^LiveCD (no hard disk needed)
kernel /boot/vmlinuz kernel /boot/vmlinuz
append initrd=/boot/@initrd@ fastboot live automatic=method:cdrom ramdisk_size=@live_size@ stagename=live showopts lowmem vga=@bootvga@ @bootargs@ append initrd=/boot/@initrd@ fastboot live @initrd_bootargs@ @stagename@=live ramdisk_size=@live_size@ showopts lowmem vga=@bootvga@ @bootargs@
features.in/syslinux/cfg.in/32live_rw.cfg
View file @ 5fd76345
label session label session
menu label LiveCD with ^sessions support menu label LiveCD with ^sessions support
kernel /boot/vmlinuz kernel /boot/vmlinuz
append initrd=/boot/@initrd@ fastboot live automatic=method:cdrom ramdisk_size=@live_size@ stagename=live showopts live_rw vga=@bootvga@ @bootargs@ append initrd=/boot/@initrd@ fastboot live @initrd_bootargs@ @stagename@=live ramdisk_size=@live_size@ showopts live_rw vga=@bootvga@ @bootargs@
features.in/syslinux/cfg.in/80rescue.cfg
View file @ 5fd76345
label rescue label rescue
menu label ^Rescue LiveCD menu label ^Rescue LiveCD
kernel /boot/vmlinuz kernel /boot/vmlinuz
append initrd=/boot/@initrd@ fastboot live automatic=method:cdrom ramdisk_size=@rescue_size@ stagename=rescue splash=0 showopts @rescue_bootargs@ append initrd=/boot/@initrd@ fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ splash=0 showopts @rescue_bootargs@
features.in/syslinux/cfg.in/82rescue_rw.cfg
View file @ 5fd76345
label rescue_session label rescue_session
menu label Rescue with sess^ions support menu label Rescue with sess^ions support
kernel /boot/vmlinuz kernel /boot/vmlinuz
append initrd=/boot/@initrd@ fastboot live automatic=method:cdrom,label:ALT* ramdisk_size=@rescue_size@ stagename=rescue splash=0 showopts @rescue_bootargs@ live_rw append initrd=/boot/@initrd@ fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ splash=0 showopts @rescue_bootargs@ live_rw
features.in/syslinux/cfg.in/83rescue_fm.cfg
View file @ 5fd76345
label rescue_forensic label rescue_forensic
menu label ^Forensic mode (leave disks alone) menu label ^Forensic mode (leave disks alone)
kernel /boot/vmlinuz kernel /boot/vmlinuz
append initrd=/boot/@initrd@ fastboot live automatic=method:cdrom ramdisk_size=@rescue_size@ splash=0 showopts stagename=rescue @rescue_bootargs@ max_loop=16 forensic hash=@rescue_hash@ append initrd=/boot/@initrd@ fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ splash=0 showopts @rescue_bootargs@ max_loop=16 forensic hash=@rescue_hash@
features.in/syslinux/cfg.in/84rescue_remote.cfg
View file @ 5fd76345
label rescue_remote label rescue_remote
menu label Rescue with remote SSH ^access (DHCP) menu label Rescue with remote SSH ^access (DHCP)
kernel /boot/vmlinuz kernel /boot/vmlinuz
append initrd=/boot/@initrd@ fastboot live automatic=method:cdrom ramdisk_size=@rescue_size@ stagename=rescue splash=0 showopts @rescue_bootargs@ quiet ip=dhcp port=22 rootpw=AUTO append initrd=/boot/@initrd@ fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ splash=0 showopts @rescue_bootargs@ quiet ip=dhcp port=22 rootpw=AUTO
features.in/syslinux/generate.mk
View file @ 5fd76345
...@@ -31,6 +31,11 @@ endif ...@@ -31,6 +31,11 @@ endif
DSTDIR := $(BUILDDIR)/stage1/files/syslinux/.in DSTDIR := $(BUILDDIR)/stage1/files/syslinux/.in
DSTCFGS := $(DSTDIR)/*.cfg DSTCFGS := $(DSTDIR)/*.cfg
ifeq (initrd-propagator,$(STAGE1_INITRD))
STAGE1_INITRD_BOOTARGS := changedisk automatic=method:cdrom
STAGE1_INITRD_STAGE2_OPTION := stagename
endif
# we can do SYSLINUX_{CFG,MODULES,FILES} # we can do SYSLINUX_{CFG,MODULES,FILES}
# CFG have only cfg snippet # CFG have only cfg snippet
# FILES have only filenames (absolute or relative to /usr/lib/syslinux/) # FILES have only filenames (absolute or relative to /usr/lib/syslinux/)
...@@ -95,6 +100,8 @@ bootargs: clean ...@@ -95,6 +100,8 @@ bootargs: clean
else \ else \
sed -i "s,@initrd@,initrd.img," $(DSTCFGS); \ sed -i "s,@initrd@,initrd.img," $(DSTCFGS); \
fi fi
@sed -i "s|@initrd_bootargs@|$(STAGE1_INITRD_BOOTARGS)|g" $(DSTCFGS)
@sed -i "s,@stagename@,$(STAGE1_INITRD_STAGE2_OPTION),g" $(DSTCFGS)
clean: copy clean: copy
@if [ "$(SYSLINUX_UI)" = gfxboot ]; then \ @if [ "$(SYSLINUX_UI)" = gfxboot ]; then \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment