diff options
Diffstat (limited to 'debian')
-rw-r--r-- | debian/README.Debian | 8 | ||||
-rw-r--r-- | debian/README.upgrading-2.5.3 | 15 | ||||
-rw-r--r-- | debian/TODO | 13 | ||||
-rw-r--r-- | debian/UPGRADE-STRATEGY | 2 | ||||
-rw-r--r-- | debian/changelog | 4 | ||||
-rw-r--r-- | debian/mdadm-raid | 3 | ||||
-rw-r--r-- | debian/mdadm.postinst | 2 |
7 files changed, 34 insertions, 13 deletions
diff --git a/debian/README.Debian b/debian/README.Debian index ad3f5110..11ef4270 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -5,11 +5,13 @@ Please make sure you read into /usr/share/doc/mdadm/NEWS.Debian.gz . Also, the documentation for the kernel md driver is included in /usr/share/doc/mdadm/md.txt.gz as well as the md(4) manpage. *Do* read those! -The configuration file -~~~~~~~~~~~~~~~~~~~~~~ -This version of mdadm now needs /etc/mdadm/mdadm.conf, which it will try to +Upgrading and the configuration file +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +This version of mdadm now NEEDS /etc/mdadm/mdadm.conf, which it will try to generate during installation, if nonexistent. +PLEASE MAKE SURE TO READ /usr/share/doc/mdadm/README.upgrading-2.5.3.gz ! + You can use the output of /usr/share/mdadm/mkconf to generate your very own mdadm.conf file, and look into /usr/share/doc/mdadm/examples/mdadm.conf-example for inspiration. diff --git a/debian/README.upgrading-2.5.3 b/debian/README.upgrading-2.5.3 index e59f689d..ea9113ca 100644 --- a/debian/README.upgrading-2.5.3 +++ b/debian/README.upgrading-2.5.3 @@ -1,4 +1,4 @@ -upgrading to mdadm 2.5.3 from previous versions +Upgrading to mdadm 2.5.3 from previous versions =============================================== With version 2.5.3, the Debian mdadm package now requires a mdadm.conf file. @@ -41,6 +41,9 @@ of recommended checks: metadata, and whatever other subsystem uses MD arrays on your machine have a corresponding line in the configuration file. + Make sure to verify that your bootloader refers to the proper device name, + in case your root filesystem is on an MD array. + In particular, verify that the device node name is exactly the same; /dev/md6 is *not* identical to /dev/md/6. Partitionable arrays are a slight exception: if /dev/md_d0p3 is referenced, you need an entry for @@ -54,6 +57,16 @@ of recommended checks: Identifying arrays by UUID is the preferred method. +Once you have verified that the configuration file is accurate, you need to +let mdadm know, and update the initial ramdisk. This is accomplished with the +following two commands: + + rm -f /var/lib/mdadm/CONF-UNCHECKED + update-initramfs -u -k all + +Depending on your setup, mdadm should print an appropriate informational +message. Please make sure that it is in accordance with what you would expect. + What to do if my system does not boot anymore? ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ First thing: don't panic! If your system does not boot anymore as a result of diff --git a/debian/TODO b/debian/TODO index 3a37dcb2..23bc9405 100644 --- a/debian/TODO +++ b/debian/TODO @@ -3,15 +3,14 @@ debian mdadm TODO list - check whether mdadm.conf and system are consistent during initramfs creation and fail otherwise (#381303). -- then switch to using system mdadm.conf in initramfs. -- add debconf question to determine naming scheme. Reuse logic from udev - script mdadm-name-generator.sh to preseed the question, store answer in - /etc/default, make mdadm-name-generator.sh actually use that value. Or just - get rid of mdadm-name-generator.sh and move everything to debconf.config, - then install udev rules for each naming scheme to /usr/share/mdadm and use - ucf to install the appropriate one to /etc. - version-1 is a nightmare. E.g. on partitionable arrays, with / on /dev/md_d0p3, mdadm -Es ignores /dev/md_d0 and just uses the name, so /dev/md/<arrayname>. +- figure out something about device names. + +- VERIFY SARGE UPGRADE +- verify operation without udev + - udev removed before mdadm installed + - udev removed after mdadm installed $Id$ diff --git a/debian/UPGRADE-STRATEGY b/debian/UPGRADE-STRATEGY index 40f30c65..3d1e7637 100644 --- a/debian/UPGRADE-STRATEGY +++ b/debian/UPGRADE-STRATEGY @@ -1,6 +1,8 @@ mdadm: upgrading from sarge -- braindump ======================================== +THIS IS AN OBSOLETE DOCUMENT + The mdrun deprecation means we have to find a proper way to migrate from sarge. The plan is to support diff --git a/debian/changelog b/debian/changelog index ef1a572f..76ec749a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,10 @@ mdadm (2.5.3.git200608202239-1~unreleased.1) UNRELEASED; urgency=low 0 instead of _d0) for device names like md_dX. I actually think this is a bug and hope upstream will use dX (e.g. d0) instead in a future version. + - we specify --symlink=no and thus disable the new feature to create + /dev/mdX symlinks to /dev/md/X devices until the entire device node mess + is cleared up. No need to introduce yet another complicating factor at + this stage. * Instead of trying to do a whole lot of magic with respect to detecting RAID devices to start, mdadm from now on requires a valid mdadm.conf file to be installed. It still tries to do what it can, but there are no diff --git a/debian/mdadm-raid b/debian/mdadm-raid index 1299914c..5f711fd4 100644 --- a/debian/mdadm-raid +++ b/debian/mdadm-raid @@ -28,6 +28,7 @@ short_dev() local dev=${1##*/} case "$dev" in md*|md_*|mdp*|mdp_*) echo "$dev";; + d*) echo "md_${dev}";; *) echo "md${dev}";; esac } @@ -91,7 +92,7 @@ case "${1:-}" in IFSOLD=${IFS:-} IFS=' ' - for line in $($MDADM --assemble --scan --auto=yes 2>&1); do + for line in $($MDADM --assemble --scan --auto=yes --symlink=no 2>&1); do IFS=$IFSOLD set -- $line shift diff --git a/debian/mdadm.postinst b/debian/mdadm.postinst index e9faae2b..7b486bf1 100644 --- a/debian/mdadm.postinst +++ b/debian/mdadm.postinst @@ -8,7 +8,7 @@ . /usr/share/debconf/confmodule # See #369953 for ordering -set -eux +set -eu case "${1:-}" in configure|reconfigure) |