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

[rrq/maintain_lilo.git] / man / lilo.pod

diff --git a/man/lilo.pod b/man/lilo.pod
index 602c8579a87620e310ea65a53918dbccf7683043..cf2c194cab8a23ed808b28568278827e975b42a4 100644 (file)
--- a/man/lilo.pod
+++ b/man/lilo.pod
@@ -2,8 +2,8 @@
 manpage:  LILO
 section:  8
 title:    lilo documentation
 manpage:  LILO
 section:  8
 title:    lilo documentation

-version:  23.3
-datum:    2013-05-01
+version:  24.2
+datum:    2015-11-22

 
 =encoding utf8
 
 
 =encoding utf8
 


@@ -44,19 +44,19 @@ override the configuration file, may be specified  on the command line.
 =item B<-A> I<master-device [N]>
 
 Used with a single argument, inquire of active partition on device I<master-device>;
 =item B<-A> I<master-device [N]>
 
 Used with a single argument, inquire of active partition on device I<master-device>;

-e.g. I</dev/sda>. With N==0: deactivate all partitions on the device. With N in 
+e.g. I</dev/sda>. With N==0: deactivate all partitions on the device. With N in

 the range [1..n]: activate the specified partition and deactivate all others.
 Normally, only primary partitions [1..4] may be activated, but if the 'Extended
 the range [1..n]: activate the specified partition and deactivate all others.
 Normally, only primary partitions [1..4] may be activated, but if the 'Extended

-Master Boot Loader' is present on the Master Boot Record (MBR) of the device 
+Master Boot Loader' is present on the Master Boot Record (MBR) of the device

 (see the -M option), any partition may be made active.  Whether the actual OS
 (see the -M option), any partition may be made active.  Whether the actual OS

-in the partition will boot from an extended partition depends on the characteristics
-of the OS. LILO boot records for Linux may be booted from an extended partition.
+in the partition will boot from a logical partition depends on the characteristics
+of the OS. LILO boot records for Linux may be booted from a logical partition.

 
 =item B<-b> I<bootdev>
 
 Set the boot device where the boot loader will be installed. For example
 I<"-b /dev/sda"> set the Master Boot Record (MBR) on the first disk as boot
 
 =item B<-b> I<bootdev>
 
 Set the boot device where the boot loader will be installed. For example
 I<"-b /dev/sda"> set the Master Boot Record (MBR) on the first disk as boot

-device. I<"-b /dev/sdb5"> set the first extended partition on the second disk
+device. I<"-b /dev/sdb5"> set the first logical partition on the second disk

 as boot device.
 
 =item B<-B> I<bitmap-file>
 as boot device.
 
 =item B<-B> I<bitmap-file>


@@ -157,7 +157,7 @@ table on master-device is undisturbed. If no valid Volume-ID (serial number) is
 present, then generate one and write it to the MBR. If I<mbr> is set, the
 Standard Master Boot Loader will search partitions 1-4 for an active flag, and
 boot the flagged partition. Only one active flag is allowed. If I<ext> is set,
 present, then generate one and write it to the MBR. If I<mbr> is set, the
 Standard Master Boot Loader will search partitions 1-4 for an active flag, and
 boot the flagged partition. Only one active flag is allowed. If I<ext> is set,

-the search for an active partition will include extended partitions as well.
+the search for an active partition will include logical partitions as well.

 The presence of the Extended Master Boot Loader on the Master Boot Record
 (MBR = sector 0) of a disk affects the operation of the I<-A> option.
 
 The presence of the Extended Master Boot Loader on the Master Boot Record
 (MBR = sector 0) of a disk affects the operation of the I<-A> option.
 


@@ -207,6 +207,13 @@ once-only command. It is typically used in reboot scripts, just before calling
 'shutdown -r'. Used without any arguments, it will cancel a I<lock>-ed or
 I<fallback> command line.
 
 'shutdown -r'. Used without any arguments, it will cancel a I<lock>-ed or
 I<fallback> command line.
 

+This Command line starts with image identifier (as shown during map file update),
+then space, then kernel parameters. The kernel parameters are appended to kernel
+command line constructed routinely. In either case, it there were parameters
+or not, such one-time command will be treated by loaders code, as if it is set
+at 'boot:' prompt. This could lead to 'password:' prompt at boot time. Be warned!
+Refer to I<lilo.conf(5)> for details.
+

 =item B<-s> I<save-file>
 
 When lilo writes a new boot sector, it preserves the former contents of the boot
 =item B<-s> I<save-file>
 
 When lilo writes a new boot sector, it preserves the former contents of the boot


@@ -291,11 +298,11 @@ generate this version of LILO.
 
 =item B<-z>
 
 
 =item B<-z>
 

-When used with the '-M' switch, clears the Volume-ID.  Usually used in the 
+When used with the '-M' switch, clears the Volume-ID.  Usually used in the

 following sequence to generate a new Volume-ID:
 
 following sequence to generate a new Volume-ID:
 

-    lilo -z -M /dev/hda
-    lilo -M /dev/hda
+    lilo -z -M /dev/sda
+    lilo -M /dev/sda

 
 =item B<-Z> I<option>
 
 
 =item B<-Z> I<option>
 


@@ -422,10 +429,10 @@ It is best to use the  default mechanism, as it works correctly in all cases.
 
  Copyright (C) 1992-1998 Werner Almesberger
  Copyright (C) 1999-2007 John Coffman
 
  Copyright (C) 1992-1998 Werner Almesberger
  Copyright (C) 1999-2007 John Coffman

- Copyright (C) 2009-2013 Joachim Wiedorn
+ Copyright (C) 2009-2014 Joachim Wiedorn

 
 

-Redistribution and use in source and binary forms, with or without 
-modification, are permitted under the terms of the BSD license found in 
+Redistribution and use in source and binary forms, with or without
+modification, are permitted under the terms of the BSD license found in

 the COPYING file.
 
 =head1 AUTHOR
 the COPYING file.
 
 =head1 AUTHOR


@@ -437,14 +444,14 @@ B<lilo> was written by:
  Joachim Wiedorn (since version 23.0).
 
 This manual page was written by Werner Almesberger and Joachim Wiedorn
  Joachim Wiedorn (since version 23.0).
 
 This manual page was written by Werner Almesberger and Joachim Wiedorn

-<ad_debian at joonet.de>.
+<joodevel at joonet.de>.

 
 =head1 SEE ALSO
 
 B<lilo.conf>(5),
 
 =head1 SEE ALSO
 
 B<lilo.conf>(5),

-B<liloconfig>(8), 
+B<liloconfig>(8),

 B<lilo-uuid-diskid>(8),
 B<lilo-uuid-diskid>(8),

-B<mkrescue>(8), 
+B<mkrescue>(8),

 B<fdisk>(8),
 B<mkinitrd>(8)
 
 B<fdisk>(8),
 B<mkinitrd>(8)