+Changes for version 24.2 (22-November-2015) - Joachim Wiedorn
+
+ Sources
+ -------
+ - Remove compile date and time in binary to support reproducible
+ builds (thanks to Dmitry Bogatov).
+ - Remove obsolete hints to /boot/boot.b and other files in README.
+ - Use system derived types to make code safe for both the 32-bit and
+ the 64-bit compilation environment. (thanks to TAMUKI Shoichi)
+
+ General
+ -------
+ - Update sample config file lilo.example.conf and config element
+ 'password'.
+ - Upgrade of script liloconfig:
+ * three steps of tests with three-state exit code
+ to give the admin more information about failure.
+ - Update manpage pod files and its manpages.
+
+
Changes for version 24.1 (17-October-2014) - Joachim Wiedorn
Documentations
# -*- makefile -*-
#
-# Copyright 2009-2014 Joachim Wiedorn
+# Copyright 2009-2015 Joachim Wiedorn
# All rights reserved.
#
# Licensed under the terms contained in the file 'COPYING'
(For details see file 'CHANGELOG' in the source directory)
+Version 24.2 (minor and bugfix update of 24.1)
+
+ o Remove compile date and time in binary.
+ o Add 'password' element into example config file.
+ o Upgrade of liloconfig script and manpage.
+
Version 24.1 (minor and bugfix update of 24.0)
o Install .dat files of images, too.
* patching sources because of some warnings while compiling
with gcc 4.4.x and higher
-* Upgrade of all manpages (move to po files).
+* Upgrade of all manpages (move to pot files).
* code cleanup.
at least tested programs
package version until inside
-----------------------------------------------------------------
-coreutils 6.4.10 8.13 (general)
+coreutils 6.4.10 8.23 (general)
bcc 0.16.14 0.16.17 bcc
bin86 0.16.14 0.16.17 as86, ld86
-gcc 3.3.5 4.9.1 gcc
+gcc 3.3.5 5.2.1 gcc
-sharutils 4.6.3 4.14 uuencode, uudecode
+sharutils 4.6.3 4.15.2 uuencode, uudecode
-perl 5.8.4 5.14.2 pod2man
+perl 5.8.4 5.20.2 pod2man
at least tested programs
package version until inside
-----------------------------------------------------------------
-perl 5.8.8 5.14.2 (general)
+perl 5.8.8 5.20.2 (general)
-perl-modules 5.8.8 5.14.2 Getopt::Std,
+perl-modules 5.8.8 5.20.2 Getopt::Std,
Pod::Usage
File::Copy
Begin4
Title: LILO
-Version: 24.1
-Entered-date: 2014-10-17
+Version: 24.2
+Entered-date: 2015-11-22
Description: Generic boot loader for Linux. Distribution
includes full source, documentation and support files.
Keywords: Linux, boot loader, LILO
Author: Joachim Wiedorn
-Maintained-by: Joachim Wiedorn <ad_debian@joonet.de>
+Maintained-by: Joachim Wiedorn <joodevel@joonet.de>
Primary-site: http://lilo.alioth.debian.org/
Original-site: http://lilo.alioth.debian.org/
Alternate-site: http://alioth.debian.org/projects/lilo/ (developer's site)
-Files: 754kB lilo-24.1.tar.gz
+Files: 766kB lilo-24.2.tar.gz
Platforms: Linux (>= 2.4.0),
gcc (>= 3.3.5), as86 (>= 0.16.14) needed to compile.
bcc (0.16.14) needed to compile diagnostic disk 2 & DOS *.com.
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28)
.\"
.\" Standard preamble:
.\" ========================================================================
. ds PI \(*p
. ds L" ``
. ds R" ''
+. ds C`
+. ds C'
'br\}
.\"
.\" Escape single quotes in literal strings from groff's Unicode transform.
.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
.\" entries marked with X<> in POD. Of course, you'll have to process the
.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-. de IX
-. tm Index:\\$1\t\\n%\t"\\$2"
+.\"
+.\" Avoid warning from groff about undefined register 'F'.
+.de IX
..
-. nr % 0
-. rr F
-.\}
-.el \{\
-. de IX
+.nr rF 0
+.if \n(.g .if rF .nr rF 1
+.if (\n(rF:(\n(.g==0)) \{
+. if \nF \{
+. de IX
+. tm Index:\\$1\t\\n%\t"\\$2"
..
+. if !\nF==2 \{
+. nr % 0
+. nr F 2
+. \}
+. \}
.\}
+.rr rF
.\" ========================================================================
.\"
.IX Title "LILO-UUID-DISKID 8"
-.TH LILO-UUID-DISKID 8 "2014-10-13" "24.1" "lilo documentation"
+.TH LILO-UUID-DISKID 8 "2015-11-22" "24.2" "lilo documentation"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
manpage: LILO-UUID-DISKID
section: 8
title: lilo documentation
-version: 24.1
-datum: 2014-10-13
+version: 24.2
+datum: 2015-11-22
=encoding utf8
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28)
.\"
.\" Standard preamble:
.\" ========================================================================
. ds PI \(*p
. ds L" ``
. ds R" ''
+. ds C`
+. ds C'
'br\}
.\"
.\" Escape single quotes in literal strings from groff's Unicode transform.
.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
.\" entries marked with X<> in POD. Of course, you'll have to process the
.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-. de IX
-. tm Index:\\$1\t\\n%\t"\\$2"
+.\"
+.\" Avoid warning from groff about undefined register 'F'.
+.de IX
..
-. nr % 0
-. rr F
-.\}
-.el \{\
-. de IX
+.nr rF 0
+.if \n(.g .if rF .nr rF 1
+.if (\n(rF:(\n(.g==0)) \{
+. if \nF \{
+. de IX
+. tm Index:\\$1\t\\n%\t"\\$2"
..
+. if !\nF==2 \{
+. nr % 0
+. nr F 2
+. \}
+. \}
.\}
+.rr rF
.\" ========================================================================
.\"
.IX Title "LILO 8"
-.TH LILO 8 "2014-10-15" "24.1" "lilo documentation"
+.TH LILO 8 "2015-11-22" "24.2" "lilo documentation"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
Master Boot Loader' is present on the Master Boot Record (\s-1MBR\s0) of the device
(see the \-M option), any partition may be made active. Whether the actual \s-1OS\s0
in the partition will boot from a logical partition depends on the characteristics
-of the \s-1OS\s0. \s-1LILO\s0 boot records for Linux may be booted from a logical partition.
+of the \s-1OS. LILO\s0 boot records for Linux may be booted from a logical partition.
.IP "\fB\-b\fR \fIbootdev\fR" 4
.IX Item "-b bootdev"
Set the boot device where the boot loader will be installed. For example
.IP "\fB\-g\fR" 4
.IX Item "-g"
Generate 'cylinder/head/sector' (\s-1CHS\s0 geometric) disk addresses. Limited to cylinders
-up to 1023. Forces compatibility with very old versions of \s-1LILO\s0 \fI(obsolete switch)\fR.
+up to 1023. Forces compatibility with very old versions of \s-1LILO \s0\fI(obsolete switch)\fR.
.IP "\fB\-H\fR" 4
.IX Item "-H"
Override fatal halt if a \s-1RAID\s0 array does not have all disks active.
Install a Master Boot Record on the device specified as master-device, selecting
the Standard or Extended Master Boot Loader per option. The primary partition
table on master-device is undisturbed. If no valid Volume-ID (serial number) is
-present, then generate one and write it to the \s-1MBR\s0. If \fImbr\fR is set, the
+present, then generate one and write it to the \s-1MBR.\s0 If \fImbr\fR 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 \fIext\fR is set,
the search for an active partition will include logical partitions as well.
.IX Item "-X"
Reserved for \s-1LILO\s0 internal use. May produce different output for different \s-1LILO\s0
versions. The line beginning \*(L"CFLAGS=\*(R" will contain the compiler options used to
-generate this version of \s-1LILO\s0.
+generate this version of \s-1LILO.\s0
.IP "\fB\-z\fR" 4
.IX Item "-z"
When used with the '\-M' switch, clears the Volume-ID. Usually used in the
.IP "\fB\-Z\fR \fIoption\fR" 4
.IX Item "-Z option"
Tells the boot installer whether special precautions need to be taken because
-the \s-1BIOS\s0 fails to pass the correct device code in \s-1DL\s0 (\-Z0). Or may specify
+the \s-1BIOS\s0 fails to pass the correct device code in \s-1DL \s0(\-Z0). Or may specify
that the \s-1BIOS\s0 always gets \s-1DL\s0 right (\-Z1). Corresponds to, and overrides, the
configuration file option 'bios\-passes\-dl='.
.SH "CONFIG OPTIONS"
.SH "BOOT OPTIONS"
.IX Header "BOOT OPTIONS"
The options described here may be specified at boot time on the command line
-when a kernel image is booted. These options are processed by \s-1LILO\s0, and are
+when a kernel image is booted. These options are processed by \s-1LILO,\s0 and are
removed from the command line before it is passed to the kernel, unless otherwise
noted.
.IP "\fBlock\fR" 4
\& Loading...............
\& BIOS data check
.Ve
-.IP "\fBvga=[\s-1ASK\s0,EXT,EXTENDED,NORMAL,###,0x###]\fR" 4
+.IP "\fBvga=[\s-1ASK,EXT,EXTENDED,NORMAL\s0,###,0x###]\fR" 4
.IX Item "vga=[ASK,EXT,EXTENDED,NORMAL,###,0x###]"
Allows overriding the default video mode upon kernel startup.
.SH "BOOT ERRORS"
.IX Header "BOOT ERRORS"
The boot process takes place in two stages. The first stage loader is a single
-sector, and is loaded by the \s-1BIOS\s0 or by the loader in the \s-1MBR\s0. It loads the
+sector, and is loaded by the \s-1BIOS\s0 or by the loader in the \s-1MBR.\s0 It loads the
multi-sector second stage loader, but is very space limited. When the first
stage loader gets control, it types the letter 'L'; when it is ready to
transfer control to the second stage loader it types the letter 'I'. If any
\& FF sense operation failed
.Ve
.PP
-Error code 40 is generated by the \s-1BIOS\s0, or by \s-1LILO\s0 during the conversion of a
+Error code 40 is generated by the \s-1BIOS,\s0 or by \s-1LILO\s0 during the conversion of a
linear (24\-bit) disk address to a geometric (C:H:S) address. On older systems
which do not support lba32 (32\-bit) addressing, this error may also be generated.
Errors 99 and 9A usually mean the map file ('\-m' or 'map=') is not readable,
likely because \s-1LILO\s0 was not re-run after some system change, or there is a
geometry mismatch between what \s-1LILO\s0 used (lilo \-v3 to display) and what is
-actually being used by the \s-1BIOS\s0 (one of the lilo diagnostic disks, available
+actually being used by the \s-1BIOS \s0(one of the lilo diagnostic disks, available
in the source distribution, may be needed to diagnose this problem).
.PP
When the second stage loader has received control from the first stage, it
prints the letter 'L', and when it has initialized itself, including verifying
the \*(L"Descriptor Table\*(R" \- the list of kernels/others to boot \- it will print
-the letter \*(L"O\*(R", to form the full word \*(L"\s-1LILO\s0\*(R", in uppercase.
+the letter \*(L"O\*(R", to form the full word \*(L"\s-1LILO\*(R",\s0 in uppercase.
.PP
All second stage loader error messages are English text and try to pinpoint,
more or less successfully, the point of failure.
manpage: LILO
section: 8
title: lilo documentation
-version: 24.1
-datum: 2014-10-15
+version: 24.2
+datum: 2015-11-22
=encoding utf8
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28)
.\"
.\" Standard preamble:
.\" ========================================================================
. ds PI \(*p
. ds L" ``
. ds R" ''
+. ds C`
+. ds C'
'br\}
.\"
.\" Escape single quotes in literal strings from groff's Unicode transform.
.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
.\" entries marked with X<> in POD. Of course, you'll have to process the
.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-. de IX
-. tm Index:\\$1\t\\n%\t"\\$2"
+.\"
+.\" Avoid warning from groff about undefined register 'F'.
+.de IX
..
-. nr % 0
-. rr F
-.\}
-.el \{\
-. de IX
+.nr rF 0
+.if \n(.g .if rF .nr rF 1
+.if (\n(rF:(\n(.g==0)) \{
+. if \nF \{
+. de IX
+. tm Index:\\$1\t\\n%\t"\\$2"
..
+. if !\nF==2 \{
+. nr % 0
+. nr F 2
+. \}
+. \}
.\}
+.rr rF
.\" ========================================================================
.\"
.IX Title "LILOCONFIG 8"
-.TH LILOCONFIG 8 "2014-10-13" "24.1" "liloconfig documentation"
+.TH LILOCONFIG 8 "2015-11-22" "24.2" "liloconfig documentation"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
\&
\& #large\-memory
\& lba32
-\& boot = /dev/sda
+\& #boot = /dev/sda
+\& boot = /dev/disk/by\-id/ata\-SAMSUNG_SV1604N_S01FJ10X999999
\& #root = /dev/sda1
\& root = "UUID=18843936\-00f9\-4df0\-a373\-000d05a5dd44"
\& map = /boot/map
\& prompt
\& timeout = 100
\& vga = normal
+\& #password =
\& #default = Linux
\&
\& ### LILO per\-image section ###
\&
-\& #boot = /dev/sda
-\& boot = /dev/disk/by\-id/ata\-SAMSUNG_SV1604N_S01FJ10X999999
-\&
-\& image = /boot/vmlinuz\-3.12\-trunk\-686
+\& image = /boot/vmlinuz\-3.17\-trunk\-686
\& label = "Linux"
\& #root = /dev/sda1
\& #root = "UUID=18843936\-00f9\-4df0\-a373\-000d05a5dd44"
\& # restricted
\& # alias = 1
\& # optional
-\& initrd = /boot/initrd.img\-3.12\-trunk\-686
+\& initrd = /boot/initrd.img\-3.17\-trunk\-686
\&
-\& image = /boot/vmlinuz\-3.2.0\-4\-686
+\& image = /boot/vmlinuz\-3.14\-trunk\-686
\& label = "Linux Old"
\& #root = /dev/sda1
\& #root = "UUID=18843936\-00f9\-4df0\-a373\-000d05a5dd44"
\& # restricted
\& # alias = 2
\& # optional
-\& initrd = /boot/initrd.img\-3.2.0\-4\-686
+\& initrd = /boot/initrd.img\-3.14\-trunk\-686
.Ve
.SH "COPYRIGHT and LICENSE"
.IX Header "COPYRIGHT and LICENSE"
-Copyright (C) 2011\-2014 Joachim Wiedorn
+Copyright (C) 2011\-2015 Joachim Wiedorn
.PP
This script is free software; you can redistribute it and/or modify
it under the terms of the \s-1GNU\s0 General Public License as published by
(at your option) any later version.
.SH "AUTHOR"
.IX Header "AUTHOR"
-\&\fBlilconfig\fR was written by Joachim Wiedorn.
+\&\fBliloconfig\fR was written by Joachim Wiedorn.
.PP
This manual page was written by Joachim Wiedorn <joodevel at joonet.de>.
.SH "SEE ALSO"
manpage: LILOCONFIG
section: 8
title: liloconfig documentation
-version: 24.1
-datum: 2014-10-13
+version: 24.2
+datum: 2015-11-22
=encoding utf8
#large-memory
lba32
- boot = /dev/sda
+ #boot = /dev/sda
+ boot = /dev/disk/by-id/ata-SAMSUNG_SV1604N_S01FJ10X999999
#root = /dev/sda1
root = "UUID=18843936-00f9-4df0-a373-000d05a5dd44"
map = /boot/map
prompt
timeout = 100
vga = normal
+ #password =
#default = Linux
### LILO per-image section ###
- #boot = /dev/sda
- boot = /dev/disk/by-id/ata-SAMSUNG_SV1604N_S01FJ10X999999
-
- image = /boot/vmlinuz-3.12-trunk-686
+ image = /boot/vmlinuz-3.17-trunk-686
label = "Linux"
#root = /dev/sda1
#root = "UUID=18843936-00f9-4df0-a373-000d05a5dd44"
# restricted
# alias = 1
# optional
- initrd = /boot/initrd.img-3.12-trunk-686
+ initrd = /boot/initrd.img-3.17-trunk-686
- image = /boot/vmlinuz-3.2.0-4-686
+ image = /boot/vmlinuz-3.14-trunk-686
label = "Linux Old"
#root = /dev/sda1
#root = "UUID=18843936-00f9-4df0-a373-000d05a5dd44"
# restricted
# alias = 2
# optional
- initrd = /boot/initrd.img-3.2.0-4-686
+ initrd = /boot/initrd.img-3.14-trunk-686
=head1 COPYRIGHT and LICENSE
-Copyright (C) 2011-2014 Joachim Wiedorn
+Copyright (C) 2011-2015 Joachim Wiedorn
This script is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
=head1 AUTHOR
-B<lilconfig> was written by Joachim Wiedorn.
+B<liloconfig> was written by Joachim Wiedorn.
This manual page was written by Joachim Wiedorn <joodevel at joonet.de>.
LILO primarily accesses the following parts of the system:
- The root file system partition is important for two reasons: first, LILO
+ The root file system partition is important for two reasons: first, LILO
sometimes has to tell the kernel where to look for it. Second, it is
frequently a convenient place for many other items LILO uses, such as
the boot sector, the /boot directory, and the kernels.
- The boot sector contains the first part of LILO's boot loader. It loads
- the much larger second-stage loader. Both loaders are typically stored
- in the file /boot/boot.b
- The kernel is loaded and started by the boot loader. Kernels typically
+ The boot sector contains the first part of LILO's boot loader. It loads
+ the much larger second-stage loader.
+ The kernel is loaded and started by the boot loader. Kernels typically
reside in the root directory or in /boot.
Note that many of the files LILO needs at boot time have to be accessible
LILO depends on the BIOS to load the following items:
- - /boot/boot.b
- /boot/map (created when running /sbin/lilo)
- all kernels
- the boot sectors of all other operating systems it boots
system. The Linux boot sector resides on the first hard disk and the second
disk is used later in the boot process.
-Only the location of the boot sector matters - everything else
-(/boot/boot.b, /boot/map, the root file system, a swap partition, other
-Linux file systems, etc.) can be located anywhere on the second disk,
-provided that the constraints described in section "BIOS restrictions" are
-met.
+Only the location of the boot sector matters - everything else (/boot/map,
+the root file system, a swap partition, other Linux file systems, etc.)
+can be located anywhere on the second disk, provided that the constraints
+described in section "BIOS restrictions" are met.
Two disks, Linux on second disk, first disk has an extended partition
Perl script to convert the LaTeX source of the user's guide to plain
ASCII.
-Files created after make in lilo/ (among others):
+Files created after make in lilo source directory (among others):
- lilo/boot.b
- Combined boot sector. make install puts this file into /boot
- lilo/chain.b
- Generic chain loader. make install puts this file into /boot
- lilo/os2_d.b
- Chain loader to load OS/2 from the second hard disk. make install
- puts this file into /boot
lilo/lilo
LILO (map) installer. make install puts this file into /sbin
- lilo/activate
- Simple boot partition setter.
lilo/dparam.com
- MS-DOS executable of the disk parameter dumper.
+ MS-DOS executable of the disk parameter dumper (optional).
Normal first-time installation
- run make to compile and assemble all parts.
- run make install to copy all LILO files to the directories where
they're installed. /sbin should now contain the file lilo, /usr/sbin
- should contain keytab-lilo.pl, and /boot should contain boot.b,
- chain.b, and os2_d.b.
+ should contain keytab-lilo.pl and /boot should contain some image
+ files (.bmp).
* E.g. /usr/src/lilo
restrictions"):
- a file system has to be created on the file system
- - the kernel and boot.b have to be copied to the floppy disk
+ - the kernel has to be copied to the floppy disk
- /sbin/lilo has to be run to create the map file
This can be as easy as
/sbin/mke2fs /dev/fd0
[ -d /fd ] || mkdir /fd
mount /dev/fd0 /fd
-cp /boot/boot.b /fd
cp /zImage /fd
echo image=/fd/zImage label=linux |
- /sbin/lilo -C - -b /dev/fd0 -i /fd/boot.b -c -m /fd/map
+ /sbin/lilo -C - -b /dev/fd0 -c -m /fd/map
umount /fd
The command line of /sbin/lilo is a little tricky. -C - takes the
configuration from standard input (naturally, one could also write the
-configuration into a file), -b /dev/fd0 specifies that the boot sector is
-written to the floppy disk, -i /fd/boot.b takes the first and second
-stage loaders from the floppy, -c speeds up the load process, and -m
+configuration into a file), -b /dev/fd0 specifies that the boot sector
+is written to the floppy disk, -c speeds up the load process and -m
/fd/map puts the map file on the floppy too.
MORE TERMINOLOGY
================
-A boot record is "accessible", if it exists on a primary parition,
+A boot record is "accessible", if it exists on a primary partition,
which may be marked "active"; or it is a Master Boot Record (MBR),
written to sector 0 of a drive.
partition which you are making bootable.
LILO variations: version 22.2 enforces the placement of the map file
-on the RAID parition. Version 22.3 eliminates the need for the
+on the RAID partition. Version 22.3 eliminates the need for the
boot.b and chain.b files, and relaxes the restriction that the
message file be on the RAID partition by copying it into the map
file. Likewise, any bitmap= file is copied into the map file, so it
-# /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)
# +-------------------------------------------------------------+
# 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 "
# 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"
# 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"
# liloconfig - creating a new lilo.conf file
#
#
-# Copyright 2011-2014 Joachim Wiedorn <joodevel at joonet.de>
+# Copyright 2011-2015 Joachim Wiedorn <joodevel at joonet.de>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
#---- global variables
my $prog = $0;
$prog =~ s#.*/##;
-my $version = "0.4";
+my $version = "0.5";
#---- parameter check
# h: help, v: verbose, f: force
#-------------------- subroutines --------------------
sub create_lilo_conf {
-
- my $found = 0;
- my $exit = 1;
-
- # search for root device in fstab and convert it
- $found = detect_root_device();
-
- # convert root device to boot device
- if ($found) { $found = convert_boot_device(); }
- # finally write new lilo.conf file
- if ($found) {
- if ($opt_u) { $exit = update_lilo_conf(); }
- else { $exit = write_lilo_conf(); }
+ my $exit = 1;
+ my $found1 = 0;
+ my $found2 = 0;
+ my $found3 = 0;
+
+ # read fstab and search for root device
+ $found1 = read_fstab();
+
+ ## STEP 1 ##
+ if ($found1 == 0)
+ # nothing found, exit by error
+ { $found2 = 0;}
+ elsif ($found1 == 1)
+ # identify root device: root_dev and root_id
+ { $found2 = convert_root_device(); }
+ elsif ($found1 == 2)
+ # nothing found, but exit successfully
+ { $exit = 0; $found2 = 0;}
+
+ ## STEP 2 ##
+ if ($found2 == 0)
+ # nothing found, exit by error
+ { $found3 = 0;}
+ elsif ($found2 == 1)
+ # convert root device to boot device
+ { $found3 = convert_boot_device(); }
+ elsif ($found2 == 2)
+ # nothing found, but exit successfully
+ { $exit = 0; $found2 = 3;}
+
+ ## STEP 3 ##
+ if ($found3 == 0)
+ # nothing found, exit by error
+ { $exit = 1;}
+ elsif ($found3 == 1) {
+ if ((-f $liloconf) and not (-w $liloconf)) {
+ print "E: Have no write permissions to $liloconf !\n";
+ $exit = 1;
+ }
+ else {
+ # finally write new/updated lilo.conf file
+ if ($opt_u) { $exit = update_lilo_conf(); }
+ else { $exit = write_lilo_conf(); }
+ }
}
+ elsif ($found3 == 2)
+ # nothing found, but exit successfully
+ { $exit = 0;}
return $exit;
}
-sub detect_root_device {
-
- # read fstab and find root device;
- my $found = read_fstab();
-
- # identify root device: root_dev and root_id
- if ($found) { $found = convert_root_device(); }
-
- return $found;
-}
-
sub read_fstab {
my $root_part;
print "E: It seems you want configure the base filesystem \n" .
"and I'm therefore simply going to exit successfully \n" .
"without trying to actually configure LILO properly. \n";
- $found = 0;
+ $found = 2;
}
if ($broken_fstab) {
print "E: It seems the file /etc/fstab is not properly \n" .
if (not -l "$uuidpath/$root_id") {
if($opt_v) { print "W: could not find UUID for $root_disk!\n"; }
- ## than we want use root_dev in lilo.conf
- #$found = 0;
+ # than we will use root_dev in lilo.conf
}
else {
# finally add uuid label
if(not -l "$boot_id") {
if($opt_v) { print "W: could not find DISK ID for $boot_disk!\n"; }
- ## not so important, than using boot_dev in lilo.conf
- #$found = 0;
+ # not so important. Then using boot_dev in lilo.conf
}
}
print MYFH_NEW $oldline;
}
}
+
close(MYFH_TMP);
close(MYFH_NEW);
}
my $oldline = '';
my $newline = '';
my $ok = 0;
-
+
open(MYFH_NEW, "> $liloconfnew") or die "Cannot open file: $!";
open(MYFH_TMP, "< $conftmp_2") or die "Cannot read file: $!";
print MYFH_NEW $oldline;
}
}
+
close(MYFH_TMP);
close(MYFH_NEW);
}
#large-memory
lba32
- boot = /dev/sda
+ #boot = /dev/sda
+ boot = /dev/disk/by-id/ata-SAMSUNG_SV1604N_S01FJ10X999999
#root = /dev/sda1
root = "UUID=18843936-00f9-4df0-a373-000d05a5dd44"
map = /boot/map
prompt
timeout = 100
vga = normal
+ #password =
#default = Linux
### LILO per-image section ###
- #boot = /dev/sda
- boot = /dev/disk/by-id/ata-SAMSUNG_SV1604N_S01FJ10X999999
-
- image = /boot/vmlinuz-3.5.0-trunk-686
+ image = /boot/vmlinuz-3.17-trunk-686
label = "Linux"
#root = /dev/sda1
#root = "UUID=18843936-00f9-4df0-a373-000d05a5dd44"
# restricted
# alias = 1
# optional
- initrd = /boot/initrd.img-3.5.0-trunk-686
+ initrd = /boot/initrd.img-3.17-trunk-686
- image = /boot/vmlinuz-3.2.0-4-686
+ image = /boot/vmlinuz-3.14-trunk-686
label = "Linux Old"
#root = /dev/sda1
#root = "UUID=18843936-00f9-4df0-a373-000d05a5dd44"
# restricted
# alias = 2
# optional
- initrd = /boot/initrd.img-3.2.0-4-686
+ initrd = /boot/initrd.img-3.14-trunk-686
=head1 COPYRIGHT and LICENSE
-Copyright (C) 2011-2014 Joachim Wiedorn
+Copyright (C) 2011-2015 Joachim Wiedorn
This script is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
# -*- makefile -*-
#
-# Copyright 2009-2014 Joachim Wiedorn
+# Copyright 2009-2015 Joachim Wiedorn
# All rights reserved.
#
# Licensed under the terms contained in the file 'COPYING'
*
* Copyright 1992-1998 Werner Almesberger
* Copyright 1999-2005 John Coffman
- * Copyright 2009-2011 Joachim Wiedorn
+ * Copyright 2009-2015 Joachim Wiedorn
* All rights reserved.
*
* Licensed under the terms contained in the file 'COPYING'
fprintf(stderr, "*****Fatal: INT != 4\n");
return 1;
}
- if (sizeof(long)>sizeof(int))
+ if (sizeof(int32_t)>sizeof(int))
fprintf(stderr, "**Note: LONG is bigger than INT\n");
return 0;
*
* Copyright 1992-1998 Werner Almesberger
* Copyright 1999-2005 John Coffman
- * Copyright 2009-2011 Joachim Wiedorn
+ * Copyright 2009-2015 Joachim Wiedorn
* All rights reserved.
*
* Licensed under the terms contained in the file 'COPYING'
#include <sys/stat.h>
#endif
+#include <inttypes.h>
+#define PTR_WIDTH ((int) (sizeof(intptr_t) * 2))
+
#ifndef PAGE_SIZE
# define PAGE_SIZE 4096U
#endif
*
* Copyright 1992-1997 Werner Almesberger
* Copyright 1999-2006 John Coffman
- * Copyright 2009-2014 Joachim Wiedorn
+ * Copyright 2009-2015 Joachim Wiedorn
* All rights reserved.
*
* Licensed under the terms contained in the file 'COPYING'
struct stat st;
int duplicate = 0, invalid = 0, ret = 0, ntcaution = 0;
int raidcaution = 0;
- long codes = 0L;
+ int32_t codes = 0L;
/* called from raid_setup & from geo_open */
/* allow only 1 call */
walk->next = disktab;
vm[j].dt = disktab = walk;
#if BETA_TEST
- if (verbose >= 4) printf("Allocated DT entry for device %04X ptr=%08lx\n", vm[j].device, (long)walk);
+ if (verbose >= 4) printf("Allocated DT entry for device %04X ptr=%0*" PRIxPTR "\n", vm[j].device, , PTR_WIDTH, (intptr_t)walk);
#endif
}
- if (verbose>=2) printf("device codes (user assigned pf) = %lX\n", codes);
+ if (verbose>=2) printf("device codes (user assigned pf) = %" PRIX32 "\n", codes);
/* mark those BIOS codes that are already used in the disk=/bios= table */
}
}
- if (verbose>=2) printf("device codes (user assigned) = %lX\n", codes);
+ if (verbose>=2) printf("device codes (user assigned) = %" PRIX32 "\n", codes);
for (i=0; i<ndevs; i++) {
bios = vm[i].bios.probe;
}
}
- if (verbose>=2) printf("device codes (BIOS assigned) = %lX\n", codes);
+ if (verbose>=2) printf("device codes (BIOS assigned) = %" PRIX32 "\n", codes);
for (bios=i=0; i<ndevs; i++) {
int j;
walk->next = disktab;
vm[i].dt = disktab = walk;
#if BETA_TEST
- if (verbose >= 4) printf("Allocated DT entry for device %04X ptr=%08lx\n", vm[i].device, (long)walk);
+ if (verbose >= 4) printf("Allocated DT entry for device %04X ptr=%0*" PRIxPTR "\n", vm[i].device, PTR_WIDTH, (intptr_t)walk);
#endif
}
j = vm[i].dt->bios = vm[i].bios.actual;
inited = 1;
}
- if (verbose>=2) printf("device codes (canonical) = %lX\n", codes);
+ if (verbose>=2) printf("device codes (canonical) = %" PRIX32 "\n", codes);
for (bios=8*sizeof(codes)-1; !(codes&(1L<<bios)) && bios>=0; ) bios--;
/* edit.c - Bitmap file manipulation and editing
*
* Copyright 2002-2004 John Coffman
- * Copyright 2009-2011 Joachim Wiedorn
+ * Copyright 2009-2015 Joachim Wiedorn
* All rights reserved.
*
* Licensed under the terms contained in the file 'COPYING'
} tm;
static MENUTABLE *menu = &tm.mt;
static BITMAPLILOHEADER *lh = (void*)(tm.buffer +
- ((long)&tm.mt.row - (long)&tm.bmlh.row));
+ ((intptr_t)&tm.mt.row - (intptr_t)&tm.bmlh.row));
/* a convenience definition */
#define mn tm.mt
*
* Copyright 1992-1998 Werner Almesberger
* Copyright 1999-2005 John Coffman
- * Copyright 2009-2014 Joachim Wiedorn
+ * Copyright 2009-2015 Joachim Wiedorn
* All rights reserved.
*
* Licensed under the terms contained in the file 'COPYING'
#endif
#ifndef REISERFS_IOC_UNPACK
-#define REISERFS_IOC_UNPACK _IOW(0xCD,1,long)
+#define REISERFS_IOC_UNPACK _IOW(0xCD,1,int32_t)
#endif
#ifndef REISER4_SUPER_MAGIC
/* (*(__u32 *)"R4Sb"); */
#endif
#ifndef REISER4_IOC_UNPACK
-#define REISER4_IOC_UNPACK _IOW(0xCD,1,long)
+#define REISER4_IOC_UNPACK _IOW(0xCD,1,int32_t)
#endif
#endif
for (walk = disktab; walk; walk = walk->next)
if (walk->device == (device & D_MASK(device))) break;
#if BETA_TEST
- if (verbose>=5) printf("walk=%08lx\n", (long)walk);
+ if (verbose>=5) printf("walk=%0*" PRIxPTR "\n", PTR_WIDTH, (intptr_t)walk);
#endif
#if 1
*
* Copyright 1992-1998 Werner Almesberger
* Copyright 1999-2005 John Coffman
- * Copyright 2009-2011 Joachim Wiedorn
+ * Copyright 2009-2015 Joachim Wiedorn
* All rights reserved.
*
* Licensed under the terms contained in the file 'COPYING'
unsigned char heads;
unsigned char sectors;
unsigned short cylinders;
- unsigned long start;
+ uint32_t start;
};
/* hd/ide ctl's that pass (arg) ptrs to user space are numbered 0x030n/0x031n */
#define MAJOR(dev) (unsigned int)((((dev_t)(dev) >> 8) & 0xfff) | ((unsigned int) ((dev_t)(dev) >> 32) & ~0xfff))
#define MINOR(dev) (unsigned int)(((dev_t)(dev) & 0xff) | ((unsigned int) ((dev_t)(dev) >> 12) & ~0xff))
#define MKDEV(major,minor) (((minor & 0xff) | ((major & 0xfff) << 8) \
- | (((unsigned long long int) (minor & ~0xff)) << 12) \
- | (((unsigned long long int) (major & ~0xfff)) << 32)))
+ | (((uint64_t) (minor & ~0xff)) << 12) \
+ | (((uint64_t) (major & ~0xfff)) << 32)))
#else
#include <sys/sysmacros.h>
#ifdef major
*
* Copyright 1992-1998 Werner Almesberger
* Copyright 1999-2007 John Coffman
- * Copyright 2009-2014 Joachim Wiedorn
+ * Copyright 2009-2015 Joachim Wiedorn
* All rights reserved.
*
* Licensed under the terms contained in the file 'COPYING'
"l=%d, ll=%d, f=%d, d=%d, ld=%d\n",
MAX_IMAGES, (int)sizeof(char),
(int)sizeof(short), (int)sizeof(int),
- (int)sizeof(long), (int)sizeof(
+ (int)sizeof(int32_t), (int)sizeof(
#if !__MSDOS__
- long
+ int64_t),
+#else
+ int32_t),
#endif /* !__MSDOS__ */
- long),
(int)sizeof(float), (int)sizeof(double),
(int)sizeof(long double)
);
if (*(param = (*argv)+2)) argc++;
else if (argc) param = *++argv;
else reboot_arg = "";
-
+
while (argc) {
if (!reboot_arg)
*(reboot_arg = alloc(strlen(param)+1)) = 0;
strcat(reboot_arg, param);
argc--;
}
-#if 0
-fprintf(errstd,"REBOOT=\"%s\"\n", reboot_arg);
-#endif
break;
#if !__MSDOS__
case 's':
param = *++argv;
argc--;
}
- if (param)
+ if (param)
verbose = to_number(param);
else
if (verbose<0) verbose = 1;
}
printf(" * Copyright (C) 1992-1998 Werner Almesberger (until v20)\n"
" * Copyright (C) 1999-2007 John Coffman (until v22)\n"
- " * Copyright (C) 2009-2014 Joachim Wiedorn (since v23)\n"
+ " * Copyright (C) 2009-2015 Joachim Wiedorn (since v23)\n"
"This program comes with ABSOLUTELY NO WARRANTY. This is free software \n"
"distributed under the BSD License (3-clause). Details can be found in \n"
"the file COPYING, which is distributed with this software.\n"
);
if (verbose>0) {
#if !__MSDOS__
-#include <sys/utsname.h>
+ #include <sys/utsname.h>
struct utsname buf;
-#endif
- printf("Compiled at %s on %s%s\n", __TIME__, __DATE__, semi);
-#if !__MSDOS__
if (verbose>=2 && uname(&buf)==0) {
printf("Running %s kernel %s on %s\n",
buf.sysname, buf.release, buf.machine);
*
* Copyright 1992-1998 Werner Almesberger
* Copyright 1999-2006 John Coffman
- * Copyright 2009-2014 Joachim Wiedorn
+ * Copyright 2009-2015 Joachim Wiedorn
* All rights reserved.
*
* Licensed under the terms contained in the file 'COPYING'
#if !__MSDOS__
#define INT4 int
#else
-#define INT4 long
+#define INT4 int32_t
#endif /* !__MSDOS__ */
/* This is the stuff to check the configuration:
; mbr.S - Master Boot Record to boot first partition marked active
;
; Copyright 2002-2004 John Coffman
-; Copyright 2009-2011 Joachim Wiedorn
+; Copyright 2009-2015 Joachim Wiedorn
; All rights reserved.
;
; Licensed under the terms contained in the file 'COPYING'
#if EXT_PART
stage: .byte STAGE_MBR2 ! search extended partitions, too
#else
-stage: .byte STAGE_MBR ! search primary parition only
+stage: .byte STAGE_MBR ! search primary partition only
#endif
.org PARTS_LOAD+6
*
* Copyright 1992-1998 Werner Almesberger
* Copyright 1999-2005 John Coffman
- * Copyright 2009-2014 Joachim Wiedorn
+ * Copyright 2009-2015 Joachim Wiedorn
* All rights reserved.
*
* Licensed under the terms contained in the file 'COPYING'
#if 1
int part_max, count, number, fd;
struct partition pt [PART_MAX_MAX+1];
- long long daddr [PART_MAX_MAX+1];
+ int64_t daddr [PART_MAX_MAX+1];
int modify=0;
part_max = read_partitions(part, extended_pt ? PART_MAX_MAX : 0,
if (fstat(fd,&st) < 0) die("stat: %s : %s", part,strerror(errno));
if (!S_ISBLK(st.st_mode) && !force_fs) die("%s not a block device",part);
if (st.st_rdev != (st.st_rdev & has_partitions(st.st_rdev)))
- die("%s is not a master device with a primary parition table",part);
+ die("%s is not a master device with a primary partition table",part);
if (read(fd,&buf,SECTOR_SIZE) != SECTOR_SIZE) die("read %s: %s",part, strerror(errno));
cp = cfg_get_strg(cf_options,"force-backup");
/* partition table read */
int read_partitions(char *part, int max, int *volid,
- struct partition *p, long long *where)
+ struct partition *p, int64_t *where)
{
int fd, i;
unsigned int second, base;
struct partition pt[PART_MAX];
BOOT_PARAMS_1 hdr;
struct stat st;
- long long daddr;
+ int64_t daddr;
if ((fd=open(part,O_RDONLY))<0) die("Cannot open '%s'", part);
if (fstat(fd,&st)<0) die("Cannot fstat '%s'", part);
*
* Copyright 1992-1998 Werner Almesberger
* Copyright 1999-2004 John Coffman
- * Copyright 2009-2011 Joachim Wiedorn
+ * Copyright 2009-2015 Joachim Wiedorn
* All rights reserved.
*
* Licensed under the terms contained in the file 'COPYING'
PTW_mask=7, PTW_NTFS=8};
-#define LLSECTORSIZE ((long long)SECTOR_SIZE)
+#define LLSECTORSIZE ((int64_t)SECTOR_SIZE)
#if __GLIBC__ < 2 || __GLIBC_MINOR__ < 1
-typedef long long lloff_t;
+typedef int64_t lloff_t;
#ifdef _syscall5
lloff_t lseek64(unsigned int fd, lloff_t offs, unsigned int whence);
/* Install a new MBR (Master Boot Record) */
int read_partitions(char *part, int max, int *volid,
- struct partition *p, long long *where);
+ struct partition *p, int64_t *where);
/* read all partitions & partition tables */
#endif
/* probe.c - BIOS probe utility
*
* Copyright 1999-2006 John Coffman
- * Copyright 2009-2013 Joachim Wiedorn
+ * Copyright 2009-2015 Joachim Wiedorn
* All rights reserved.
*
* Licensed under the terms contained in the file 'COPYING'
{
struct partition pt [PART_MAX_MAX+1];
int volid;
- long long where[PART_MAX_MAX+1];
+ int64_t where[PART_MAX_MAX+1];
int i,j;
int extd = (extended_pt || verbose>0);
}
if (verbose>=5) {
printf("\n");
- for (i=0; i<j; i++) printf("%4d%20lld%12d\n", i+1, where[i], (int)(where[i]/SECTOR_SIZE));
+ for (i=0; i<j; i++) printf("%4d%20" PRId64 "%12d\n", i+1, where[i], (int)(where[i]/SECTOR_SIZE));
}
}
while (--bios >= 0x80) {
get_geom(bios, &bdata);
if (verbose>=5) {
- printf("bios_dev: (0x%02X) vol-ID=%08X *PT=%08lX\n",
- bios, bdata.serial_no, (long)bdata.pt);
+ printf("bios_dev: (0x%02X) vol-ID=%08X *PT=%0*" PRIXPTR "\n",
+ bios, bdata.serial_no, PTR_WIDTH, (intptr_t)bdata.pt);
#ifdef DEBUG_PROBE
dump_pt((void*)bdata.pt);
#endif
/* probe.h - BIOS probe utility
*
* Copyright 1999-2005 John Coffman
- * Copyright 2009-2011 Joachim Wiedorn
+ * Copyright 2009-2015 Joachim Wiedorn
* All rights reserved.
*
* Licensed under the terms contained in the file 'COPYING'
unsigned int n_cyl;
unsigned int n_head;
unsigned int n_sect;
- long long n_sectors;
+ int64_t n_sectors;
short n_byte;
unsigned int edd_config_ptr;
};
unsigned int cylinders;
unsigned int heads;
unsigned int sectors;
- long long total_sectors;
+ int64_t total_sectors;
unsigned short sector_size;
unsigned short offset,
/* Step A. Copy the data buffer into the work buffer */
/* done */
#if SHS_DEBUG>=1
- for (i=0; i<16; i++) printf("W[%d] = %08lX\n", i, W[i]);
+ for (i=0; i<16; i++) printf("W[%d] = %08" PRIX32 "\n", i, W[i]);
#endif
/* Step B. Expand the 16 words into 64 temporary data words */
/* version.h
*
* Copyright 2005-2007 John Coffman
- * Copyright 2009-2014 Joachim Wiedorn
+ * Copyright 2009-2015 Joachim Wiedorn
* All rights reserved.
*
* Licensed under the terms contained in the file 'COPYING'
#define VERSION_H
#define VERSION_MAJOR 24
-#define VERSION_MINOR 1
+#define VERSION_MINOR 2
#define VERSION_EDIT ""
-#define VERSION_DATE "17-October-2014"
+#define VERSION_DATE "22-November-2015"
#endif
projects / rrq / maintain_lilo.git / commitdiff