[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[EFI] lilo-installer: don't use lilo for EFI machines



Hi,

Trivial patch to not use lilo when we're on an EFI machine. Depends on
the libdebian-installer patch to add the "efi" subarch.

-- 
Steve McIntyre, Cambridge, UK.                                steve@einval.com
"I can't ever sleep on planes ... call it irrational if you like, but I'm
 afraid I'll miss my stop" -- Vivek Dasmohapatra
mr diff: /home/steve/debian/d-i/d-i/packages/lilo-installer
diff --git a/debian/changelog b/debian/changelog
index c84a0c2..2950f5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lilo-installer (1.38) unstable; urgency=low
+
+  [ Steve McIntyre]
+  * Don't use lilo for */efi
+
+ -- Steve McIntyre <93sam@debian.org>  Tue, 21 Aug 2012 21:49:13 +0100
+
 lilo-installer (1.37) unstable; urgency=low
 
   * Team upload
diff --git a/debian/isinstallable b/debian/isinstallable
index 829ca29..303847a 100755
--- a/debian/isinstallable
+++ b/debian/isinstallable
@@ -7,12 +7,12 @@ log() {
 
 ARCH="$(archdetect)"
 case $ARCH in
-    i386/mac|amd64/mac)
+    i386/mac|amd64/mac|i386/efi|amd64/efi)
 	# LILO stands a better chance of working in BIOS compatibility mode,
 	# where /sys/firmware/efi doesn't exist.
 	# Note: depends on partman-efi to load the efivars module!
 	if [ -d /sys/firmware/efi ]; then
-		log "LILO not usable on Intel-based Macs without BIOS compatibility; use elilo"
+		log "LILO not usable on EFI PCs without BIOS compatibility; use elilo or grub-efi"
 		exit 1
 	fi
 	;;

mr diff: finished (1 ok)

Reply to: