X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=debian%2Flilo.config;h=440c28237c27f2a84832e8d97da6b0e18da2995b;hb=570b9132b7f7b75f7add9d03e019fd689ab53f21;hp=d62e5e7fac3d19ce5f2649b0d8ee556cc1fb5174;hpb=e54ace12fd683ce1f41b25ed66641e40b84212b0;p=rrq%2Fmaintain_lilo.git

diff --git a/debian/lilo.config b/debian/lilo.config
index d62e5e7..440c282 100644
--- a/debian/lilo.config
+++ b/debian/lilo.config
@@ -1,4 +1,5 @@
 #!/bin/sh
+# debian/lilo.config for debconf to be executed before unpacking
 
 set -e
 
@@ -17,14 +18,6 @@ if [ ! -f /etc/lilo.conf ]; then
 	db_text high lilo/new-config || true
 	db_go
 else
-	# Check for deprecated PATH. Bug#267538
-	if grep -q "^bitmap=/usr/share/lilo/contrib" /etc/lilo.conf; then
-		db_beginblock
-		db_text high lilo/bad_bitmap || true
-		db_endblock
-		db_go
-	fi
-
 	if grep -q "^[[:space:]]*large-memory" /etc/lilo.conf; then
 		db_set lilo/add_large_memory false
 	else
@@ -38,20 +31,16 @@ else
 			have_to_run=1
 		fi
 	fi
-fi
 
-if [ x"$isfresh" = x"0" ]; then
-	if [ -e /boot/boot.b ]; then	
-		have_to_run=1
+	# Convert old options 'boot' and 'root' to newer diskid or uuid
+	if grep -q -E "^boot|^root|^\troot" /etc/lilo.conf; then
 		db_beginblock
-		db_text high lilo/upgrade || true
+		db_text high lilo/diskid_uuid || true
 		db_endblock
 		db_go
 	fi
 fi
 
-#db_set lilo/runme = false
-
 if [ x"$have_to_run" != x"0" ]; then
 	db_beginblock	
  	db_input high lilo/runme || true