Skip to content

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

grub,tty: add serial console support for STAGE1

We do not enable the serial port in grub itself for non-x86 architectures, since console and serial are loaded in them. There is no need to specifically enable serial. It is still possible to override the serial connection of grub itself in the initial grub config.
parent 02638fcb
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 43 deletions
features.in/grub/cfg.in/00serial.cfg 0 → 100644
View file @ 38fdc6c3
if [ -z "$GRUB_TERMINAL" ]; then
GRUB_TERMINAL='console serial'
GRUB_SERIAL_COMMAND="serial --unit=@serial_unit@ --speed=@serial_speed@"
fi
features.in/grub/cfg.in/20install2.cfg
View file @ 38fdc6c3
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@ @bootargs@ lang=$lang lowmem linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ @bootargs@ lang=$lang lowmem console=tty0 console=@serial_port@,@serial_speed@n8
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 @ 38fdc6c3
...@@ -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 @install2_init@ ramdisk_size=@live_size@ lowmem @bootargs@ lang=$lang linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live @install2_init@ ramdisk_size=@live_size@ lowmem @bootargs@ lang=$lang console=tty0 console=@serial_port@,@serial_speed@n8
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 @ 38fdc6c3
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
menuentry $"VNC install (edit to set server IP address)" --id 'vncconnect' { menuentry $"VNC install (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@ lovmem headless no_alt_virt_keyboard vncconnect=IP lang=$lang linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ nosplash @bootargs@ lovmem headless no_alt_virt_keyboard vncconnect=IP lang=$lang console=tty0 console=@serial_port@,@serial_speed@n8
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 @ 38fdc6c3
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
menuentry $"VNC install (edit to set password and connect here)" --id 'vncpasswd' { menuentry $"VNC install (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@ lowmem headless no_alt_virt_keyboard vncpassword=VNCPWD lang=$lang linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ nosplash @bootargs@ lowmem headless no_alt_virt_keyboard vncpassword=VNCPWD lang=$lang console=tty0 console=@serial_port@,@serial_speed@n8
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 @ 38fdc6c3
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
menuentry $"VNC install (edit to set server IP address)" --id 'vncconnect' { menuentry $"VNC install (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 @install2_init@ ramdisk_size=@live_size@ nosplash lowmem @bootargs@ headless no_alt_virt_keyboard vncconnect=IP lang=$lang linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=live @install2_init@ ramdisk_size=@live_size@ nosplash lowmem @bootargs@ headless no_alt_virt_keyboard vncconnect=IP lang=$lang console=tty0 console=@serial_port@,@serial_speed@n8
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 @ 38fdc6c3
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
menuentry $"VNC install (edit to set password and connect here)" --id 'vncpasswd' { menuentry $"VNC install (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 @install2_init@ ramdisk_size=@live_size@ nosplash lowmem @bootargs@ headless no_alt_virt_keyboard vncpassword=VNCPWD lang=$lang linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=live @install2_init@ ramdisk_size=@live_size@ nosplash lowmem @bootargs@ headless no_alt_virt_keyboard vncpassword=VNCPWD lang=$lang console=tty0 console=@serial_port@,@serial_speed@n8
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 @ 38fdc6c3
menuentry $"@LIVE_NAME@" --id 'live' { menuentry $"@LIVE_NAME@" --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 @bootargs@ lang=$lang linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live ramdisk_size=@live_size@ lowmem @bootargs@ lang=$lang console=tty0 console=@serial_port@,@serial_speed@n8
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 @ 38fdc6c3
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 @bootargs@ lang=$lang lowmem linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live ramdisk_size=@live_size@ live_rw @bootargs@ lang=$lang lowmem console=tty0 console=@serial_port@,@serial_speed@n8
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 @ 38fdc6c3
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 fastboot live @initrd_bootargs@ @stagename@=live systemd.unit=live-rescue.target ramdisk_size=@live_size@ nosplash @rescue_bootargs@ lang=$lang lowmem linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live systemd.unit=live-rescue.target ramdisk_size=@live_size@ nosplash @rescue_bootargs@ lang=$lang lowmem console=tty0 console=@serial_port@,@serial_speed@n8
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/34live-rescue_rw.cfg
View file @ 38fdc6c3
menuentry $"Rescue LiveCD with sessions support" --id 'rescue_session' { menuentry $"Rescue LiveCD with sessions support" --id 'rescue_session' {
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@ live_rw nosplash @rescue_bootargs@ lang=$lang lowmem linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live systemd.unit=live-rescue.target ramdisk_size=@live_size@ live_rw nosplash @rescue_bootargs@ lang=$lang lowmem console=tty0 console=@serial_port@,@serial_speed@n8
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 @ 38fdc6c3
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@ lowmem linux /boot/vmlinuz$KFLAVOUR changedisk fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash @rescue_bootargs@ lowmem console=tty0 console=@serial_port@,@serial_speed@n8
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 @ 38fdc6c3
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@ live_rw lowmem linux /boot/vmlinuz$KFLAVOUR changedisk fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash @rescue_bootargs@ live_rw lowmem console=tty0 console=@serial_port@,@serial_speed@n8
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 @ 38fdc6c3
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@ 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 console=tty0 console=@serial_port@,@serial_speed@n8
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 @ 38fdc6c3
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@ max_loop=16 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 port=22 rootpw=AUTO hash=@rescue_hash@ lowmem console=tty0 console=@serial_port@,@serial_speed@n8
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 @ 38fdc6c3
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@ linux /boot/vmlinuz$KFLAVOUR live @initrd_bootargs@ @stagename@=mediacheck lowmem mediacheck=1 nosplash @bootargs@ console=tty0 console=@serial_port@,@serial_speed@n8
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 @ 38fdc6c3
...@@ -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 @INSTALL2_INIT@ @bootargs@ lang=$lang lowmem linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:nfs ip=dhcp stagename=live @INSTALL2_INIT@ @bootargs@ lang=$lang lowmem console=tty0 console=@serial_port@,@serial_speed@n8
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 @INSTALL2_INIT@ @bootargs@ lang=$lang linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:ftp ip=dhcp stagename=live @INSTALL2_INIT@ @bootargs@ lang=$lang console=tty0 console=@serial_port@,@serial_speed@n8
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 @INSTALL2_INIT@ @bootargs@ lang=$lang linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:http ip=dhcp stagename=live @INSTALL2_INIT@ @bootargs@ lang=$lang console=tty0 console=@serial_port@,@serial_speed@n8
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 @INSTALL2_INIT@ @bootargs@ lang=$lang lowmem linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:cifs ip=dhcp stagename=live @INSTALL2_INIT@ @bootargs@ lang=$lang lowmem console=tty0 console=@serial_port@,@serial_speed@n8
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@ lang=$lang lowmem linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:nfs ip=dhcp stagename=live @bootargs@ lang=$lang lowmem console=tty0 console=@serial_port@,@serial_speed@n8
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@ lang=$lang linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:ftp ip=dhcp stagename=live @bootargs@ lang=$lang console=tty0 console=@serial_port@,@serial_speed@n8
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@ lang=$lang linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:http ip=dhcp stagename=live @bootargs@ lang=$lang console=tty0 console=@serial_port@,@serial_speed@n8
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@ lang=$lang lowmem linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:cifs ip=dhcp stagename=live @bootargs@ lang=$lang lowmem console=tty0 console=@serial_port@,@serial_speed@n8
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@ lowmem linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:nfs ip=dhcp stagename=live systemd.unit=live-rescue.target @bootargs@ lowmem console=tty0 console=@serial_port@,@serial_speed@n8
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@ linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:ftp ip=dhcp stagename=live systemd.unit=live-rescue.target @bootargs@ console=tty0 console=@serial_port@,@serial_speed@n8
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@ linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:http ip=dhcp stagename=live systemd.unit=live-rescue.target @bootargs@ console=tty0 console=@serial_port@,@serial_speed@n8
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@ lowmem linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:cifs ip=dhcp stagename=live systemd.unit=live-rescue.target @bootargs@ lowmem console=tty0 console=@serial_port@,@serial_speed@n8
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 @ 38fdc6c3
...@@ -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@ lang=$lang lowmem linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:nfs ip=dhcp stagename=altinst @bootargs@ lang=$lang lowmem console=tty0 console=@serial_port@,@serial_speed@n8
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@ lang=$lang linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:ftp ip=dhcp stagename=altinst @bootargs@ lang=$lang console=tty0 console=@serial_port@,@serial_speed@n8
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@ lang=$lang linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:http ip=dhcp stagename=altinst @bootargs@ lang=$lang console=tty0 console=@serial_port@,@serial_speed@n8
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@ lang=$lang lowmem linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:cifs ip=dhcp stagename=altinst @bootargs@ lang=$lang lowmem console=tty0 console=@serial_port@,@serial_speed@n8
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@ lang=$lang lowmem linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:nfs ip=dhcp stagename=live @bootargs@ lang=$lang lowmem console=tty0 console=@serial_port@,@serial_speed@n8
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@ lang=$lang linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:ftp ip=dhcp stagename=live @bootargs@ lang=$lang console=tty0 console=@serial_port@,@serial_speed@n8
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@ lang=$lang linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:http ip=dhcp stagename=live @bootargs@ lang=$lang console=tty0 console=@serial_port@,@serial_speed@n8
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@ lang=$lang lowmem linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:cifs ip=dhcp stagename=live @bootargs@ lang=$lang lowmem console=tty0 console=@serial_port@,@serial_speed@n8
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@ lang=$lang lowmem linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:nfs ip=dhcp stagename=live init=/usr/sbin/install2-init @bootargs@ lang=$lang lowmem console=tty0 console=@serial_port@,@serial_speed@n8
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@ lang=$lang linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:ftp ip=dhcp stagename=live init=/usr/sbin/install2-init @bootargs@ lang=$lang console=tty0 console=@serial_port@,@serial_speed@n8
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@ lang=$lang linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:http ip=dhcp stagename=live init=/usr/sbin/install2-init @bootargs@ lang=$lang console=tty0 console=@serial_port@,@serial_speed@n8
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@ lang=$lang lowmem linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:cifs ip=dhcp stagename=live init=/usr/sbin/install2-init @bootargs@ lang=$lang lowmem console=tty0 console=@serial_port@,@serial_speed@n8
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@ lowmem linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:nfs ip=dhcp stagename=rescue @bootargs@ lowmem console=tty0 console=@serial_port@,@serial_speed@n8
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@ linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:ftp ip=dhcp stagename=rescue @bootargs@ console=tty0 console=@serial_port@,@serial_speed@n8
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@ linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:http ip=dhcp stagename=rescue @bootargs@ console=tty0 console=@serial_port@,@serial_speed@n8
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@ lowmem linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:cifs ip=dhcp stagename=rescue @bootargs@ lowmem console=tty0 console=@serial_port@,@serial_speed@n8
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 @ 38fdc6c3
...@@ -113,6 +113,14 @@ bootargs: clean ...@@ -113,6 +113,14 @@ bootargs: clean
@sed -i "s,@stagename@,$(STAGE1_INITRD_STAGE2_OPTION),g" $(DSTCFGS) @sed -i "s,@stagename@,$(STAGE1_INITRD_STAGE2_OPTION),g" $(DSTCFGS)
@sed -i "s,@install2_init@,$(INSTALL2_INIT),g" $(DSTCFGS) @sed -i "s,@install2_init@,$(INSTALL2_INIT),g" $(DSTCFGS)
@sed -i "s,@LIVE_NAME@,$(LIVE_NAME),g" $(DSTCFGS) @sed -i "s,@LIVE_NAME@,$(LIVE_NAME),g" $(DSTCFGS)
@if [ -n "$(GLOBAL_TTY_DEV)" ] && [ -n "$(GLOBAL_TTY_RATE)" ]; then \
sed -i "s,@serial_speed@,$(GLOBAL_TTY_RATE),g" $(DSTCFGS); \
sed -i "s,@serial_port@,$(GLOBAL_TTY_DEV),g" $(DSTCFGS); \
SERIAL_UNIT="`echo $(GLOBAL_TTY_DEV) |sed -r 's,^[^0-9]+,,'`"; \
sed -i "s,@serial_unit@,$$SERIAL_UNIT,g" $(DSTCFGS); \
else \
sed -i "s, console=tty0 console=@serial_port@\,@serial_speed@n8,,g" $(DSTCFGS); \
fi
clean: copy clean: copy
@if [ "$(GRUB_UI)" = gfxboot ]; then \ @if [ "$(GRUB_UI)" = gfxboot ]; then \
......
features.in/tty/config.mk
View file @ 38fdc6c3
...@@ -13,5 +13,10 @@ use/tty/%: use/tty ...@@ -13,5 +13,10 @@ use/tty/%: use/tty
@$(call add,THE_PACKAGES,agetty) @$(call add,THE_PACKAGES,agetty)
@$(call try,TTY_DEV,tty$*) @$(call try,TTY_DEV,tty$*)
@$(call try,TTY_RATE,115200) @$(call try,TTY_RATE,115200)
ifeq (distro,$(IMAGE_CLASS))
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@$(call add,GRUB_CFG,serial)
@$(call add,SYSLINUX_CFG,tty$*) @$(call add,SYSLINUX_CFG,tty$*)
endif
endif
@$(call add,BASE_BOOTARGS,console=tty0 console=$$(TTY_DEV)$(comma)$$(TTY_RATE)n8) @$(call add,BASE_BOOTARGS,console=tty0 console=$$(TTY_DEV)$(comma)$$(TTY_RATE)n8)
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