path: root/user/lilo/adelie.patch

Adjust paths so that lilo has its own dir in /etc and /boot.

--- lilo-24.2/make.vars	2013-06-07 02:50:30.000000000 -0500
+++ lilo-24.2/make.vars	2020-03-19 15:50:13.710057044 -0500
@@ -90,8 +90,8 @@ OPT=-Os
 #
 
 SBIN_DIR=/sbin
-CFG_DIR=/etc
-BOOT_DIR=/boot
+CFG_DIR=/etc/lilo
+BOOT_DIR=/boot/lilo
 USRSBIN_DIR=/usr/sbin
 BUILTIN=1
 
--- lilo-24.2/src/config.h	2011-06-22 02:13:58.000000000 -0500
+++ lilo-24.2/src/config.h	2020-03-19 15:34:21.320045281 -0500
@@ -39,8 +39,8 @@
 #define DFL_CHAIN   LILO_DIR "/chain.b" /* default chain loader */
 #define DFL_MBR	    LILO_DIR "/mbr.b"	/* default MBR */
 #else
-#define CFG_DIR	    "/etc"		/* location of configuration files */
-#define BOOT_DIR    "/boot"		/* location of boot files */
+#define CFG_DIR	    "/etc/lilo"		/* location of configuration files */
+#define BOOT_DIR    "/boot/lilo"		/* location of boot files */
 #define BACKUP_DIR  BOOT_DIR /* boot sector and partition table backups */
 #define DFL_CONFIG  CFG_DIR "/lilo.conf"/* default configuration file */
 #define DFL_DISKTAB CFG_DIR "/disktab"	/* LILO's disk parameter table */
--- lilo-24.2/sample/lilo.example.conf	2015-11-20 14:50:03.000000000 -0600
+++ lilo-24.2/sample/lilo.example.conf	2020-03-19 15:53:08.030059197 -0500
@@ -1,4 +1,4 @@
-# /etc/lilo.conf  -   systemwide LILO configuration (LILO 24)
+# /etc/lilo/lilo.conf  -   systemwide LILO configuration (LILO 24)
 # details see in manpages: lilo(8) and lilo.conf(5)
 
 # +-------------------------------------------------------------+
@@ -50,7 +50,7 @@ root = /dev/sda1
 # Specifies the location of the map file. Lilo creates the (sector) 
 # map file of direct sector addresses which are independent of any
 # filesystem.
-map = /boot/map
+map = /boot/lilo/map
 
 # ---------------------------------------------------------------
 
@@ -63,7 +63,7 @@ install = menu
 # A) Customized boot message for choice 'text'.
 # For the simple text menu you can set an extra message in the 
 # created file. Its text will be displayed before boot prompt.
-#message = /boot/message.txt
+#message = /boot/lilo/message.txt
 
 # B) Configuration of the scheme for choice 'menu'.
 # Use following coding: <text>:<highlight>:<border>:<title>
@@ -83,7 +83,7 @@ menu-scheme = Wb:Yr:Wb:Wb
 #   with 16 colors:    onlyblue, tuxlogo, inside
 #   with 256 colors:   coffee
 #   for Debian:        debianlilo, debian, debian-de
-#bitmap = /boot/tuxlogo.bmp
+#bitmap = /boot/lilo/gfx/tuxlogo.bmp
 
 # ---------------------------------------------------------------
 
--- lilo-24.2/scripts/liloconfig	2015-11-21 18:00:21.000000000 -0600
+++ lilo-24.2/scripts/liloconfig	2020-03-19 15:23:42.240037388 -0500
@@ -44,7 +44,7 @@ getopts('hvfu');
 pod2usage(1) if $opt_h;
 
 #---- other variables
-our $liloconf  = "/etc/lilo.conf";
+our $liloconf  = "/etc/lilo/lilo.conf";
 our $conftmp_1 = "/tmp/lilotmp1";
 our $conftmp_2 = "/tmp/lilotmp2";
 our $liloconfold = $liloconf . ".old";
@@ -54,7 +54,7 @@ our $fstabconf = "/etc/fstab";
 our $idpath = "/dev/disk/by-id";
 our $uuidpath = "/dev/disk/by-uuid";
 our $lblpath = "/dev/disk/by-label";
