Package: hibernate
Version: 1.93-1
Severity: normal
Tags: patch

My laptop boots off a separate, XFS formatted /boot partition. I do not
let hibernate rewrite GRUB's configuration files (at least not now) and
so I was able to spot an incorrect short cicuit evaluation which leads
to the following misleading error message:

  failed to remount the /boot partition.

The attached patch fixes this bug.

-- System Information:
Debian Release: testing/unstable
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable'), (1, 
'experimental')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.16.28-viasuspend2
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968) (ignored: LC_ALL set to C)

Versions of packages hibernate depends on:
ii  console-tools              1:0.2.3dbs-64 Linux console and font utilities

Versions of packages hibernate recommends:
ii  hdparm                        6.6-1      tune hard disk parameters for high
pn  vlock                         <none>     (no description available)

-- no debconf information
--- /usr/share/hibernate/scriptlets.d/remount_xfsboot   2006-07-14 
00:49:13.000000000 +0200
+++ /tmp/remount_xfsboot        2006-09-09 00:27:51.207474505 +0200
@@ -67,10 +67,13 @@
 
 RemountXFSBootRW()
 {
-    [ "$CHANGE_GRUB_MENU" = 1 ] && [ "$REMOUNT_XFSBOOT" = 1 ] \
-       && _XFSBoot_boot_on_xfs && _XFSBoot_boot_separate_partition \
-       && mount -o remount,rw /boot \
-       || vecho 1 "$EXE: failed to remount the /boot partition."
+    if [ "$CHANGE_GRUB_MENU" = 1 ] && [ "$REMOUNT_XFSBOOT" = 1 ] \
+       && _XFSBoot_boot_on_xfs && _XFSBoot_boot_separate_partition
+        then
+       mount -o remount,rw /boot \
+            || vecho 1 "$EXE: failed to remount the /boot partition."
+    fi
+    return 0
 }
 
 # vim:ft=sh:ts=8:sw=4:noet

Reply via email to