Skip to content

M
mkimage-profiles
Commit c21c58d2 authored by Anton Midyukov's avatar Anton Midyukov
Browse files
Options

Drop EFI_BOOTARGS variable

This variable was need for rEFInd (it no longer support). The variable was added to grub menu, but was not in needed. In server V, this has remained since rEFInd.
parent bb124c4f
Show whitespace changes
Inline Side-by-side
Showing with 42 additions and 51 deletions
conf.d/server-v.mk
View file @ c21c58d2
...@@ -76,7 +76,6 @@ distro/.server-v-base: distro/.base distro/.installer \ ...@@ -76,7 +76,6 @@ distro/.server-v-base: distro/.base distro/.installer \
use/stage2/kms \ use/stage2/kms \
use/server/virt use/docs/license use/docs/manual use/server/virt use/docs/license use/docs/manual
@$(call add,BASE_LISTS,server-base openssh) @$(call add,BASE_LISTS,server-base openssh)
@$(call add,EFI_BOOTARGS,lang=ru_RU)
ifeq (,$(filter-out i586 x86_64,$(ARCH))) ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@$(call set,BOOTLOADER,grubpcboot) @$(call set,BOOTLOADER,grubpcboot)
endif endif
......
features.in/efi/config.mk
View file @ c21c58d2
...@@ -14,7 +14,6 @@ use/efi: ...@@ -14,7 +14,6 @@ use/efi:
ifeq (distro,$(IMAGE_CLASS)) ifeq (distro,$(IMAGE_CLASS))
@$(call add,INSTALL2_PACKAGES,dosfstools fatresize) @$(call add,INSTALL2_PACKAGES,dosfstools fatresize)
@$(call add,STAGE1_KCONFIG,EFI EFI_PARTITION EFIVAR_FS) @$(call add,STAGE1_KCONFIG,EFI EFI_PARTITION EFIVAR_FS)
@$(call add,EFI_BOOTARGS,$$(STAGE2_BOOTARGS))
ifeq (x86_64,$(ARCH)) ifeq (x86_64,$(ARCH))
@$(call add,THE_PACKAGES,$$(EFI_SHELL)) @$(call add,THE_PACKAGES,$$(EFI_SHELL))
endif endif
......
features.in/grub/README
View file @ c21c58d2
...@@ -19,8 +19,6 @@ ...@@ -19,8 +19,6 @@
* BOOTARGS -- дополнительные аргументы загрузчику; * BOOTARGS -- дополнительные аргументы загрузчику;
* EFI_BOOTARGS -- дополнительные аргументы загрузчику;
* BOOTLOADER -- isolinux (реализовано с оглядкой на grub/grub4); * BOOTLOADER -- isolinux (реализовано с оглядкой на grub/grub4);
* BOOTVGA -- видеорежим, запрашиваемый у ядра (параметр vga=); * BOOTVGA -- видеорежим, запрашиваемый у ядра (параметр vga=);
......
features.in/grub/cfg.in/00defaults.cfg
View file @ c21c58d2
...@@ -12,7 +12,6 @@ insmod minicmd ...@@ -12,7 +12,6 @@ insmod minicmd
insmod normal insmod normal
insmod test insmod test
set timeout=@timeout@ set timeout=@timeout@
if [ "$grub_platform" = "efi" ]; then set EFI_BOOTARGS='@efi_bootargs@'; fi
if [ ! "$lang" ]; then lang=@LOCALE@; fi if [ ! "$lang" ]; then lang=@LOCALE@; fi
if [ -s $pfxfat/grubenv ]; then if [ -s $pfxfat/grubenv ]; then
load_env --file $pfxfat/grubenv load_env --file $pfxfat/grubenv
......
features.in/grub/cfg.in/20install2.cfg
View file @ c21c58d2
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 /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ vga=@bootvga@ @bootargs@ $EFI_BOOTARGS lang=$lang lowmem linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ vga=@bootvga@ @bootargs@ lang=$lang lowmem
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
features.in/grub/cfg.in/21live-install.cfg
View file @ c21c58d2
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
menuentry $"Install "'@distro@' --hotkey 'i' --id 'linux' { menuentry $"Install "'@distro@' --hotkey 'i' --id 'linux' {
savedefault savedefault
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live init=/usr/sbin/install2-init ramdisk_size=@live_size@ lowmem vga=@bootvga@ @bootargs@ $EFI_BOOTARGS lang=$lang linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live init=/usr/sbin/install2-init ramdisk_size=@live_size@ lowmem vga=@bootvga@ @bootargs@ lang=$lang
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
features.in/grub/cfg.in/25install-vnc-connect.cfg
View file @ c21c58d2
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
menuentry $"VNC install "'@distro@'$" (edit to set server IP address)" --id 'vncconnect' { menuentry $"VNC install "'@distro@'$" (edit to set server IP address)" --id 'vncconnect' {
savedefault savedefault
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ nosplash @bootargs@ $EFI_BOOTARGS headless no_alt_virt_keyboard vncconnect=IP lang=$lang linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ nosplash @bootargs@ headless no_alt_virt_keyboard vncconnect=IP lang=$lang
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
features.in/grub/cfg.in/25install-vnc-listen.cfg
View file @ c21c58d2
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
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' {
savedefault savedefault
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ nosplash @bootargs@ $EFI_BOOTARGS headless no_alt_virt_keyboard vncpassword=VNCPWD lang=$lang linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ nosplash @bootargs@ headless no_alt_virt_keyboard vncpassword=VNCPWD lang=$lang
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
......
features.in/grub/cfg.in/26live-install-vnc-connect.cfg
View file @ c21c58d2
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
menuentry $"VNC install "'@distro@'$" (edit to set server IP address)" --id 'vncconnect' { menuentry $"VNC install "'@distro@'$" (edit to set server IP address)" --id 'vncconnect' {
savedefault savedefault
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=live init=/usr/sbin/install2-init ramdisk_size=@live_size@ nosplash lowmem @bootargs@ $EFI_BOOTARGS headless no_alt_virt_keyboard vncconnect=IP lang=$lang linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=live init=/usr/sbin/install2-init ramdisk_size=@live_size@ nosplash lowmem @bootargs@ headless no_alt_virt_keyboard vncconnect=IP lang=$lang
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
features.in/grub/cfg.in/26live-install-vnc-listen.cfg
View file @ c21c58d2
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
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' {
savedefault savedefault
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=live init=/usr/sbin/install2-init ramdisk_size=@live_size@ nosplash lowmem @bootargs@ $EFI_BOOTARGS headless no_alt_virt_keyboard vncpassword=VNCPWD lang=$lang linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=live init=/usr/sbin/install2-init ramdisk_size=@live_size@ nosplash lowmem @bootargs@ headless no_alt_virt_keyboard vncpassword=VNCPWD lang=$lang
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
......
features.in/grub/cfg.in/30live.cfg
View file @ c21c58d2
menuentry $"LiveCD (no hard disk needed)" --id 'live' { menuentry $"LiveCD (no hard disk needed)" --id 'live' {
savedefault savedefault
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live ramdisk_size=@live_size@ lowmem vga=@bootvga@ @bootargs@ $EFI_BOOTARGS lang=$lang linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live ramdisk_size=@live_size@ lowmem vga=@bootvga@ @bootargs@ lang=$lang
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
......
features.in/grub/cfg.in/32live_rw.cfg
View file @ c21c58d2
menuentry $"LiveCD with sessions support" --id 'session' { menuentry $"LiveCD with sessions support" --id 'session' {
savedefault savedefault
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live ramdisk_size=@live_size@ live_rw vga=@bootvga@ @bootargs@ $EFI_BOOTARGS lang=$lang linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live ramdisk_size=@live_size@ live_rw vga=@bootvga@ @bootargs@ lang=$lang
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
features.in/grub/cfg.in/33live-rescue.cfg
View file @ c21c58d2
menuentry $"Rescue LiveCD" --id 'live_rescue' { menuentry $"Rescue LiveCD" --id 'live_rescue' {
savedefault savedefault
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live systemd.unit=live-rescue.target ramdisk_size=@live_size@ nosplash vga=@bootvga@ @rescue_bootargs@ $EFI_BOOTARGS lang=$lang lowmem linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live systemd.unit=live-rescue.target ramdisk_size=@live_size@ nosplash vga=@bootvga@ @rescue_bootargs@ lang=$lang lowmem
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
......
features.in/grub/cfg.in/80rescue.cfg
View file @ c21c58d2
menuentry $"Rescue LiveCD" --id 'rescue' { menuentry $"Rescue LiveCD" --id 'rescue' {
savedefault savedefault
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR changedisk fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash @rescue_bootargs@ $EFI_BOOTARGS lowmem linux /boot/vmlinuz$KFLAVOUR changedisk fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash @rescue_bootargs@ lowmem
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
features.in/grub/cfg.in/82rescue_rw.cfg
View file @ c21c58d2
menuentry $"Rescue with sessions support" --id 'rescue_session' { menuentry $"Rescue with sessions support" --id 'rescue_session' {
savedefault savedefault
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR changedisk fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash @rescue_bootargs@ $EFI_BOOTARGS live_rw linux /boot/vmlinuz$KFLAVOUR changedisk fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash @rescue_bootargs@ live_rw
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
features.in/grub/cfg.in/83rescue_fm.cfg
View file @ c21c58d2
menuentry $"Forensic mode (leave disks alone)" --id 'rescue_forensic' { menuentry $"Forensic mode (leave disks alone)" --id 'rescue_forensic' {
savedefault savedefault
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash @rescue_bootargs@ $EFI_BOOTARGS max_loop=16 forensic hash=@rescue_hash@ lowmem linux /boot/vmlinuz fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash @rescue_bootargs@ max_loop=16 forensic hash=@rescue_hash@ lowmem
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
features.in/grub/cfg.in/84rescue_remote.cfg
View file @ c21c58d2
menuentry $"Rescue with remote SSH access (DHCP)" --id 'rescue_remote' { menuentry $"Rescue with remote SSH access (DHCP)" --id 'rescue_remote' {
savedefault savedefault
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash @rescue_bootargs@ $EFI_BOOTARGS max_loop=16 ip=dhcp port=22 rootpw=AUTO hash=@rescue_hash@ lowmem linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash @rescue_bootargs@ max_loop=16 ip=dhcp port=22 rootpw=AUTO hash=@rescue_hash@ lowmem
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
features.in/grub/cfg.in/85mediacheck.cfg
View file @ c21c58d2
menuentry $"Check this media for defects" --id 'mediachk' { menuentry $"Check this media for defects" --id 'mediachk' {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR live @initrd_bootargs@ @stagename@=mediacheck lowmem mediacheck=1 nosplash @bootargs@ $EFI_BOOTARGS linux /boot/vmlinuz$KFLAVOUR live @initrd_bootargs@ @stagename@=mediacheck lowmem mediacheck=1 nosplash @bootargs@
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
features.in/grub/cfg.in/88netinstall-live.cfg
View file @ c21c58d2
...@@ -2,25 +2,25 @@ submenu $"Bootloading over network (press F4)" --hotkey 'f4' --id 'network' { ...@@ -2,25 +2,25 @@ submenu $"Bootloading over network (press F4)" --hotkey 'f4' --id 'network' {
submenu $"Install over network" { submenu $"Install over network" {
menuentry $"Server NFS" { menuentry $"Server NFS" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:nfs ip=dhcp stagename=live init=/usr/sbin/install2-init @bootargs@ $EFI_BOOTARGS lang=$lang lowmem linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:nfs ip=dhcp stagename=live init=/usr/sbin/install2-init @bootargs@ lang=$lang lowmem
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
menuentry $"Server FTP" { menuentry $"Server FTP" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:ftp ip=dhcp stagename=live init=/usr/sbin/install2-init @bootargs@ $EFI_BOOTARGS lang=$lang linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:ftp ip=dhcp stagename=live init=/usr/sbin/install2-init @bootargs@ lang=$lang
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
menuentry $"Server HTTP" { menuentry $"Server HTTP" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:http ip=dhcp stagename=live init=/usr/sbin/install2-init @bootargs@ $EFI_BOOTARGS lang=$lang linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:http ip=dhcp stagename=live init=/usr/sbin/install2-init @bootargs@ lang=$lang
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
menuentry $"Server SAMBA" { menuentry $"Server SAMBA" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:cifs ip=dhcp stagename=live init=/usr/sbin/install2-init @bootargs@ $EFI_BOOTARGS lang=$lang lowmem linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:cifs ip=dhcp stagename=live init=/usr/sbin/install2-init @bootargs@ lang=$lang lowmem
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
...@@ -28,25 +28,25 @@ submenu $"Bootloading over network (press F4)" --hotkey 'f4' --id 'network' { ...@@ -28,25 +28,25 @@ submenu $"Bootloading over network (press F4)" --hotkey 'f4' --id 'network' {
submenu $"Live over network" { submenu $"Live over network" {
menuentry $"Server NFS" { menuentry $"Server NFS" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:nfs ip=dhcp stagename=live @bootargs@ $EFI_BOOTARGS lang=$lang lowmem linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:nfs ip=dhcp stagename=live @bootargs@ lang=$lang lowmem
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
menuentry $"Server FTP" { menuentry $"Server FTP" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:ftp ip=dhcp stagename=live @bootargs@ $EFI_BOOTARGS lang=$lang linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:ftp ip=dhcp stagename=live @bootargs@ lang=$lang
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
menuentry $"Server HTTP" { menuentry $"Server HTTP" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:http ip=dhcp stagename=live @bootargs@ $EFI_BOOTARGS lang=$lang linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:http ip=dhcp stagename=live @bootargs@ lang=$lang
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
menuentry $"Server SAMBA" { menuentry $"Server SAMBA" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:cifs ip=dhcp stagename=live @bootargs@ $EFI_BOOTARGS lang=$lang lowmem linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:cifs ip=dhcp stagename=live @bootargs@ lang=$lang lowmem
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
...@@ -54,25 +54,25 @@ submenu $"Bootloading over network (press F4)" --hotkey 'f4' --id 'network' { ...@@ -54,25 +54,25 @@ submenu $"Bootloading over network (press F4)" --hotkey 'f4' --id 'network' {
submenu $"Rescue over network" { submenu $"Rescue over network" {
menuentry $"Server NFS" { menuentry $"Server NFS" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:nfs ip=dhcp stagename=live systemd.unit=live-rescue.target @bootargs@ $EFI_BOOTARGS lowmem linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:nfs ip=dhcp stagename=live systemd.unit=live-rescue.target @bootargs@ lowmem
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
menuentry $"Server FTP" { menuentry $"Server FTP" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:ftp ip=dhcp stagename=live systemd.unit=live-rescue.target @bootargs@ $EFI_BOOTARGS linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:ftp ip=dhcp stagename=live systemd.unit=live-rescue.target @bootargs@
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
menuentry $"Server HTTP" { menuentry $"Server HTTP" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:http ip=dhcp stagename=live systemd.unit=live-rescue.target @bootargs@ $EFI_BOOTARGS linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:http ip=dhcp stagename=live systemd.unit=live-rescue.target @bootargs@
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
menuentry $"Server SAMBA" { menuentry $"Server SAMBA" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:cifs ip=dhcp stagename=live systemd.unit=live-rescue.target @bootargs@ $EFI_BOOTARGS lowmem linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:cifs ip=dhcp stagename=live systemd.unit=live-rescue.target @bootargs@ lowmem
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
......
features.in/grub/cfg.in/88netinstall.cfg
View file @ c21c58d2
...@@ -2,25 +2,25 @@ submenu $"Bootloading over network (press F4)" --hotkey 'f4' --id 'network' { ...@@ -2,25 +2,25 @@ submenu $"Bootloading over network (press F4)" --hotkey 'f4' --id 'network' {
submenu $"Install over network" { submenu $"Install over network" {
menuentry $"Server NFS" { menuentry $"Server NFS" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:nfs ip=dhcp stagename=altinst @bootargs@ $EFI_BOOTARGS lang=$lang lowmem linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:nfs ip=dhcp stagename=altinst @bootargs@ lang=$lang lowmem
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
menuentry $"Server FTP" { menuentry $"Server FTP" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:ftp ip=dhcp stagename=altinst @bootargs@ $EFI_BOOTARGS lang=$lang linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:ftp ip=dhcp stagename=altinst @bootargs@ lang=$lang
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
menuentry $"Server HTTP" { menuentry $"Server HTTP" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:http ip=dhcp stagename=altinst @bootargs@ $EFI_BOOTARGS lang=$lang linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:http ip=dhcp stagename=altinst @bootargs@ lang=$lang
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
menuentry $"Server SAMBA" { menuentry $"Server SAMBA" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:cifs ip=dhcp stagename=altinst @bootargs@ $EFI_BOOTARGS lang=$lang lowmem linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:cifs ip=dhcp stagename=altinst @bootargs@ lang=$lang lowmem
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
...@@ -28,25 +28,25 @@ submenu $"Bootloading over network (press F4)" --hotkey 'f4' --id 'network' { ...@@ -28,25 +28,25 @@ submenu $"Bootloading over network (press F4)" --hotkey 'f4' --id 'network' {
submenu $"Live over network" { submenu $"Live over network" {
menuentry $"Server NFS" { menuentry $"Server NFS" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:nfs ip=dhcp stagename=live @bootargs@ $EFI_BOOTARGS lang=$lang lowmem linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:nfs ip=dhcp stagename=live @bootargs@ lang=$lang lowmem
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
menuentry $"Server FTP" { menuentry $"Server FTP" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:ftp ip=dhcp stagename=live @bootargs@ $EFI_BOOTARGS lang=$lang linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:ftp ip=dhcp stagename=live @bootargs@ lang=$lang
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
menuentry $"Server HTTP" { menuentry $"Server HTTP" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:http ip=dhcp stagename=live @bootargs@ $EFI_BOOTARGS lang=$lang linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:http ip=dhcp stagename=live @bootargs@ lang=$lang
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
menuentry $"Server SAMBA" { menuentry $"Server SAMBA" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:cifs ip=dhcp stagename=live @bootargs@ $EFI_BOOTARGS lang=$lang lowmem linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:cifs ip=dhcp stagename=live @bootargs@ lang=$lang lowmem
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
...@@ -54,25 +54,25 @@ submenu $"Bootloading over network (press F4)" --hotkey 'f4' --id 'network' { ...@@ -54,25 +54,25 @@ submenu $"Bootloading over network (press F4)" --hotkey 'f4' --id 'network' {
submenu $"Install Live over network" { submenu $"Install Live over network" {
menuentry $"Server NFS" { menuentry $"Server NFS" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:nfs ip=dhcp stagename=live init=/usr/sbin/install2-init @bootargs@ $EFI_BOOTARGS lang=$lang lowmem linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:nfs ip=dhcp stagename=live init=/usr/sbin/install2-init @bootargs@ lang=$lang lowmem
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
menuentry $"Server FTP" { menuentry $"Server FTP" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:ftp ip=dhcp stagename=live init=/usr/sbin/install2-init @bootargs@ $EFI_BOOTARGS lang=$lang linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:ftp ip=dhcp stagename=live init=/usr/sbin/install2-init @bootargs@ lang=$lang
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
menuentry $"Server HTTP" { menuentry $"Server HTTP" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:http ip=dhcp stagename=live init=/usr/sbin/install2-init @bootargs@ $EFI_BOOTARGS lang=$lang linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:http ip=dhcp stagename=live init=/usr/sbin/install2-init @bootargs@ lang=$lang
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
menuentry $"Server SAMBA" { menuentry $"Server SAMBA" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:cifs ip=dhcp stagename=live init=/usr/sbin/install2-init @bootargs@ $EFI_BOOTARGS lang=$lang lowmem linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:cifs ip=dhcp stagename=live init=/usr/sbin/install2-init @bootargs@ lang=$lang lowmem
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
...@@ -80,25 +80,25 @@ submenu $"Bootloading over network (press F4)" --hotkey 'f4' --id 'network' { ...@@ -80,25 +80,25 @@ submenu $"Bootloading over network (press F4)" --hotkey 'f4' --id 'network' {
submenu $"Rescue over network" { submenu $"Rescue over network" {
menuentry $"Server NFS" { menuentry $"Server NFS" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:nfs ip=dhcp stagename=rescue @bootargs@ $EFI_BOOTARGS lowmem linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:nfs ip=dhcp stagename=rescue @bootargs@ lowmem
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
menuentry $"Server FTP" { menuentry $"Server FTP" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:ftp ip=dhcp stagename=rescue @bootargs@ $EFI_BOOTARGS linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:ftp ip=dhcp stagename=rescue @bootargs@
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
menuentry $"Server HTTP" { menuentry $"Server HTTP" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:http ip=dhcp stagename=rescue @bootargs@ $EFI_BOOTARGS linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:http ip=dhcp stagename=rescue @bootargs@
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
menuentry $"Server SAMBA" { menuentry $"Server SAMBA" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:cifs ip=dhcp stagename=rescue @bootargs@ $EFI_BOOTARGS lowmem linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:cifs ip=dhcp stagename=rescue @bootargs@ lowmem
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
......
features.in/grub/generate.mk
View file @ c21c58d2
...@@ -84,10 +84,6 @@ distro: bootargs ...@@ -84,10 +84,6 @@ distro: bootargs
# pass over additional parameters, if any # pass over additional parameters, if any
bootargs: clean bootargs: clean
@if [ -n "$(EFI_BOOTARGS)" ]; then \
sed -i "s,@efi_bootargs@,$(EFI_BOOTARGS)," $(DSTCFGS); \
fi; \
sed -i "s,@efi_bootargs@,," $(DSTCFGS)
@if [ -n "$(STAGE2_BOOTARGS)" ]; then \ @if [ -n "$(STAGE2_BOOTARGS)" ]; then \
sed -i "s,$(STAGE2_BOOTARGS),," $(DSTCFGS); \ sed -i "s,$(STAGE2_BOOTARGS),," $(DSTCFGS); \
sed -i "s,@bootargs@,$(STAGE2_BOOTARGS)," $(DSTCFGS); \ sed -i "s,@bootargs@,$(STAGE2_BOOTARGS)," $(DSTCFGS); \
......
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