From: Joachim Wiedorn <ad_debian@joonet.de>
Date: Sun, 15 Apr 2012 11:22:52 +0000 (+0200)
Subject: Fix support for linux 3.x
X-Git-Tag: debian/23.2-4~6
X-Git-Url: https://git.rrq.au/?a=commitdiff_plain;h=b0c6df20c3655109ad55a1fc7c3281fceb644693;p=rrq%2Fmaintain_lilo.git

Fix support for linux 3.x
---

diff --git a/debian/changelog b/debian/changelog
index 8f42ef0..56195db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+lilo (1:23.2-4) unstable; urgency=low
+
+  * Enable use of linux 3.x in liloconfig script.
+
+ -- Joachim Wiedorn <ad_debian@joonet.de>  Sat, 14 Apr 2012 22:56:42 +0200
+
 lilo (1:23.2-3) unstable; urgency=low
 
   * Fix tense use in debconf templates (thanks to Ivan Masar).
diff --git a/debian/patches/17_liloconfig-for-linux3.patch b/debian/patches/17_liloconfig-for-linux3.patch
new file mode 100644
index 0000000..17d428f
--- /dev/null
+++ b/debian/patches/17_liloconfig-for-linux3.patch
@@ -0,0 +1,39 @@
+Package:     lilo
+Subject:     liloconfig for linux 3.x
+Author:      Joachim Wiedorn <ad_debian at joonet.de>
+Forwarded:   yes
+Last-Update: 2012-04-15
+
+Add support for linux 3.x in script liloconfig.
+---
+
+diff -urN s16/scripts/liloconfig s17/scripts/liloconfig
+--- s16/scripts/liloconfig	2011-04-09 17:08:01.000000000 +0200
++++ s17/scripts/liloconfig	2012-04-15 10:18:15.936797140 +0200
+@@ -2,7 +2,7 @@
+ 
+ #       liloconfig -  creating a new lilo.conf file
+ #       
+-#       Copyright 2011 Joachim Wiedorn <ad_debian@joonet.de>
++#       Copyright 2011-2012 Joachim Wiedorn <ad_debian@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
+@@ -52,7 +52,7 @@
+ our $idpath = "/dev/disk/by-id";
+ our $uuidpath = "/dev/disk/by-uuid";
+ our $lblpath = "/dev/disk/by-label";
+-our $template = "/etc/lilo.conf_example";
++our $template = "/usr/share/doc/lilo/examples/lilo.example.conf.gz";
+ 
+ our $rootpart;    # found root part
+ our $root_dev;    # /dev/hdX9, /dev/sdX9, /dev/md/*
+@@ -456,7 +456,7 @@
+ 	my $nr2;
+ 
+ 	# search for kernel image files
+-	my @vmlinuz = readpipe("/bin/ls -t -1 /boot/vmlinuz-2* 2>/dev/null");
++	my @vmlinuz = readpipe("/bin/ls -t -1 /boot/vmlinuz-* 2>/dev/null");
+ 
+ 	# append to new lilo.conf
+ 	open(MYFH_NEW, ">> $liloconfnew") or die "Cannot open file: $!";
diff --git a/debian/patches/series b/debian/patches/series
index 3f38c9a..4649413 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@
 14_update-mkrescue-script.patch
 15_fix-typos-in-lilo-manpage.patch
 16_fix-typos-in-user-tex.patch
+17_liloconfig-for-linux3.patch
diff --git a/debian/patches/ubuntu.series b/debian/patches/ubuntu.series
index 0ea2228..8b7e4ea 100644
--- a/debian/patches/ubuntu.series
+++ b/debian/patches/ubuntu.series
@@ -14,3 +14,4 @@
 14_update-mkrescue-script.patch
 15_fix-typos-in-lilo-manpage.patch
 16_fix-typos-in-user-tex.patch
+17_liloconfig-for-linux3.patch