aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDavid M. Syzdek <david@syzdek.net>2018-04-29 12:02:17 -0800
committerDavid M. Syzdek <david@syzdek.net>2018-04-29 12:02:17 -0800
commit093f24c8ba1bb9bc6b745ac470924bed2db0e225 (patch)
tree5ffffe32b8b1fa691c52cd75e079f8359c0e8677
parent4d5db3ac06a59a189531fe46c6c2443b239f859d (diff)
downloadiperd-093f24c8ba1bb9bc6b745ac470924bed2db0e225.tar.gz
iperd-093f24c8ba1bb9bc6b745ac470924bed2db0e225.tar.bz2
iperd-093f24c8ba1bb9bc6b745ac470924bed2db0e225.tar.xz
iperd-093f24c8ba1bb9bc6b745ac470924bed2db0e225.zip
updating documentation
-rw-r--r--doc/overview.md (renamed from src/syslinux/f2.txt)10
-rw-r--r--doc/serial-console.md23
-rw-r--r--src/syslinux/Makefile.syslinux2
-rw-r--r--src/syslinux/common.cfg13
4 files changed, 35 insertions, 13 deletions
diff --git a/src/syslinux/f2.txt b/doc/overview.md
index f5cba8f..a603f98 100644
--- a/src/syslinux/f2.txt
+++ b/doc/overview.md
@@ -1,12 +1,10 @@
1 1 IP Engineering Rescue Disk Overview
2 Help Table of Contents
3 2
4This is a multi Linux distro rescue Disk. This image contains base files to 3This is a multi Linux distro rescue Disk. This image contains base files to
5boot into various utilities and installers. Unless booted from a USB device, 4boot into various utilities and installers. Unless booted from a USB device,
6this image is read-only. To learn more, press one of the function keys 5this image is read-only. To learn more, press one of the function keys
7listed below to view a topic: 6listed below to view a topic or navigate using the documentation menu:
8 7
9 <F2> - Table of Contents 8 <F1> - Overview
10 <F3> - Serial Console 9 <F2> - Serial Console
11 <F4> - Sylinux CLI
12 10
diff --git a/doc/serial-console.md b/doc/serial-console.md
new file mode 100644
index 0000000..6df5aa9
--- /dev/null
+++ b/doc/serial-console.md
@@ -0,0 +1,23 @@
1 IP Engineering Rescue Disk Serial Cosole
2
3Most boot images supported by IPERD contain support for serial consoles. In
4most cases the serial console can be enabled by navigating to the desired image,
5pressing the [TAB] key to edit the boot parameters, and appending the following:
6
7 console=<device>,<speed>
8
9The following are common devices and their speeds:
10
11 console=tty0 - VGA console
12 console=ttyS0 - com1 at 9600 baud
13 console=ttyS1,57600 - com2 at 57,600 baud (Dell iDRAC/IPMI)
14 console=ttyS2,115200 - com2 at 115,200 baud (SuperMicro IPMI)
15
16Multiple consoles may be specified. The last console specified will be used for
17/dev/console (i.e. userspace). The following is an example of two consoles:
18
19 console=tty0 console=ttyS1,115200
20
21The filw 'admin-guide/serial-console.rst' in the Linux kernel documentation
22contains more detailed information.
23
diff --git a/src/syslinux/Makefile.syslinux b/src/syslinux/Makefile.syslinux
index 076eec3..352bc92 100644
--- a/src/syslinux/Makefile.syslinux
+++ b/src/syslinux/Makefile.syslinux
@@ -81,8 +81,6 @@ syslinux/iperd.dep: tmp/src/syslinux-$(SYSLINUX_VERSION)/.iperd-extracted
81 rsync -ra "$(PWD)/tmp/syslinux/usr/share/syslinux/" syslinux 81 rsync -ra "$(PWD)/tmp/syslinux/usr/share/syslinux/" syslinux
82 rsync -ra "$(PWD)/tmp/syslinux/usr/bin/" syslinux/bin 82 rsync -ra "$(PWD)/tmp/syslinux/usr/bin/" syslinux/bin
83 rsync -ra "$(PWD)/tmp/syslinux/sbin/" syslinux/sbin 83 rsync -ra "$(PWD)/tmp/syslinux/sbin/" syslinux/sbin
84 cp $(SYSLINDIR)/f1.txt syslinux/
85 cp $(SYSLINDIR)/f2.txt syslinux/
86 cp /usr/share/hwdata/pci.ids syslinux/ 84 cp /usr/share/hwdata/pci.ids syslinux/
87 cp /lib/modules/$$(uname -r)/modules.alias syslinux/modules.als 85 cp /lib/modules/$$(uname -r)/modules.alias syslinux/modules.als
88 cp syslinux/isolinux.bin syslinux/isolinux.bin.mod 86 cp syslinux/isolinux.bin syslinux/isolinux.bin.mod
diff --git a/src/syslinux/common.cfg b/src/syslinux/common.cfg
index 3d6f7e1..8f3b264 100644
--- a/src/syslinux/common.cfg
+++ b/src/syslinux/common.cfg
@@ -4,12 +4,11 @@ serial 0 9600
4prompt 1 4prompt 1
5UI menu.c32 5UI menu.c32
6 6
7# define help keys
8F1 /doc/overview.md
9F2 /doc/serial-console.md
7 10
8#display /menu.txt 11MENU TITLE IP Engineering Rescue Disk (@IPERD_VERSION@) [@DATE@]
9F1 /syslinux/f1.txt
10F2 /syslinux/f2.txt
11
12MENU TITLE IP Engineering Rescue Disk (@IPERD_VERSION@) [@DATE@] {@SYSLINUX_FLAVOR@}
13MENU TABMSG Press [TAB] to edit options, [F2] for help, or [ESC] for CLI. 12MENU TABMSG Press [TAB] to edit options, [F2] for help, or [ESC] for CLI.
14MENU ROWS 13 13MENU ROWS 13
15#MENU TIMEOUTROW 22 14#MENU TIMEOUTROW 22
@@ -48,6 +47,10 @@ menu color help 37;40 #c0ffffff #00000000 std
48menu color msg07 37;40 #90ffffff #00000000 std 47menu color msg07 37;40 #90ffffff #00000000 std
49 48
50MENU BEGIN 49MENU BEGIN
50MENU LABEL ^Documentation (@SYSLINUX_FLAVOR@)
51MENU END
52
53MENU BEGIN
51MENU LABEL ^Syslinux Modules 54MENU LABEL ^Syslinux Modules
52 55
53label cli 56label cli