Add externs to avoid multiple definitions, and then add missing definitions.

[rrq/maintain_lilo.git] / sample / lilo.example.conf

diff --git a/sample/lilo.example.conf b/sample/lilo.example.conf
index 3bc6724034064eeba38d2eac1026fc77e832aadc..18f9cac5cdc9b181581d2ca8bb90be49367c07cc 100644 (file)
--- a/sample/lilo.example.conf
+++ b/sample/lilo.example.conf
@@ -1,4 +1,4 @@
-# /etc/lilo.conf  -   systemwide LILO configuration (LILO 23)
+# /etc/lilo.conf  -   systemwide LILO configuration (LILO 24)
 # details see in manpages: lilo(8) and lilo.conf(5)
 
 # +-------------------------------------------------------------+
@@ -70,7 +70,8 @@ install = menu
 # The first character of each part sets the text frontcolor, 
 # the second character of earch part sets the text backcolor,
 # an upper-case character sets bold face text (frontcolor).
-# i.g. 'menu-scheme=wm:rw:wm:Wm'. Possible colors: 
+#
+# E.g. 'menu-scheme=wm:rw:wm:Wm'. Possible colors: 
 # k=black, b=blue, g=green, c=cyan, r=red, m=magenta, y=yellow, w=white.
 menu-scheme = Wb:Yr:Wb:Wb
 #menu-title = " DESDEMONA Boot-Manager "
@@ -110,19 +111,40 @@ timeout = 100
 #   vga=ask       stop and ask for user input: choice of text mode
 #   vga=<mode>    use the corresponding text mode number. A list of  
 #                   available modes can be obtained by booting with  
-#                   vga=ask'  and then pressing [Enter].
+#                   'vga=ask' and then pressing [Enter].
+#
 # Another way is the use of frame buffer mode. Then the kernel 
 # will switch from the normal vga text mode (80x25) to the frame
-# buffer mode (if frame buffer support is in the kernel):
-#   vga=0x314      800x600 @ 16 bit
-#   vga=0x317     1024x768 @ 16 bit
-#   vga=0x318     1024x768 @ 24 bit
+# buffer <mode> (if frame buffer support is in the kernel):
+#                   16bit:    32bit:
+#     640x480 :     0x311     0x312
+#     800x600 :     0x314     0x315
+#    1024x768 :     0x317     0x318
+#    1280x960 :     0x365     0x366
+#    1280x1024:     0x31A     0x31B
+#    1400x1050:     0x345     0x346
+#    1600x1200:     0x333     0x334
+#    1680x1050:     0x3D2     0x3D4
+#    1920x1440:     0x337     0x338
 #vga = ask
 vga = normal
 #vga = 0x317
 
 # ---------------------------------------------------------------
 
+# Set a password here and uncomment the 'restricted' lines in
+# the image definitions below. Then a password must be typed
+# to boot anything but a default configuration. If a command
+# line is given, other than one specified by an 'append'
+# statement in this lilo.conf, the password is required, but
+# a standard default boot will not require one.
+#
+# If anyone have access to the console, with this password and
+# the 'restricted' option you prevent booting with something
+# like 'Linux init=/bin/sh' and thus becoming `root' without
+# proper authorization.
+#password = count4this
+
 # Kernel command line options that apply to all installed images go
 # here.  See 'kernel-parameters.txt' in the Linux kernel 'Documentation'
 # directory. I.g. for start into 'init 5' write:  append="5"
@@ -143,6 +165,8 @@ vga = normal
 # usually with the initrd file. Configure all GNU/Linux systems
 # on other partitions, too.
 
+# Warning: labels must be less than 16 characters long.
+
 # first example (default)
 image = /boot/vmlinuz-3.12-1-generic
        label = "Linux"