I uploaded the following changes to delayed/5. Ben.
diff -u hdparm-9.27/debian/changelog hdparm-9.27/debian/changelog
--- hdparm-9.27/debian/changelog
+++ hdparm-9.27/debian/changelog
@@ -1,3 +1,13 @@
+hdparm (9.27-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Ensure that RAID sync is always restored when the init script ends
+ (closes: #583110)
+ * Include licence text directly in copyright file, as it is not exactly
+ the same as the BSD licence text
+
+ -- Ben Hutchings <b...@decadent.org.uk> Sun, 01 Aug 2010 23:44:20 +0100
+
hdparm (9.27-2) unstable; urgency=low
* Stop unconditionally stripping hdparm during build (closes: #568774)
diff -u hdparm-9.27/debian/hdparm.init hdparm-9.27/debian/hdparm.init
--- hdparm-9.27/debian/hdparm.init
+++ hdparm-9.27/debian/hdparm.init
@@ -83,6 +83,7 @@
echo 0 >/proc/sys/dev/raid/speed_limit_max
fi
sleep 2
+ trap undo_slow_down_raid_sync EXIT
}
undo_slow_down_raid_sync()
@@ -306,7 +307,6 @@
;;
*)
log_failure_msg "Unknown option $KEY"
- undo_slow_down_raid_sync
exit 1
;;
esac
@@ -316,7 +316,6 @@
'}')
if [ -z "$DISC" ] && [ "$WAS_RUN" != '1' ]; then
log_failure_msg "No disk enabled. Exiting"
- undo_slow_down_raid_sync
exit 1
fi
if [ -n "$OPTIONS" ] && [ -b "$DISC" ]; then
@@ -367,14 +366,12 @@
;;
*)
log_failure_msg "unknown option $KEY"
- undo_slow_down_raid_sync
exit 1
;;
esac
;;
*)
log_failure_msg "unknown separator $SEP"
- undo_slow_down_raid_sync
exit 1
;;
esac
@@ -404,7 +401,2 @@
-# Turn back on RAID synchronisation if we turned it off.
-if [ "$raidstat" != 'OK' ] && [ "$RAID_WORKAROUND" = "yes" ]; then
- undo_slow_down_raid_sync
-fi
-
exit 0
only in patch2:
unchanged:
--- hdparm-9.27.orig/debian/copyright
+++ hdparm-9.27/debian/copyright
@@ -10,8 +10,10 @@
/* hdparm.c - Command line interface to get/set hard disk parameters */
/* - by Mark Lord © 1994-2008 -- freely distributable */
-You are free to distribute this software under the terms of the BSD License.
-On Debian systems, the complete text of the BSD License can be found in
-/usr/share/common-licenses/BSD
+License:
+You may freely use, modify, and redistribute the hdparm program,
+as either binary or source, or both.
+The only condition is that my name and copyright notice
+remain in the source code as-is.
--- END ---
--
Ben Hutchings
Once a job is fouled up, anything done to improve it makes it worse.
signature.asc
Description: This is a digitally signed message part
