r45 - in mdadm/trunk/debian: . initramfs

madduck at users.alioth.debian.org madduck at users.alioth.debian.org
Mon Jul 31 13:36:03 UTC 2006


Author: madduck
Date: 2006-07-31 13:36:02 +0000 (Mon, 31 Jul 2006)
New Revision: 45

Added:
   mdadm/trunk/debian/README.initramfs-transition
Removed:
   mdadm/trunk/debian/README.experimental
Modified:
   mdadm/trunk/debian/README.mdrun
   mdadm/trunk/debian/changelog
   mdadm/trunk/debian/initramfs/hook
   mdadm/trunk/debian/mdadm.docs
   mdadm/trunk/debian/rules
Log:
* Updated documentation in README.initramfs-transition to include
  information related to #380089.

Deleted: mdadm/trunk/debian/README.experimental
===================================================================
--- mdadm/trunk/debian/README.experimental	2006-07-31 13:32:43 UTC (rev 44)
+++ mdadm/trunk/debian/README.experimental	2006-07-31 13:36:02 UTC (rev 45)
@@ -1,52 +0,0 @@
-mdadm for Debian - initramfs transition
----------------------------------------
-
-None of the following needs to concern you if you are using monolithic kernels
-(no modules), yaird, or initrd-tools/mkinitrd.
-
-This information is about #367567. The gist is that the hooks and scripts to
-take care of RAID during boot with an initramfs have been improved and moved
-into the mdadm package. mdrun has been deprecated on the way.
-
-As long as the version of initramfs-tools you have installed still provides
-the old hooks and scripts (which use mdrun), the new ones will simply not do
-anything (which allows me to get rid of the conflict I needed previously).
-Version 0.70 and later does not provide these hooks anymore, so the new mdadm
-hooks will be used, which use mdadm instead of mdrun.
-
-initramfs-tools does *not* conflict with older mdadm but instead provides
-fallback code in case mdadm << 2.5-1 is installed (which does not provide the
-hooks yet). This decision was made in order to prevent the slight chance that
-mdadm would be removed due to the conflict. See #380089.
-
-Unless I've overlooked a detail, no interaction is required from the side of
-the user (apart from the new debconf question) to install and get mdadm
-running and integrated with initramfs-tools. It helps to ensure that
-update-initramfs produces output that squares with your own perception of what
-is needed to boot, and that the output of the script /usr/share/mdadm/mkconf
-is sane after installation and before you reboot.
-
-Also, you may want to provide yourself a safety net by making a copy of the
-initrd:
-
-  cp /boot/initrd.img-$(uname -r) /boot/initrd.img-$(uname -r).before-mdadm25
-
-and then to duplicate your main grub or lilo stanzas (rerun lilo!) and point
-them to the saved initrd. If things go haywire, you should be able to restore
-a working condition with the saved initrd.
-
-If you want to move to the new hooks and scripts without installing
-initramfs-tools 0.70, do this:
-
-  rm /usr/share/initramfs-tools/hooks/md
-  sed -i -e 's,^PREREQ=\"md\"$,PREREQ=\"mdadm\",' \
-    /usr/share/initramfs-tools/scripts/local-top/lvm
-  update-initramfs -u -k$(uname -r)
-
-(that -k is due to #375671. If update-initramfs says something about
-initrd having been altered and refuses to do something, use -t unless you
-modified the initrd on purpose and don't want it overwritten.)
-
-Again, please report success or failure to me.
-
- -- martin f. krafft <madduck at debian.org>  Mon, 31 Jul 2006 14:32:21 +0100

Copied: mdadm/trunk/debian/README.initramfs-transition (from rev 44, mdadm/trunk/debian/README.experimental)

Modified: mdadm/trunk/debian/README.mdrun
===================================================================
--- mdadm/trunk/debian/README.mdrun	2006-07-31 13:32:43 UTC (rev 44)
+++ mdadm/trunk/debian/README.mdrun	2006-07-31 13:36:02 UTC (rev 45)
@@ -7,14 +7,14 @@
 
 Fortunately, mdadm has since added all the functionality needed to replace
 mdrun. Thus, with mdadm 2.5, mdrun has been deprecated in Debian, and will be
-removed in a future release.
+removed in a future release (but not before etch).
 
 mdrun may be used in three cases, and the following list includes what you can
 do to rid yourself of mdrun:
 
   initramfs:
-    upgrade to the latest version of initramfs (and see README.experimental
-    for now).
+    upgrade to the latest version of initramfs (and see
+    README.initramfs-transition for now).
 
   custom scripts / command line use:
     the command to replace mdrun is:
@@ -24,8 +24,8 @@
     to be able to run this command, you need to ensure that
     /etc/mdadm/mdadm.conf (or /etc/mdadm.conf, which is less preferred)
     properly describes your RAID volumes. You can use the output generated by
-    the script /usr/share/mdadm/mkconf to help you migrate an existing or
-    create a new configuration file.
+    the script /usr/share/mdadm/mkconf to help you migrate an existing
+    configuration or to create a new configuration file.
 
     You can find more information in the mdadm(8) and mdadm.conf(5) manpages.
 
@@ -40,4 +40,4 @@
 
 Have fun,
 
- -- martin f. krafft <madduck at debian.org>  Tue, 27 Jun 2006 14:19:23 +0200
+ -- martin f. krafft <madduck at debian.org>  Mon, 31 Jul 2006 14:35:08 +0100

Modified: mdadm/trunk/debian/changelog
===================================================================
--- mdadm/trunk/debian/changelog	2006-07-31 13:32:43 UTC (rev 44)
+++ mdadm/trunk/debian/changelog	2006-07-31 13:36:02 UTC (rev 45)
@@ -6,10 +6,12 @@
     (closes: #380596).
   * Forcing RAID assembly to run the arrays, working around an upstream bug
     until that's fixed (closes: #287415).
+  * Updated documentation in README.initramfs-transition to include
+    information related to #380089.
   * Updated debconf translations:
     - Vietnamese by Clytie Syddall, thanks!
 
- -- martin f. krafft <madduck at debian.org>  Mon, 31 Jul 2006 12:37:29 +0100
+ -- martin f. krafft <madduck at debian.org>  Mon, 31 Jul 2006 14:35:38 +0100
 
 mdadm (2.5.2-8) unstable; urgency=low
 

Modified: mdadm/trunk/debian/initramfs/hook
===================================================================
--- mdadm/trunk/debian/initramfs/hook	2006-07-31 13:32:43 UTC (rev 44)
+++ mdadm/trunk/debian/initramfs/hook	2006-07-31 13:36:02 UTC (rev 45)
@@ -21,7 +21,7 @@
 
 if [ -e /usr/share/initramfs-tools/hooks/md ]; then
   echo "I: mdadm: initramfs md hook still present, stepping out of its way." >&2
-  echo "I: Please see /usr/share/doc/mdadm/README.experimental ." >&2
+  echo "I: Please see /usr/share/doc/mdadm/README.initramfs-transition ." >&2
   exit 0
 fi
 

Modified: mdadm/trunk/debian/mdadm.docs
===================================================================
--- mdadm/trunk/debian/mdadm.docs	2006-07-31 13:32:43 UTC (rev 44)
+++ mdadm/trunk/debian/mdadm.docs	2006-07-31 13:36:02 UTC (rev 45)
@@ -1,4 +1,5 @@
 debian/README.recipes
+debian/README.initramfs-transition
 debian/README.mdrun
 md.txt
 rootraiddoc.97.html

Modified: mdadm/trunk/debian/rules
===================================================================
--- mdadm/trunk/debian/rules	2006-07-31 13:32:43 UTC (rev 44)
+++ mdadm/trunk/debian/rules	2006-07-31 13:36:02 UTC (rev 45)
@@ -84,7 +84,7 @@
 	dh_testdir
 	dh_testroot
 	dh_installdebconf	
-	dh_installdocs debian/README.experimental
+	dh_installdocs
 	dh_installexamples
 	dh_installinit --init-script=mdadm-raid --no-start -- start 25 S . start 50 0 6 .
 	dh_installinit -- defaults 25




More information about the pkg-mdadm-commits mailing list