diff -u mdadm-2.6.3+200709292116+4450e59/debian/changelog mdadm-2.6.3+200709292116+4450e59/debian/changelog
--- mdadm-2.6.3+200709292116+4450e59/debian/changelog
+++ mdadm-2.6.3+200709292116+4450e59/debian/changelog
@@ -1,3 +1,19 @@
+mdadm (2.6.3+200709292116+4450e59-3ubuntu3.1) hardy-proposed; urgency=low
+
+  * Fixes for LP: #290885, backported from Intrepid to Hardy
+  * Backport functionality to enable booting degraded RAID from Intrepid to
+    Hardy
+  * debian/control: these fixes require initramfs-tools >= 0.85eubuntu39.3
+  * debian/initramfs/init-premount: enhance the init handling to allow for
+    booting a degraded RAID, and add the appropriate fail hook
+  * debian/mdadm-udeb.dirs, debian/mdadm.config, debian/mdadm.postinst,
+    debian/po/*, debian/install-rc, debian/mdadm-udeb.templates:
+    partman/install/debconf boot-degraded-raid configurability
+  * check.d/root_on_raid, check.d/_numbers: installer script to determine if /
+    or /boot is on a RAID device
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 06 Nov 2008 22:15:08 +0100
+
 mdadm (2.6.3+200709292116+4450e59-3ubuntu3) hardy; urgency=low
 
   * debian/initramfs/init-premount: Make sure the script exists when it is called
diff -u mdadm-2.6.3+200709292116+4450e59/debian/control mdadm-2.6.3+200709292116+4450e59/debian/control
--- mdadm-2.6.3+200709292116+4450e59/debian/control
+++ mdadm-2.6.3+200709292116+4450e59/debian/control
@@ -11,7 +11,7 @@
 
 Package: mdadm
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.1-6), debconf (>= 1.4.72), udev (>= 113-0ubuntu1), initramfs-tools (>= 0.85eubuntu24)
+Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.1-6), debconf (>= 1.4.72), udev (>= 113-0ubuntu1), initramfs-tools (>= 0.85eubuntu39.3)
 Recommends: mail-transport-agent, module-init-tools
 Replaces: mdctl
 Conflicts: mdctl (<< 0.7.2), raidtools2 (<< 1.00.3-12.1)
diff -u mdadm-2.6.3+200709292116+4450e59/debian/initramfs/init-premount mdadm-2.6.3+200709292116+4450e59/debian/initramfs/init-premount
--- mdadm-2.6.3+200709292116+4450e59/debian/initramfs/init-premount
+++ mdadm-2.6.3+200709292116+4450e59/debian/initramfs/init-premount
@@ -11,21 +11,74 @@
 
 mountroot_fail()
 {
-	if ! mdadm --misc --scan --detail 2> /dev/null ; then
+	if ! mdadm --misc --scan --detail >/dev/null 2>&1; then
 		cat <<EOF
-There appears to be one or more degraded RAID devices, and your root device
-may depend on the RAID devices being online. One or more of the following RAID
-devices are degraded:
+** WARNING: There appears to be one or more degraded RAID devices **
+
+The system may have suffered a hardware fault, such as a disk drive
+failure.  The root device may depend on the RAID devices being online. One
+or more of the following RAID devices are degraded:
 EOF
 		cat /proc/mdstat
 
-		cat <<EOF
-If you want to attempt to boot with the RAID in degraded mode, type:
-  mdadm -R /dev/mdX
-where X is the number of the md device listed above.
+		BOOT_DEGRADED="false"
+		# Read BOOT_DEGRADED from file
+		if [ -r "/conf/conf.d/mdadm" ]; then
+			. /conf/conf.d/mdadm
+		fi
+		# But allow for overides on the kernel command line
+		for x in $(cat /proc/cmdline); do
+			case $x in
+				bootdegraded)
+					BOOT_DEGRADED="true"
+				;;
+				bootdegraded=*)
+					BOOT_DEGRADED=${x#bootdegraded=}
+				;;
+			esac
+		done
+		# Allow for a couple of permutations, {true|1|yes|on}
+		case "$BOOT_DEGRADED" in
+			1)    BOOT_DEGRADED="true";;
+			yes)  BOOT_DEGRADED="true";;
+			on)   BOOT_DEGRADED="true";;
+		esac
+		# Finally, prompt interactively if the user has not specified
+		# to boot degraded either in a configuration file or as a
+		# kernel boot parameter
+		if [ "$BOOT_DEGRADED" != "true" ]; then
+			cat <<EOF
+You may attempt to start the system anyway, or stop now and attempt
+manual recovery operations.  To do this automatically in the future,
+add "bootdegraded=true" to the kernel boot options.
+
+If you choose to start the degraded RAID, the system may boot normally,
+but performance may be degraded, and a further hardware fault could
+result in permanent data loss.
+
+If you abort now, you will be provided with a recovery shell.
+
 EOF
-		exit 1
+			# Set a 15-second timeout for this question
+			ANSWER="unanswered"
+			read -t 15 -p "Do you wish to start the degraded RAID? [y/N]: " -r ANSWER
+			case "$ANSWER" in
+				unanswered) echo "Timed out" ;;
+				y*|Y*)  BOOT_DEGRADED="true" ;;
+				*)      BOOT_DEGRADED="false";;
+			esac
+		fi
+		if [ "$BOOT_DEGRADED" = "true" ]; then
+			echo "Attempting to start the RAID in degraded mode..."
+			if mdadm --assemble --scan --run; then
+				echo "Started the RAID in degraded mode."
+				exit 0
+			else
+				echo "Could not start the RAID in degraded mode."
+			fi
+		fi
 	fi
+	exit 1
 }
 
 case $1 in
@@ -42,7 +95,7 @@
 
 . /scripts/functions
 
-add_mountroot_fail_hook
+add_mountroot_fail_hook_d "10-mdadm"
 
 exit 0
  
diff -u mdadm-2.6.3+200709292116+4450e59/debian/mdadm-udeb.dirs mdadm-2.6.3+200709292116+4450e59/debian/mdadm-udeb.dirs
--- mdadm-2.6.3+200709292116+4450e59/debian/mdadm-udeb.dirs
+++ mdadm-2.6.3+200709292116+4450e59/debian/mdadm-udeb.dirs
@@ -3,0 +4 @@
+lib/partman
diff -u mdadm-2.6.3+200709292116+4450e59/debian/mdadm.config mdadm-2.6.3+200709292116+4450e59/debian/mdadm.config
--- mdadm-2.6.3+200709292116+4450e59/debian/mdadm.config
+++ mdadm-2.6.3+200709292116+4450e59/debian/mdadm.config
@@ -69,0 +70,9 @@
+
+# /etc/initramfs-tools/conf.d/mdadm section
+CONFIG="/etc/initramfs-tools/conf.d/mdadm"
+BOOT_DEGRADED=""
+[ -s "$CONFIG" ] && . "$CONFIG"
+[ -n "$BOOT_DEGRADED" ] || BOOT_DEGRADED="false"
+db_set mdadm/boot_degraded "$BOOT_DEGRADED"
+db_input medium mdadm/boot_degraded || :
+db_go
diff -u mdadm-2.6.3+200709292116+4450e59/debian/mdadm.postinst mdadm-2.6.3+200709292116+4450e59/debian/mdadm.postinst
--- mdadm-2.6.3+200709292116+4450e59/debian/mdadm.postinst
+++ mdadm-2.6.3+200709292116+4450e59/debian/mdadm.postinst
@@ -116,6 +116,30 @@
 #   Please see mdadm.conf(5).
 _eof
 
+    db_get mdadm/boot_degraded
+    BOOT_DEGRADED="${RET:-false}"
+    BOOT_DEGRADED_CONFIG="/etc/initramfs-tools/conf.d/mdadm"
+    cat <<_eof > $BOOT_DEGRADED_CONFIG
+# mdadm boot_degraded configuration
+#
+# You can run 'dpkg-reconfigure mdadm' to modify the values in this file, if
+# you want. You can also change the values here and changes will be preserved.
+# Do note that only the values are preserved; the rest of the file is
+# rewritten.
+#
+# BOOT_DEGRADED:
+# Do you want to boot your system if a RAID providing your root filesystem
+# becomes degraded?
+#
+# Running a system with a degraded RAID could result in permanent data loss
+# if it suffers another hardware fault.
+#
+# However, you might answer "yes" if this system is a server, expected to
+# tolerate hardware faults and boot unattended.
+
+BOOT_DEGRADED=$BOOT_DEGRADED
+_eof
+
     db_stop
 
     # try to undo udev rules (installed by 2.5.2-10, see 2.5.3.git200608202239-1
diff -u mdadm-2.6.3+200709292116+4450e59/debian/po/POTFILES.in mdadm-2.6.3+200709292116+4450e59/debian/po/POTFILES.in
--- mdadm-2.6.3+200709292116+4450e59/debian/po/POTFILES.in
+++ mdadm-2.6.3+200709292116+4450e59/debian/po/POTFILES.in
@@ -1,0 +2 @@
+[type: gettext/rfc822deb] mdadm-udeb.templates
diff -u mdadm-2.6.3+200709292116+4450e59/debian/po/cs.po mdadm-2.6.3+200709292116+4450e59/debian/po/cs.po
--- mdadm-2.6.3+200709292116+4450e59/debian/po/cs.po
+++ mdadm-2.6.3+200709292116+4450e59/debian/po/cs.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mdadm\n"
-"Report-Msgid-Bugs-To: ubuntu-devel-discuss@lists.ubuntu.com\n"
-"POT-Creation-Date: 2007-12-12 22:46+0000\n"
+"Report-Msgid-Bugs-To: mdadm@packages.debian.org\n"
+"POT-Creation-Date: 2008-10-29 12:34-0500\n"
 "PO-Revision-Date: 2006-09-23 20:45+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -89,6 +89,36 @@
 "Zadejte prosím emailovou adresu uživatele, který má dostávat emailová "
 "upozornění při výskytu významných MD událostí."
 
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid "Do you want to boot your system if your RAID becomes degraded?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid ""
+"If your root filesystem is on a RAID, and a disk is missing at boot, it can "
+"either boot with the degraded array, or hold the system at a recovery shell."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid ""
+"Running a system with a degraded RAID could result in permanent data loss if "
+"it suffers another hardware fault."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid ""
+"If you do not have access to the server console to use the recovery shell, "
+"you might answer \"yes\" to enable the system to boot unattended."
+msgstr ""
+
 #~ msgid "MD arrays needed for the root filesystem:"
 #~ msgstr "MD pole vyžadovaná pro kořenový souborový systém:"
 
diff -u mdadm-2.6.3+200709292116+4450e59/debian/po/de.po mdadm-2.6.3+200709292116+4450e59/debian/po/de.po
--- mdadm-2.6.3+200709292116+4450e59/debian/po/de.po
+++ mdadm-2.6.3+200709292116+4450e59/debian/po/de.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mdadm\n"
-"Report-Msgid-Bugs-To: ubuntu-devel-discuss@lists.ubuntu.com\n"
-"POT-Creation-Date: 2007-12-12 22:46+0000\n"
+"Report-Msgid-Bugs-To: mdadm@packages.debian.org\n"
+"POT-Creation-Date: 2008-10-29 12:34-0500\n"
 "PO-Revision-Date: 2006-10-01 15:47+0200\n"
 "Last-Translator: Mario Joussen <joussen@debian.org>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -93,6 +93,36 @@
 "Geben Sie bitte die Emailadresse des Benutzers an, der die "
 "Emailbenachrichtigung f�r wichtige RAID Ereignisse erhalten soll."
 
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid "Do you want to boot your system if your RAID becomes degraded?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid ""
+"If your root filesystem is on a RAID, and a disk is missing at boot, it can "
+"either boot with the degraded array, or hold the system at a recovery shell."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid ""
+"Running a system with a degraded RAID could result in permanent data loss if "
+"it suffers another hardware fault."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid ""
+"If you do not have access to the server console to use the recovery shell, "
+"you might answer \"yes\" to enable the system to boot unattended."
+msgstr ""
+
 #~ msgid "MD arrays needed for the root filesystem:"
 #~ msgstr "F�r das Wurzeldateisystem ben�tigte RAID Verb�nde:"
 
diff -u mdadm-2.6.3+200709292116+4450e59/debian/po/es.po mdadm-2.6.3+200709292116+4450e59/debian/po/es.po
--- mdadm-2.6.3+200709292116+4450e59/debian/po/es.po
+++ mdadm-2.6.3+200709292116+4450e59/debian/po/es.po
@@ -38,8 +38,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mdadm 2.5.6-6\n"
-"Report-Msgid-Bugs-To: ubuntu-devel-discuss@lists.ubuntu.com\n"
-"POT-Creation-Date: 2007-12-12 22:46+0000\n"
+"Report-Msgid-Bugs-To: mdadm@packages.debian.org\n"
+"POT-Creation-Date: 2008-10-29 12:34-0500\n"
 "PO-Revision-Date: 2006-12-09 00:38+0100\n"
 "Last-Translator: Javier Fern�ndez-Sanguino <jfs@debian.org>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -120,6 +120,36 @@
 "recibir las notificaciones por correo de eventos relevantes en los "
 "dispositivos MD."
 
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid "Do you want to boot your system if your RAID becomes degraded?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid ""
+"If your root filesystem is on a RAID, and a disk is missing at boot, it can "
+"either boot with the degraded array, or hold the system at a recovery shell."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid ""
+"Running a system with a degraded RAID could result in permanent data loss if "
+"it suffers another hardware fault."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid ""
+"If you do not have access to the server console to use the recovery shell, "
+"you might answer \"yes\" to enable the system to boot unattended."
+msgstr ""
+
 #~ msgid "MD arrays needed for the root filesystem:"
 #~ msgstr "Arrays MD necesarios para el sistema de ficheros ra�z:"
 
@@ -132,10 +162,9 @@
 #~ "omit the leading '/dev/' and just enter e.g. \"md0 md1\", or \"md/1 md/d0"
 #~ "\"."
 #~ msgstr ""
-#~ "Introduzca una lista de dispositivos separados por espacios, "
-#~ "�all� (todos) o �none� (ninguno). No tiene que preceder los nombres de "
-#~ "dispositivos con �/dev�, puede s�lo introducir, por ejemplo: �md0 md1� o "
-#~ "�md/1 md/d0�."
+#~ "Introduzca una lista de dispositivos separados por espacios, �all� (todos) "
+#~ "o �none� (ninguno). No tiene que preceder los nombres de dispositivos con �/"
+#~ "dev�, puede s�lo introducir, por ejemplo: �md0 md1� o �md/1 md/d0�."
 
 #~ msgid "for internal use - only the long description is needed."
 #~ msgstr "para uso interno. S�lo se utiliza la descripci�n larga."
@@ -241,5 +270,5 @@
 #~ "�stos no se hayan arrancado a�n. Esto es probablemente lo que desea a no "
-#~ "ser que haya compilado el soporte de dispositivos m�ltiples (MD, "
-#~ "�multiple devices�) en el n�cleo y marcado todas las particiones que son "
-#~ "parte de los arrays MD con el tipo �0xfd� (ya que �stas, y s�lo �stas, se "
+#~ "ser que haya compilado el soporte de dispositivos m�ltiples (MD, �multiple "
+#~ "devices�) en el n�cleo y marcado todas las particiones que son parte de "
+#~ "los arrays MD con el tipo �0xfd� (ya que �stas, y s�lo �stas, se "
 #~ "arrancar�n de forma autom�tica por el n�cleo."
diff -u mdadm-2.6.3+200709292116+4450e59/debian/po/fr.po mdadm-2.6.3+200709292116+4450e59/debian/po/fr.po
--- mdadm-2.6.3+200709292116+4450e59/debian/po/fr.po
+++ mdadm-2.6.3+200709292116+4450e59/debian/po/fr.po
@@ -18,8 +18,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mdadm\n"
-"Report-Msgid-Bugs-To: ubuntu-devel-discuss@lists.ubuntu.com\n"
-"POT-Creation-Date: 2007-12-12 22:46+0000\n"
+"Report-Msgid-Bugs-To: mdadm@packages.debian.org\n"
+"POT-Creation-Date: 2008-10-29 12:34-0500\n"
 "PO-Revision-Date: 2006-09-30 17:56+0200\n"
 "Last-Translator: Florentin Duneau <f.baced@wanadoo.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -96,6 +96,36 @@
 "Veuillez indiquer l'adresse �lectronique de l'utilisateur qui doit recevoir "
 "les notifications lors d'importants �v�nements MD."
 
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid "Do you want to boot your system if your RAID becomes degraded?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid ""
+"If your root filesystem is on a RAID, and a disk is missing at boot, it can "
+"either boot with the degraded array, or hold the system at a recovery shell."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid ""
+"Running a system with a degraded RAID could result in permanent data loss if "
+"it suffers another hardware fault."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid ""
+"If you do not have access to the server console to use the recovery shell, "
+"you might answer \"yes\" to enable the system to boot unattended."
+msgstr ""
+
 #~ msgid "MD arrays needed for the root filesystem:"
 #~ msgstr "Ensembles MD requis par le syst�me de fichiers racine�:"
 
diff -u mdadm-2.6.3+200709292116+4450e59/debian/po/gl.po mdadm-2.6.3+200709292116+4450e59/debian/po/gl.po
--- mdadm-2.6.3+200709292116+4450e59/debian/po/gl.po
+++ mdadm-2.6.3+200709292116+4450e59/debian/po/gl.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mdadm\n"
-"Report-Msgid-Bugs-To: ubuntu-devel-discuss@lists.ubuntu.com\n"
-"POT-Creation-Date: 2007-12-12 22:46+0000\n"
+"Report-Msgid-Bugs-To: mdadm@packages.debian.org\n"
+"POT-Creation-Date: 2008-10-29 12:34-0500\n"
 "PO-Revision-Date: 2007-02-24 16:04+0100\n"
 "Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
@@ -83,6 +83,36 @@
 "Introduza o enderezo de email do usuario que debe recibir os avisos por "
 "email de eventos importantes de MD."
 
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid "Do you want to boot your system if your RAID becomes degraded?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid ""
+"If your root filesystem is on a RAID, and a disk is missing at boot, it can "
+"either boot with the degraded array, or hold the system at a recovery shell."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid ""
+"Running a system with a degraded RAID could result in permanent data loss if "
+"it suffers another hardware fault."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid ""
+"If you do not have access to the server console to use the recovery shell, "
+"you might answer \"yes\" to enable the system to boot unattended."
+msgstr ""
+
 #~ msgid "MD arrays needed for the root filesystem:"
 #~ msgstr "Arrays MD necesarios para o sistema de ficheiros raíz"
 
diff -u mdadm-2.6.3+200709292116+4450e59/debian/po/ja.po mdadm-2.6.3+200709292116+4450e59/debian/po/ja.po
--- mdadm-2.6.3+200709292116+4450e59/debian/po/ja.po
+++ mdadm-2.6.3+200709292116+4450e59/debian/po/ja.po
@@ -15,8 +15,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mdadm 2.5.5-1\n"
-"Report-Msgid-Bugs-To: ubuntu-devel-discuss@lists.ubuntu.com\n"
-"POT-Creation-Date: 2007-12-12 22:46+0000\n"
+"Report-Msgid-Bugs-To: mdadm@packages.debian.org\n"
+"POT-Creation-Date: 2008-10-29 12:34-0500\n"
 "PO-Revision-Date: 2006-10-15 13:52+0900\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -89,6 +89,36 @@
 "MD 関連の重大なイベントが発生した際、メールでの通知を受け取る必要があるユーザ"
 "のメールアドレスを入力してください。"
 
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid "Do you want to boot your system if your RAID becomes degraded?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid ""
+"If your root filesystem is on a RAID, and a disk is missing at boot, it can "
+"either boot with the degraded array, or hold the system at a recovery shell."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid ""
+"Running a system with a degraded RAID could result in permanent data loss if "
+"it suffers another hardware fault."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid ""
+"If you do not have access to the server console to use the recovery shell, "
+"you might answer \"yes\" to enable the system to boot unattended."
+msgstr ""
+
 #~ msgid "MD arrays needed for the root filesystem:"
 #~ msgstr "root ファイルシステムに必要な MD アレイ:"
 
diff -u mdadm-2.6.3+200709292116+4450e59/debian/po/nl.po mdadm-2.6.3+200709292116+4450e59/debian/po/nl.po
--- mdadm-2.6.3+200709292116+4450e59/debian/po/nl.po
+++ mdadm-2.6.3+200709292116+4450e59/debian/po/nl.po
@@ -16,8 +16,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mdadm_2.5.3_nl\n"
-"Report-Msgid-Bugs-To: ubuntu-devel-discuss@lists.ubuntu.com\n"
-"POT-Creation-Date: 2007-12-12 22:46+0000\n"
+"Report-Msgid-Bugs-To: mdadm@packages.debian.org\n"
+"POT-Creation-Date: 2008-10-29 12:34-0500\n"
 "PO-Revision-Date: 2006-10-01 13:25+0200\n"
 "Last-Translator: Frans Pop <aragorn@tiscali.nl>\n"
 "Language-Team: Dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -93,6 +93,36 @@
 "Geef het e-mailadres in van de gebruiker die een e-mailbericht dient te "
 "ontvangen voor belangrijke gebeurtenissen met betrekking tot RAID."
 
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid "Do you want to boot your system if your RAID becomes degraded?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid ""
+"If your root filesystem is on a RAID, and a disk is missing at boot, it can "
+"either boot with the degraded array, or hold the system at a recovery shell."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid ""
+"Running a system with a degraded RAID could result in permanent data loss if "
+"it suffers another hardware fault."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid ""
+"If you do not have access to the server console to use the recovery shell, "
+"you might answer \"yes\" to enable the system to boot unattended."
+msgstr ""
+
 #~ msgid "MD arrays needed for the root filesystem:"
 #~ msgstr "Voor het basisbestandssysteem benodigde RAID-reeksen:"
 
diff -u mdadm-2.6.3+200709292116+4450e59/debian/po/pt.po mdadm-2.6.3+200709292116+4450e59/debian/po/pt.po
--- mdadm-2.6.3+200709292116+4450e59/debian/po/pt.po
+++ mdadm-2.6.3+200709292116+4450e59/debian/po/pt.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mdadm 2.5.6\n"
-"Report-Msgid-Bugs-To: ubuntu-devel-discuss@lists.ubuntu.com\n"
-"POT-Creation-Date: 2007-12-12 22:46+0000\n"
+"Report-Msgid-Bugs-To: mdadm@packages.debian.org\n"
+"POT-Creation-Date: 2008-10-29 12:34-0500\n"
 "PO-Revision-Date: 2007-02-18 10:58+0100\n"
 "Last-Translator: Pedro Ribeiro <p.m42.ribeiro@gmail.com>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -86,6 +86,36 @@
 "Por favor, introduza o endereço de email do destinatário das mensagens de "
 "notificação dos eventos MD."
 
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid "Do you want to boot your system if your RAID becomes degraded?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid ""
+"If your root filesystem is on a RAID, and a disk is missing at boot, it can "
+"either boot with the degraded array, or hold the system at a recovery shell."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid ""
+"Running a system with a degraded RAID could result in permanent data loss if "
+"it suffers another hardware fault."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid ""
+"If you do not have access to the server console to use the recovery shell, "
+"you might answer \"yes\" to enable the system to boot unattended."
+msgstr ""
+
 #~ msgid "MD arrays needed for the root filesystem:"
 #~ msgstr "Grupos MD necessários para o sistema de ficheiros raiz:"
 
diff -u mdadm-2.6.3+200709292116+4450e59/debian/po/pt_BR.po mdadm-2.6.3+200709292116+4450e59/debian/po/pt_BR.po
--- mdadm-2.6.3+200709292116+4450e59/debian/po/pt_BR.po
+++ mdadm-2.6.3+200709292116+4450e59/debian/po/pt_BR.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mdadm\n"
-"Report-Msgid-Bugs-To: ubuntu-devel-discuss@lists.ubuntu.com\n"
-"POT-Creation-Date: 2007-12-12 22:46+0000\n"
+"Report-Msgid-Bugs-To: mdadm@packages.debian.org\n"
+"POT-Creation-Date: 2008-10-29 12:34-0500\n"
 "PO-Revision-Date: 2006-09-24 19:22-0300\n"
 "Last-Translator: Felipe Augusto van de Wiel (faw) <faw@cathedrallabs.org>\n"
 "Language-Team: l10n portuguese <debian-l10n-portuguese@lists.debian.org>\n"
@@ -94,6 +94,36 @@
 "Por favor, informe o endereço de e-mail do usuário que deverá receber os e-"
 "mails de notificações para estes eventos MD importantes."
 
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid "Do you want to boot your system if your RAID becomes degraded?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid ""
+"If your root filesystem is on a RAID, and a disk is missing at boot, it can "
+"either boot with the degraded array, or hold the system at a recovery shell."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid ""
+"Running a system with a degraded RAID could result in permanent data loss if "
+"it suffers another hardware fault."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid ""
+"If you do not have access to the server console to use the recovery shell, "
+"you might answer \"yes\" to enable the system to boot unattended."
+msgstr ""
+
 #~ msgid "MD arrays needed for the root filesystem:"
 #~ msgstr "Dispositivos MD necessários para o sistema de arquivos raiz:"
 
diff -u mdadm-2.6.3+200709292116+4450e59/debian/po/ru.po mdadm-2.6.3+200709292116+4450e59/debian/po/ru.po
--- mdadm-2.6.3+200709292116+4450e59/debian/po/ru.po
+++ mdadm-2.6.3+200709292116+4450e59/debian/po/ru.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mdadm_2.5.3.git200608202239-6\n"
-"Report-Msgid-Bugs-To: ubuntu-devel-discuss@lists.ubuntu.com\n"
-"POT-Creation-Date: 2007-12-12 22:46+0000\n"
+"Report-Msgid-Bugs-To: mdadm@packages.debian.org\n"
+"POT-Creation-Date: 2008-10-29 12:34-0500\n"
 "PO-Revision-Date: 2006-09-23 23:54+0400\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -93,6 +93,36 @@
 "Введите адрес электронной почты пользователя, который будет получать "
 "почтовые уведомления о важных изменениях в состоянии MD."
 
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid "Do you want to boot your system if your RAID becomes degraded?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid ""
+"If your root filesystem is on a RAID, and a disk is missing at boot, it can "
+"either boot with the degraded array, or hold the system at a recovery shell."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid ""
+"Running a system with a degraded RAID could result in permanent data loss if "
+"it suffers another hardware fault."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid ""
+"If you do not have access to the server console to use the recovery shell, "
+"you might answer \"yes\" to enable the system to boot unattended."
+msgstr ""
+
 #~ msgid "MD arrays needed for the root filesystem:"
 #~ msgstr "MD массивы, нужные для корневой файловой системы:"
 
diff -u mdadm-2.6.3+200709292116+4450e59/debian/po/sv.po mdadm-2.6.3+200709292116+4450e59/debian/po/sv.po
--- mdadm-2.6.3+200709292116+4450e59/debian/po/sv.po
+++ mdadm-2.6.3+200709292116+4450e59/debian/po/sv.po
@@ -13,8 +13,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mdadm 1.12.0-1\n"
-"Report-Msgid-Bugs-To: ubuntu-devel-discuss@lists.ubuntu.com\n"
-"POT-Creation-Date: 2007-12-12 22:46+0000\n"
+"Report-Msgid-Bugs-To: mdadm@packages.debian.org\n"
+"POT-Creation-Date: 2008-10-29 12:34-0500\n"
 "PO-Revision-Date: 2006-09-23 16:37+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -88,6 +88,36 @@
 "Ange e-postadressen till den anv�ndare som ska ta emot e-postnotifieringar "
 "f�r dessa viktiga MD-h�ndelser."
 
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid "Do you want to boot your system if your RAID becomes degraded?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid ""
+"If your root filesystem is on a RAID, and a disk is missing at boot, it can "
+"either boot with the degraded array, or hold the system at a recovery shell."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid ""
+"Running a system with a degraded RAID could result in permanent data loss if "
+"it suffers another hardware fault."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid ""
+"If you do not have access to the server console to use the recovery shell, "
+"you might answer \"yes\" to enable the system to boot unattended."
+msgstr ""
+
 #~ msgid "MD arrays needed for the root filesystem:"
 #~ msgstr "MD-kedjor som beh�vs f�r rotfilsystemet:"
 
diff -u mdadm-2.6.3+200709292116+4450e59/debian/po/templates.pot mdadm-2.6.3+200709292116+4450e59/debian/po/templates.pot
--- mdadm-2.6.3+200709292116+4450e59/debian/po/templates.pot
+++ mdadm-2.6.3+200709292116+4450e59/debian/po/templates.pot
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ubuntu-devel-discuss@lists.ubuntu.com\n"
-"POT-Creation-Date: 2007-12-12 22:46+0000\n"
+"Report-Msgid-Bugs-To: mdadm@packages.debian.org\n"
+"POT-Creation-Date: 2008-10-29 12:34-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -71,0 +72,30 @@
+
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid "Do you want to boot your system if your RAID becomes degraded?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid ""
+"If your root filesystem is on a RAID, and a disk is missing at boot, it can "
+"either boot with the degraded array, or hold the system at a recovery shell."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid ""
+"Running a system with a degraded RAID could result in permanent data loss if "
+"it suffers another hardware fault."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid ""
+"If you do not have access to the server console to use the recovery shell, "
+"you might answer \"yes\" to enable the system to boot unattended."
+msgstr ""
diff -u mdadm-2.6.3+200709292116+4450e59/debian/po/vi.po mdadm-2.6.3+200709292116+4450e59/debian/po/vi.po
--- mdadm-2.6.3+200709292116+4450e59/debian/po/vi.po
+++ mdadm-2.6.3+200709292116+4450e59/debian/po/vi.po
@@ -1,12 +1,12 @@
 # Vietnamese Translation for mdadm.
 # Copyright © 2006 Free Software Foundation, Inc.
 # Clytie Siddall <clytie@riverland.net.au>, 2005-2006.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: mdadm 2.5.3.git200608202239-6\n"
-"Report-Msgid-Bugs-To: ubuntu-devel-discuss@lists.ubuntu.com\n"
-"POT-Creation-Date: 2007-12-12 22:46+0000\n"
+"Report-Msgid-Bugs-To: mdadm@packages.debian.org\n"
+"POT-Creation-Date: 2008-10-29 12:34-0500\n"
 "PO-Revision-Date: 2006-09-30 20:40+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -83,6 +83,36 @@
 "Hãy nhập địa chỉ thư của người dùng nên nhận thư thông báo về sự kiện MD "
 "quan trọng như vậy."
 
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid "Do you want to boot your system if your RAID becomes degraded?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid ""
+"If your root filesystem is on a RAID, and a disk is missing at boot, it can "
+"either boot with the degraded array, or hold the system at a recovery shell."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid ""
+"Running a system with a degraded RAID could result in permanent data loss if "
+"it suffers another hardware fault."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../mdadm-udeb.templates:1001
+msgid ""
+"If you do not have access to the server console to use the recovery shell, "
+"you might answer \"yes\" to enable the system to boot unattended."
+msgstr ""
+
 #~ msgid "MD arrays needed for the root filesystem:"
 #~ msgstr "Các mảng MD cần thiết cho hệ thống tập tin gốc:"
 
@@ -95,9 +125,9 @@
 #~ "omit the leading '/dev/' and just enter e.g. \"md0 md1\", or \"md/1 md/d0"
 #~ "\"."
 #~ msgstr ""
-#~ "Hãy nhập danh sách các thiết bị (định giới bằng dấu cách) hay « all "
-#~ "» (tất cả) hay « none » (không có gì). Có thể bỏ phần « /dev/ » đi trước, "
-#~ "chỉ nhập (v.d.) « md0 md1 » hay « md/1 md/d0 »."
+#~ "Hãy nhập danh sách các thiết bị (định giới bằng dấu cách) hay « all » (tất "
+#~ "cả) hay « none » (không có gì). Có thể bỏ phần « /dev/ » đi trước, chỉ nhập "
+#~ "(v.d.) « md0 md1 » hay « md/1 md/d0 »."
 
 #~ msgid "for internal use - only the long description is needed."
 #~ msgstr "để sử dụng nội bộ — chỉ cần thiết mô tả dài."
@@ -166,8 +196,8 @@
 #~ "Please refer to /usr/share/doc/mdadm/README.upgrading-2.5.3.gz if you "
 #~ "intend to continue."
 #~ msgstr ""
-#~ "Hãy tham chiếu đến tài liệu Đọc Đi « /usr/share/doc/mdadm/README."
-#~ "upgrading-2.5.3.gz » nếu bạn định tiếp tục."
+#~ "Hãy tham chiếu đến tài liệu Đọc Đi « /usr/share/doc/mdadm/README.upgrading-"
+#~ "2.5.3.gz » nếu bạn định tiếp tục."
 
 #~ msgid ""
 #~ "This warning is only relevant if you need arrays to be started from the "
@@ -220,9 +250,9 @@
 #~ "reconfigure mdadm` to reactivate the autostart feature."
 #~ msgstr ""
 #~ "Để làm như thế, đừng khởi chạy tự động những thiết bị RAID. Trước tiên, "
-#~ "hãy làm số không siêu khối (« mdadm --zero-superblock /dev/mdX »). Sau "
-#~ "đó, chạy lệnh « dpkg-reconfigure mdadm » để kích hoạt tính năng khởi chạy "
-#~ "tự động."
+#~ "hãy làm số không siêu khối (« mdadm --zero-superblock /dev/mdX »). Sau đó, "
+#~ "chạy lệnh « dpkg-reconfigure mdadm » để kích hoạt tính năng khởi chạy tự "
+#~ "động."
 
 #~ msgid ""
 #~ "You have the option to start all other arrays (those not needed for the "
diff -u mdadm-2.6.3+200709292116+4450e59/debian/rules mdadm-2.6.3+200709292116+4450e59/debian/rules
--- mdadm-2.6.3+200709292116+4450e59/debian/rules
+++ mdadm-2.6.3+200709292116+4450e59/debian/rules
@@ -57,8 +57,9 @@
 	dh_testdir
 	dh_clean -k
 	dh_installdirs
+	chmod +x debian/install-rc
+	PACKAGE=mdadm-udeb debian/install-rc check.d
 	install -m0755 mdadm $(DESTDIR)/sbin
-
 	install -m0755 mdadm.udeb $(DESTDIR_UDEB)/sbin/mdadm
 	install -m0644 debian/mdadm.vol_id.udev \
 		$(DESTDIR_UDEB)/etc/udev/rules.d/65-mdadm.vol_id.rules
@@ -81,7 +82,9 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installdebconf	
+	dh_installdebconf
+	echo >> debian/mdadm/DEBIAN/templates
+	po2debconf debian/mdadm-udeb.templates >> debian/mdadm/DEBIAN/templates
 	dh_installdocs
 	dh_installexamples debian/newdisk
 	dh_installinit -- defaults 25
only in patch2:
unchanged:
--- mdadm-2.6.3+200709292116+4450e59.orig/debian/install-rc
+++ mdadm-2.6.3+200709292116+4450e59/debian/install-rc
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+set -e
+
+# PACKAGE is exported from debian/rules
+partman=debian/${PACKAGE}/lib/partman
+
+install -d $partman/$1
+
+cp -r $1/* $partman/$1/
+
+# Remove any SVN dirs that were copied along
+rm -rf `find $partman/$1/ -name .svn`
+
+if [ -f $partman/$1/_numbers ]; then
+    numbers=$(cat $partman/$1/_numbers)
+    rm $partman/$1/_numbers
+    echo "$numbers" |
+    while read number name; do
+        set -e
+        mv $partman/$1/$name $partman/$1/${number}${name}
+        chmod +x $partman/$1/${number}${name}
+    done
+fi
+
only in patch2:
unchanged:
--- mdadm-2.6.3+200709292116+4450e59.orig/debian/mdadm-udeb.templates
+++ mdadm-2.6.3+200709292116+4450e59/debian/mdadm-udeb.templates
@@ -0,0 +1,13 @@
+Template: mdadm/boot_degraded
+Type: boolean
+Default: true
+_Description: Do you want to boot your system if your RAID becomes degraded?
+ If your root filesystem is on a RAID, and a disk is missing at boot, it can
+ either boot with the degraded array, or hold the system at a recovery shell.
+ .
+ Running a system with a degraded RAID could result in permanent data loss
+ if it suffers another hardware fault.
+ .
+ If you do not have access to the server console to use the recovery shell,
+ you might answer "yes" to enable the system to boot unattended.
+
only in patch2:
unchanged:
--- mdadm-2.6.3+200709292116+4450e59.orig/check.d/_numbers
+++ mdadm-2.6.3+200709292116+4450e59/check.d/_numbers
@@ -0,0 +1 @@
+07 root_on_raid
only in patch2:
unchanged:
--- mdadm-2.6.3+200709292116+4450e59.orig/check.d/root_on_raid
+++ mdadm-2.6.3+200709292116+4450e59/check.d/root_on_raid
@@ -0,0 +1,34 @@
+#!/bin/sh
+
+. /lib/partman/lib/base.sh
+
+# Prompt for BOOT_DEGRADED=true|false if / or /boot is on a /dev/md*
+root_on_raid () {
+	prompt=$(
+		for i in /lib/partman/fstab.d/*; do
+			[ -x "$i" ] || continue
+			$i
+		done |
+		while read fs mp type options dump pass; do
+			if mdadm --detail "$fs" | greq -qsi " raid1$" 2>/dev/null; then
+				if [ "$mp" = "/" ] || [ "$mp" = "/boot" ]; then
+					echo "true"
+					break
+				fi
+			fi
+		done
+	)
+	case $prompt in
+		true)
+			db_input critical mdadm/boot_degraded || true
+			db_go || true
+			db_get mdadm/boot_degraded
+			# write to preseed log so that /target knows about it
+			echo mdadm mdadm/boot_degraded boolean "$RET" >> "$logfile"
+
+		  ;;
+	esac
+	exit 0
+}
+
+root_on_raid