-our $template = "/usr/share/doc/lilo/examples/lilo.example.conf.gz";
+our $template = "/etc/lilo/lilo.conf.template";
 
 our $rootpart;    # found root part
 our $root_dev;    # /dev/hdX9, /dev/sdX9, /dev/md/*
@@ -399,8 +401,12 @@ sub copy_template {
 	
 	# copy template config
 	if (-f $template) {
-		system("gzip -d -c $template >$conftmp_1") if ($template =~ /\.gz$/);
-		system("cat $template >$conftmp_1") if ($template =~ /\.conf$/);
+		if ($template =~ /\.gz$/) {
+			system("gzip -d -c $template >$conftmp_1");
+		}
+		else {
+			system("cat $template >$conftmp_1");
+		}
 
 		open(CONFTMP1, "<$conftmp_1") or die "$prog: couldn't open $conftmp_1: $!\n";
 		open(CONFTMP2, ">$conftmp_2") or die "$prog: couldn't open $conftmp_2: $!\n";
@@ -418,7 +418,7 @@ sub copy_template {
 	}
 	else {
 		open(CONFTMP2, ">$conftmp_2") or die "$prog: couldn't open $conftmp_2: $!\n";
-		print CONFTMP2 "# /etc/lilo.conf
+		print CONFTMP2 "# /etc/lilo/lilo.conf
 
 ### LILO global section ###
 
@@ -426,7 +426,7 @@ sub copy_template {
 lba32
 boot = /dev/sda
 root = /dev/sda1
-map = /boot/map
+map = /boot/lilo/map
 install = menu
 menu-scheme = Wb:Yr:Wb:Wb
 prompt
@@ -781,7 +781,7 @@ lilo.conf file you find many useful comm
 Please pay attention about error messages if liloconfig cannot find
 any images (/boot/vmlinuz*) oder image symlinks (/vmlinuz, /vmlinu.old).
 Then you need to search for images by ourself and make some changes
-in the '/etc/lilo.conf' file. Otherwise no bootloader can be installed
+in the '/etc/lilo/lilo.conf' file. Otherwise no bootloader can be installed
 with '/sbin/lilo'.
 
 =head1 OPTIONS
@@ -808,7 +808,7 @@ Force overriding/update of boot line in
 
 =head1 EXAMPLES
 
-Lines in the configuration file /etc/lilo.conf:
+Lines in the configuration file /etc/lilo/lilo.conf:
 
   ### LILO global section ###
 
@@ -818,7 +818,7 @@ Lines in the configuration file /etc/lil
   boot = /dev/disk/by-id/ata-SAMSUNG_SV1604N_S01FJ10X999999
   #root = /dev/sda1
   root = "UUID=18843936-00f9-4df0-a373-000d05a5dd44"
-  map = /boot/map
+  map = /boot/lilo/map
   install = menu
   menu-scheme = Wb:Yr:Wb:Wb
   prompt
--- lilo-24.2/scripts/lilo-uuid-diskid	2014-10-16 16:53:29.000000000 -0500
+++ lilo-24.2/scripts/lilo-uuid-diskid	2020-03-19 15:28:07.360040662 -0500
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 #       lilo-uuid-diskid - convert boot and root options to diskid
-#                          and uuid in /etc/lilo.conf
+#                          and uuid in /etc/lilo/lilo.conf
 #
 #       Copyright 2010-2014 Joachim Wiedorn <joodevel at joonet.de>
 #       
@@ -41,7 +41,7 @@ getopts('hv');
 pod2usage(1) if $opt_h;
 
 #---- other variables
-our $liloconf = "/etc/lilo.conf";
+our $liloconf = "/etc/lilo/lilo.conf";
 our $liloconfold = $liloconf . ".old";
 our $liloconfnew = $liloconf . ".new";
 our $fstabconf = "/etc/fstab";
@@ -454,7 +454,7 @@ Print verbose messages.
 
 =head1 EXAMPLES
 
-Lines in the configuration file /etc/lilo.conf:
+Lines in the configuration file /etc/lilo/lilo.conf:
 
   #boot = /dev/sda
   boot = /dev/disk/by-id/ata-SAMSUNG_SV1604N_S01FJ10X999999
--- lilo-24.2/man/keytab-lilo.8	2010-06-28 15:41:18.000000000 -0500
+++ lilo-24.2/man/keytab-lilo.8	2020-03-19 16:01:06.730065109 -0500
@@ -37,7 +37,7 @@ to set the keyboard type when booting
 [using the 
 .B keytable
 parameter in
-.BR /etc/lilo.conf ].
+.BR /etc/lilo/lilo.conf ].
 
 .I kbd_layout
 should be the name of a map file which specifies the desired 
@@ -68,7 +68,7 @@ output, so you should redirect it to a s
 .B lilo
 has no particular restrictions on the name of keyboard translation
 files, but the suggested naming convention and location is
-.BI /boot/ mapping .ktl
+.BI /boot/lilo/ mapping .ktl
 (where
 .B .ktl
 stands for "Keyboard Table for Lilo").
@@ -86,11 +86,11 @@ respectively.
 
 .SH "EXAMPLES"
 .TP 
-.B keytab\-lilo dvorak >/boot/dvorak.ktl
+.B keytab\-lilo dvorak >/boot/lilo/dvorak.ktl
 
 This is the most common form of invocation; it simply compiles the
 given map file (in this case dvorak) and puts the result in
-.BR /boot/dvorak.ktl .
+.BR /boot/lilo/dvorak.ktl .
 
 .SH "AUTHOR"
 Werner Almesberger (almesber@bernina.ethz.ch).
--- lilo-24.2/man/lilo-uuid-diskid.8	2015-11-21 17:25:42.000000000 -0600
+++ lilo-24.2/man/lilo-uuid-diskid.8	2020-03-19 15:59:05.390063610 -0500
@@ -100,7 +100,7 @@ Print a brief help.
 Print verbose messages.
 .SH "EXAMPLES"
 .IX Header "EXAMPLES"
-Lines in the configuration file /etc/lilo.conf:
+Lines in the configuration file /etc/lilo/lilo.conf:
 .PP
 .Vb 2
 \&  #boot = /dev/sda
--- lilo-24.2/man/lilo.8	2015-11-21 17:25:31.000000000 -0600
+++ lilo-24.2/man/lilo.8	2020-03-19 16:01:39.580065515 -0500
@@ -108,7 +108,7 @@ Auxiliary uses:
 .SH "DESCRIPTION"
 .IX Header "DESCRIPTION"
 lilo installs a boot loader that will be activated the next time you boot
-your system. The default configuration file \fI/etc/lilo.conf\fR (see manpage
+your system. The default configuration file \fI/etc/lilo/lilo.conf\fR (see manpage
 \&\fIlilo.conf\fR\|(5)) will contain most options, but many, including those which
 override the configuration file, may be specified  on the command line.
 .SH "OPTIONS"
@@ -140,7 +140,7 @@ Speeds up the booting especially from fl
 .IP "\fB\-C\fR \fIconfig-file\fR" 4
 .IX Item "-C config-file"
 Set another pathname and filename for the configuration file. The default
-configuration file is \fI/etc/lilo.conf\fR.
+configuration file is \fI/etc/lilo/lilo.conf\fR.
 .IP "\fB\-d\fR \fIdelay-time\fR" 4
 .IX Item "-d delay-time"
 Set the delay time in tenths of a second ('20' = 2 sec) before automatically
@@ -171,7 +171,7 @@ header will be lost. It can be restored
 a text-based backup for the \s-1LILO\s0 header information.
 .IP "\fB\-f\fR \fIdisk-tab\fR" 4
 .IX Item "-f disk-tab"
-Set another disk geometry parameter file. The default is \fI/etc/disktab\fR.
+Set another disk geometry parameter file. The default is \fI/etc/lilo/disktab\fR.
 .IP "\fB\-F\fR" 4
 .IX Item "-F"
 Override boot sector check for filesystems (e.g., swap, ext4, xfs ...) which
@@ -204,7 +204,7 @@ addresses, allowing access to all partit
 (This is the default geometry).
 .IP "\fB\-m\fR \fImap-file\fR" 4
 .IX Item "-m map-file"
-Use another map file instead of the default file /boot/map.
+Use another map file instead of the default file /boot/lilo/map.
 .IP "\fB\-M\fR \fImaster-device\fR \fB{mbr|ext}\fR" 4
 .IX Item "-M master-device {mbr|ext}"
 Install a Master Boot Record on the device specified as master-device, selecting
@@ -232,7 +232,7 @@ sector. Compare with the '\-F' flag, whi
 boot sector.
 .Sp
 \&\fB<global\-option>\fR allows the passing of any global option which may
-appear in the global section (top) of the  configuration file (\fI/etc/lilo.conf\fR).
+appear in the global section (top) of the  configuration file (\fI/etc/lilo/lilo.conf\fR).
 For instance \fI'\-P nowarn'\fR will pass the 'nowarn' option, just as though 'nowarn'
 appeared in the configuration file (same as the '\-w' switch).  Similarly
 \&\fI'\-P timeout=50'\fR will add or override the 'timeout=' line in the  configuration
@@ -241,7 +241,7 @@ line option switches. However, it is not
 cause an override of other options; e.g. '\-g' (\-P geometric), '\-L' (\-P lba32).
 .IP "\fB\-q\fR" 4
 .IX Item "-q"
-List the currently mapped files. \fBlilo\fR maintains a file, by default \fI/boot/map\fR,
+List the currently mapped files. \fBlilo\fR maintains a file, by default \fI/boot/lilo/map\fR,
 containing each name and location of the kernel(s) to boot. This option will list
 the names therein.  Use with \fB\-v\fR for more detailed information about the
 installed boot loader.
@@ -249,7 +249,7 @@ installed boot loader.
 .IX Item "-r root-directory"
 Before doing anything else, do a \fI'chroot'\fR to the indicated directory. The new
 root directory must contain a \fI/dev\fR directory and may need a /boot directory.
-It may also need an \fI/etc/lilo.conf\fR file.
+It may also need an \fI/etc/lilo/lilo.conf\fR file.
 .IP "\fB\-R\fR \fIcommand-line\fR" 4
 .IX Item "-R command-line"
 This  option sets the default command for the boot loader for the next time it
@@ -267,13 +267,13 @@ Refer to \fI\fIlilo.conf\fI\|(5)\fR for
 .IP "\fB\-s\fR \fIsave-file\fR" 4
 .IX Item "-s save-file"
 When lilo writes a new boot sector, it preserves the former contents of the boot
-sector in a file, named by default /boot/boot.NNNN, where \s-1NNNN\s0 is the hexadecimal
+sector in a file, named by default /boot/lilo/boot.NNNN, where \s-1NNNN\s0 is the hexadecimal
 representation of the major and minor device numbers of the drive/partition.
 .Sp
 This option defines the backup save file in one of three ways: a save directory
-(default is '/boot') using the default filename 'boot.NNNN' in the defined
+(default is '/boot/lilo') using the default filename 'boot.NNNN' in the defined
 directory; a pathname template to which '.NNNN' is appended (default would be
-\&'/boot/boot'); or the full pathname of the file, which must include the correct
+\&'/boot/lilo/boot'); or the full pathname of the file, which must include the correct
 \&'.NNNN' suffix. When used with the \-u option, the full file pathname must be set.
 .IP "\fB\-S\fR \fIsave-file\fR" 4
 .IX Item "-S save-file"
@@ -386,7 +386,7 @@ removed from the command line before it
 noted.
 .IP "\fBlock\fR" 4
 .IX Item "lock"
-Locks the command line, as though 'lock' had been defined in \fI/etc/lilo.conf\fR.
+Locks the command line, as though 'lock' had been defined in \fI/etc/lilo/lilo.conf\fR.
 .IP "\fBmem=###[,K,M,G]\fR" 4
 .IX Item "mem=###[,K,M,G]"
 Set the maximum memory in the system in bytes, kilobytes, megabytes or gigabytes.
--- lilo-24.2/man/lilo.conf.5	2013-06-07 14:17:39.000000000 -0500
+++ lilo-24.2/man/lilo.conf.5	2020-03-19 16:01:57.970065742 -0500
@@ -25,13 +25,13 @@ lilo.conf \- configuration file for lilo
 .SH DESCRIPTION
 .LP
 This file, by default
-.IR /etc/lilo.conf ,
+.IR /etc/lilo/lilo.conf ,
 is read by the boot loader installer 'lilo' (see lilo(8)).
 .LP
 It might look as follows:
 .IP
 .nf
-# /etc/lilo.conf
+# /etc/lilo/lilo.conf
 #
 #  global options:
 boot=/dev/hda
@@ -111,7 +111,7 @@ All RAID installations should use only t
 multiple backups may be created.  The '.NNNN' suffix is the hexadecimal
 representation of the major and minor device numbers of the device or
 partition. If this option is not specified, the default name of boot sector
-backups is '/boot/boot.NNNN'. If a backup already exists, it will be
+backups is '/boot/lilo/boot.NNNN'. If a backup already exists, it will be
 preserved, rather than overwritten.  C.f., \fBforce-backup=\fP below.
 .TP
 .BI "bios-passes-dl=" <option>
@@ -334,7 +334,7 @@ viz.,
 .BI "disktab=" <disktab-file>
 Specifies the name of the disk parameter table.
 The map installer looks for
-.I /etc/disktab
+.I /etc/lilo/disktab
 if `disktab' is omitted. The use of disktabs is discouraged.
 .TP
 .BI "el-torito-bootable-CD"
@@ -436,7 +436,7 @@ The per-image password option `mandatory
 .TP
 .BI "map=" <map-file>
 Specifies the location of the map file. If `map' is omitted, the file
-.I /boot/map
+.I /boot/lilo/map
 is used.
 
 On machines with a pre-1998 BIOS, the EDD bios extensions which are required
@@ -812,7 +812,7 @@ requirements of the boot-installer parse
 an operator.  The kernel command line parser is very much simpler, and
 must not see any quotation marks.  Simply stated, only use the quotation
 marks within
-.IR /etc/lilo.conf .
+.IR /etc/lilo/lilo.conf .
 .TP
 .BI "vga=" <mode>
 This specifies the VGA text mode that should be selected when 
@@ -1027,7 +1027,7 @@ at the time the boot loader is installed
 the password, it should be specified: \fBpassword=""\fP.
 Passwords entered interactively are not required to be entered again if the
 boot installer is re-run. They are cached, in hashed form, in a companion
-file to the config-file, default name: \fB/etc/lilo.conf.crc\fP. If the 
+file to the config-file, default name: \fB/etc/lilo/lilo.conf.crc\fP. If the 
 config-file is updated, a warning message
 will be issued telling you to re-run \fIlilo \-p\fP to force re-creation of the
 password cache file.
--- lilo-24.2/man/liloconfig.8	2015-11-21 17:25:48.000000000 -0600
+++ lilo-24.2/man/liloconfig.8	2020-03-19 16:02:08.680065874 -0500
@@ -92,7 +92,7 @@ lilo.conf file you find many useful comm
 Please pay attention about error messages if liloconfig cannot find
 any images (/boot/vmlinuz*) oder image symlinks (/vmlinuz, /vmlinu.old).
 Then you need to search for images by ourself and make some changes
-in the '/etc/lilo.conf' file. Otherwise no bootloader can be installed
+in the '/etc/lilo/lilo.conf' file. Otherwise no bootloader can be installed
 with '/sbin/lilo'.
 .SH "OPTIONS"
 .IX Header "OPTIONS"
@@ -110,7 +110,7 @@ Force overriding existing lilo.conf.
 Force overriding/update of boot line in lilo.conf.
 .SH "EXAMPLES"
 .IX Header "EXAMPLES"
-Lines in the configuration file /etc/lilo.conf:
+Lines in the configuration file /etc/lilo/lilo.conf:
 .PP
 .Vb 1
 \&  ### LILO global section ###
@@ -121,7 +121,7 @@ Lines in the configuration file /etc/lil
 \&  boot = /dev/disk/by\-id/ata\-SAMSUNG_SV1604N_S01FJ10X999999
 \&  #root = /dev/sda1
 \&  root = "UUID=18843936\-00f9\-4df0\-a373\-000d05a5dd44"
-\&  map = /boot/map
+\&  map = /boot/lilo/map
 \&  install = menu
 \&  menu\-scheme = Wb:Yr:Wb:Wb
 \&  prompt