Remove obsolete image symlinks in /boot

diff --git a/debian/changelog b/debian/changelog
index 9d807ed713f8e21d071a078d197fb76ccd93c79e..a4ca04682d1ae33ebc6ed71dc6085586d31c00dd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ lilo (1:24.1-1) UNRELEASED; urgency=medium
   * Add hook scripts for saving kernel in /boot on XFS filesystems.
       These scripts can be found in dir. /usr/lib/lilo/ for optional
       installation. See: #566035
+  * Remove obsolete symlinks sarge.bmp and sid.bmp to /boot/debian.bmp.
+      Now using /boot/debian.bmp directly in /etc/lilo.conf.
 
  -- Joachim Wiedorn <ad_debian@joonet.de>  Fri, 17 Oct 2014 13:57:19 +0200
 

diff --git a/debian/lilo.postinst b/debian/lilo.postinst
index cc03366c6f51512501db480da5f545f9afdfab89..4ede5ea2da49c2c20966b119e5ec95267fb5bcf5 100644 (file)
--- a/debian/lilo.postinst
+++ b/debian/lilo.postinst
@@ -5,8 +5,6 @@
 
 set -e
 
-LNKS="sarge sid"
-
 if [ -f /usr/share/debconf/confmodule ]; then
   . /usr/share/debconf/confmodule
 fi
@@ -53,10 +51,6 @@ case "$1" in
                rm -f /boot/debian.bmp; fi
 
        install -m 0644  /usr/share/lilo/*.bmp  /boot
-       # stay compatible with old lilo 22.8
-       for i in ${LNKS}; do
-               ln -s debian.bmp /boot/${i}.bmp
-       done
 
        # Nasty part to create network block devices if needed. Bug#235805.
        if [ `uname -r | sed -e 's/-.*//g' -ne 's/\(^[0-9]\{1\}\.[0-9]\{1,2\}\).*/\1/p'` = "2.6" ] && \

diff --git a/debian/lilo.postrm b/debian/lilo.postrm
index edc59b9216c4bf7bee5dbb832239a2624d98da6d..f597e10d0a351c92f120029070bd948a461f9603 100644 (file)
--- a/debian/lilo.postrm
+++ b/debian/lilo.postrm
@@ -8,7 +8,6 @@ set -e
 CONF="/etc/lilo.conf"
 MMAP="/boot/map"
 BMPS="coffee debian debian-de inside onlyblue tuxlogo debianlilo"
-LNKS="sarge sid"
 
 # remove old-named config files
 dpkg-maintscript-helper rm_conffile \
@@ -35,10 +34,6 @@ case "$1" in
                for i in ${BMPS}; do
                        rm -f /boot/${i}.bmp /boot/${i}.dat;
                done
-               # stay compatible with old lilo 22.8
-               for i in ${LNKS}; do
-                       test -L /boot/${i}.bmp && rm -f /boot/${i}.bmp;
-               done
     ;;
        *)
                echo "postrm called with unknown argument \`$1'" >&2