From: Steve Langasek <vorlon@debian.org>
Date: Mon, 12 Mar 2007 10:44:09 +0000 (-0700)
Subject: Imported Debian patch 3.6-3.1
X-Git-Tag: debian/3.6-3.1
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=refs%2Ftags%2Fdebian%2F3.6-3.1;p=debian%2Felilo

Imported Debian patch 3.6-3.1
---

diff --git a/debian/changelog b/debian/changelog
index 31ace07..45f0521 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+elilo (3.6-3.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * High-urgency upload for RC bugfix.
+  * The check for new installs is broken, because apt-install elilo is
+    apparently not guaranteed to complete before the fstab is configured;
+    instead, check for the existence of /etc/elilo.conf to determine 
+    whether to run elilo on install.  Closes: #414419.
+  * Also fix a missing $ in the debconf config script that caused a syntax
+    error.
+
+ -- Steve Langasek <vorlon@debian.org>  Mon, 12 Mar 2007 03:44:09 -0700
+
 elilo (3.6-3) unstable; urgency=high
 
   * patch from Dann Frazier that adds an option to run /usr/sbin/elilo in 
diff --git a/debian/elilo.config b/debian/elilo.config
index eb8c0a9..820a2a7 100644
--- a/debian/elilo.config
+++ b/debian/elilo.config
@@ -4,7 +4,7 @@ set -e
 
 . /usr/share/debconf/confmodule
 
-if [ "2" ] && dpkg --compare-versions $2 lt 3.2-1
+if [ "$2" ] && dpkg --compare-versions $2 lt 3.2-1
 then
   db_input high elilo/format || true
 else
diff --git a/debian/postinst b/debian/postinst
index 465c7a9..e1bde69 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -10,22 +10,21 @@ fi
 case "$1" in
     configure|reconfigure)
 	# On new installs, do nothing - elilo-installer will handle it for d-i
-	if grep -q "^# UNCONFIGURED FSTAB FOR BASE SYSTEM" /etc/fstab ; then
-	  exit 0
-	fi
-        if [ "$2" ] && dpkg --compare-versions $2 lt 3.2-1
-        then
-            db_get elilo/format || true;
-            if [ x"$RET" = x"true" ]; then
-                echo "Running elilo..."
-                /usr/sbin/elilo --format --efiboot
+	if [ -e /etc/elilo.conf ]; then
+            if [ "$2" ] && dpkg --compare-versions "$2" lt 3.2-1
+            then
+                db_get elilo/format || true;
+                if [ x"$RET" = x"true" ]; then
+                    echo "Running elilo..."
+                    /usr/sbin/elilo --format --efiboot
+                fi
+            else
+                db_get elilo/runme || true;
+                if [ x"$RET" = x"true" ]; then
+                    echo "Running elilo..."
+                    /usr/sbin/elilo
+                fi
             fi
-            exit 0
-        fi
-        db_get elilo/runme || true;
-        if [ x"$RET" = x"true" ]; then
-            echo "Running elilo..."
-            /usr/sbin/elilo
         fi
     ;;