diff options
| -rw-r--r-- | debian/FAQ | 14 | ||||
| -rw-r--r-- | debian/NEWS | 14 | ||||
| -rw-r--r-- | debian/README.initramfs-transition | 6 | ||||
| -rw-r--r-- | debian/README.mdrun | 45 | ||||
| -rw-r--r-- | debian/README.upgrading-2.5.3 | 5 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/initramfs/hook | 4 | ||||
| -rw-r--r-- | debian/mdadm.docs | 1 | ||||
| -rw-r--r-- | debian/mdadm.manpages | 1 | ||||
| -rw-r--r-- | debian/mdadm.postinst | 6 | ||||
| -rw-r--r-- | debian/mdrun | 189 | ||||
| -rw-r--r-- | debian/mdrun.8 | 65 | ||||
| -rwxr-xr-x | debian/rules | 3 |
13 files changed, 41 insertions, 318 deletions
@@ -527,6 +527,20 @@ The latest version of this FAQ is available here: fail to assemble them and print a warning. If you don't like that, disable AUTOSTART in /etc/default/mdadm. +24. What happened to mdrun? How do I replace it? +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + mdrun used to be the sledgehammer approach to assembling arrays. It has + accumulated several problems over the years (e.g. #354705) and thus has been + deprecated and removed with the 2.6.7-2 version of this package. + + If you are still using mdrun, please ensure that you have a valid + /etc/mdadm/mdadm.conf file (run /usr/share/mdadm/mkconf --generate to get + one), and use + + mdadm --assemble --scan --auto=yes + + instead of mdrun. + -- martin f. krafft <madduck@debian.org> Thu, 06 Sep 2007 23:38:16 +0200 $Id$ diff --git a/debian/NEWS b/debian/NEWS index 1bd2ec57..c481d49d 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,3 +1,17 @@ +mdadm (2.6.7-2) unstable; urgency=low + + This version removes mdrun once and for all. + + If you are still using mdrun, please ensure that you have a valid + /etc/mdadm/mdadm.conf file (run /usr/share/mdadm/mkconf --generate to get + one), and use + + mdadm --assemble --scan --auto=yes + + instead of mdrun. + + -- martin f. krafft <madduck@debian.org> Wed, 02 Jul 2008 10:57:32 +0200 + mdadm (2.5.3.git200608201206-1) unstable; urgency=low This version makes mdadm.conf mandatory. If you do not have such a file, it diff --git a/debian/README.initramfs-transition b/debian/README.initramfs-transition index 671e4de1..2c313cca 100644 --- a/debian/README.initramfs-transition +++ b/debian/README.initramfs-transition @@ -4,13 +4,13 @@ mdadm for Debian - initramfs transition If you are using monolithic kernels (no modules), you need not concern yourself with any of this. -If you are using yaird or initrd-tools/mkinitrd, please see README.mdrun. The -following information is irrelevant to you. +If you are using yaird or initrd-tools/mkinitrd, then the following +information is irrelevant to you. The following information is about #367567. The gist is that the hooks and scripts to take care of MD arrays (RAIDs) during boot with an initramfs have been improved and moved into the mdadm package. mdrun has been deprecated on -the way (see README.mdrun). +the way. 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 diff --git a/debian/README.mdrun b/debian/README.mdrun deleted file mode 100644 index bc5c6c6b..00000000 --- a/debian/README.mdrun +++ /dev/null @@ -1,45 +0,0 @@ -mdadm for Debian -- notes on mdrun -================================== - -mdadm for Debian ships with /sbin/mdrun, which is a sledgehammer approach to -assembling MD arrays (RAIDs) during boot. Unfortunately, the script has several -problems (see e.g. #354705) and can cause major headaches. - -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 (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.initramfs-transition for now). - - custom scripts / command line use: - the command to replace mdrun is: - - mdadm --assemble --scan --auto=yes - - 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 MD arrays. You can use the output generated - by 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. - - custom init.d scripts: - while this release includes init.d scripts that do not use mdrun, you may - still have custom scripts around. Please consider whether they are still - needed. If they do things that the mdadm init.d scripts do not do, - consider whether it would be useful to file a wishlist bug. - - Please note that you also need to a correct mdadm.conf file, as described - above. - -Have fun, - - -- martin f. krafft <madduck@debian.org> Mon, 31 Jul 2006 14:35:08 +0100 - -$Id$ diff --git a/debian/README.upgrading-2.5.3 b/debian/README.upgrading-2.5.3 index b77615b1..4850631f 100644 --- a/debian/README.upgrading-2.5.3 +++ b/debian/README.upgrading-2.5.3 @@ -8,9 +8,8 @@ also be read if the former is not present, but it is less preferred. The reason the configuration file is now required is because it was impossible to come up with robust heuristics to replace the previously used mdrun, while addressing its primary deficiency of not honouring the super-minor field and -randomly assembling devices (see #354705). - -Also see /usr/share/doc/mdadm/README.mdrun +randomly assembling devices (see #354705). mdrun has been deprecated and is no +longer provided by this package. Systems without a mdadm.conf file ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/debian/changelog b/debian/changelog index cf4b0aa9..99f349d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mdadm (2.6.7-2) unstable; urgency=low + + * Remove mdrun completely. + + -- martin f. krafft <madduck@debian.org> Wed, 02 Jul 2008 11:13:18 +0200 + mdadm (2.6.7-1) unstable; urgency=low * New upstream version, which diff --git a/debian/initramfs/hook b/debian/initramfs/hook index f08c1e26..21a12b7a 100644 --- a/debian/initramfs/hook +++ b/debian/initramfs/hook @@ -57,8 +57,8 @@ fi if [ -e /etc/initramfs-tools/hooks/md ]; then warn "I found /etc/initramfs-tools/hooks/md, which may conflict" - warn "with this version of mdadm. Please see /usr/share/doc/mdadm/README.mdrun" - warn "and /usr/share/initramfs-tools/hooks/mdadm for reference and update" + warn "with this version of mdadm. Please use" + warn "/usr/share/initramfs-tools/hooks/mdadm as reference and update" warn "(or remove) the file." exit 0 fi diff --git a/debian/mdadm.docs b/debian/mdadm.docs index 2a34ed24..daf5761c 100644 --- a/debian/mdadm.docs +++ b/debian/mdadm.docs @@ -2,7 +2,6 @@ TODO debian/README.recipes debian/README.initramfs-transition debian/README.upgrading-2.5.3 -debian/README.mdrun debian/README.checkarray debian/FAQ md.txt diff --git a/debian/mdadm.manpages b/debian/mdadm.manpages index 8dedb236..759cbd29 100644 --- a/debian/mdadm.manpages +++ b/debian/mdadm.manpages @@ -1,5 +1,4 @@ mdadm.8 md.4 mdadm.conf.5 -debian/mdrun.8 debian/mdadm-startall.8 diff --git a/debian/mdadm.postinst b/debian/mdadm.postinst index e15159d7..040b8181 100644 --- a/debian/mdadm.postinst +++ b/debian/mdadm.postinst @@ -129,12 +129,6 @@ VERBOSE=${VERBOSE:-false} # MAIL_TO: # this variable is now managed in /etc/mdadm/mdadm.conf (MAILADDR). # Please see mdadm.conf(5). - -# USE_DEPRECATED_MDRUN: -# mdrun is deprecated. If you still want to use it without a warning, set -# the following to true. -# -USE_DEPRECATED_MDRUN=${USE_DEPRECATED_MDRUN:-false} _eof db_stop diff --git a/debian/mdrun b/debian/mdrun deleted file mode 100644 index cb63ff3d..00000000 --- a/debian/mdrun +++ /dev/null @@ -1,189 +0,0 @@ -#!/bin/sh - -# mdrun, (c) Eduard Bloch <blade@debian.org> 2003 - -# Usage: -# Without arguments: autodetect all RAID partitions and activate MDs -# Arguments: [ DEVDIR ] NUMBER UUID [ <NUMBER UUID> ... ] -# a number of number/uuid pairs, where NUMBER is the one from /dev/md/* -# Argument: LIST -# lists all raids in the syntax needed for the pairs (see above) - -# IMPORTANT: create /dev/fs directory if you have devfs support in the kernel -# but do not want to mount it over /dev. Usage of /dev/fs directory will keep -# mdrun away from /dev. - -# If the first argument is a directory, it will be used as a writeable -# temporary directory for device nodes. mdrun needs mknod to create them -# on-the-fly - -# Environment: -# MORERAIDVOLUMES (list of strings) : additional raid disks to scan, -# eg. loop devices - -is_true() -{ - case "$1" in - [Yy]es|[Yy]|1|[Tt]rue) return 0;; - *) return 1; - esac -} - -warn() -{ - echo "$@" >&2 -} - -[ -f /etc/default/mdadm ] && . /etc/default/mdadm -# disabled until the transition is complete -if false && ! is_true $USE_DEPRECATED_MDRUN; then - warn - warn ========================= - warn mdrun deprecation warning - warn ========================= - warn - warn If you are seeing this during boot, please upgrade to a newer - warn version of the initramfs-tools package and ignore the rest of - warn this message. - warn - warn You are running $0, or your system is not properly configured - warn such that $0 is used as a fallback. Due to technical limitations, - warn $0 is deprecated and will be removed in a future relese of mdadm. - warn Please see /usr/share/doc/mdadm/README.mdrun for more info. - warn - - TIMEOUT=15 - if [ -r /dev/stdin ]; then - # cannot use -t or -n, which is not POSIX - read -p'Please hit return to continue...' resp < /dev/stdin >&2 - warn - else - warn "Pausing for $TIMEOUT seconds..." >&2 - sleep $TIMEOUT - fi -fi - -if ! test -e /proc/partitions ; then - echo "/proc not mounted!" - exit 1 -fi - -DEVDIR=/dev - -if [ -d "$1" ] ; then - AUTOCREATE=true - DEVDIR="$1" - shift -fi - -# For people that compile the kernel with devfs (means: different -# proc/partitions content), but without auto-mounting it -if ! uname -r | grep "^2.6" 1>/dev/null && [ -z "$AUTOCREATE" ] && grep " devfs" /proc/filesystems >/dev/null 2>&1 && ! grep "^devfs" /proc/mounts >/dev/null 2>&1 ; then - - mkdir /dev/fs 2>/dev/null - # if we can do it - good, we will use it. Otherwise, use /dev even if it is ugly - - # mount devfs for now to make the device names match, umount later - if [ -d /dev/fs ] ; then - DEVDIR=/dev/fs - fi - mount none $DEVDIR -tdevfs - UMNTDEVFS="umount $DEVDIR" -fi - -# arr(array, index): return contents in array[index]; as with Bourne shell -# in general, there is no easy way to distinguish between index not -# existing and empty string assigned. -arr() { sa_i=`arr_index $2`; eval "echo \"\$$1_${sa_i}\""; unset sa_i; } - -# seterr(array, index, value): assign the given value to array[index]. -setarr() { sa_i=`arr_index $2`; eval "$1_${sa_i}=\"$3\""; unset sa_i; } - -# arr_index(index): make sure the given index is valid for use. -arr_index() { echo $1 | sed -e 's/:/_/g' | sed 's;/;_;g'; } - - -BASE=$DEVDIR/md -export BASE -#devfs -test -d $BASE && BASE=$BASE/ - -next_free_md() { - for raidnr in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24; do - if ! mdadm -D $BASE$raidnr >/dev/null 2>&1 ; then - echo $BASE$raidnr - return 0 - fi - done - return 1 -} - -listpairs() { - for NUMBER in `cat /proc/mdstat | grep "^md. : active" | sed -e 's/^md\(.\) :.*/\1/'`; do - echo $NUMBER - mdadm -D ${BASE}$NUMBER 2>/dev/null |grep UUID | sed 's/.*: \(.*\)/\1/' - done -} - -if [ "$1" = LIST ] ; then - echo `listpairs` - $UMNTDEVFS - exit 0 -fi - -DEVDIRESC=$(echo $DEVDIR | sed -e 's!/!\\/!g') -if [ "$AUTOCREATE" ] ; then - CREATECMD=$(sed -e "s/.*major.*//; s/.*\ \([:0-9:]\+\)\ \+\ \([:0-9:]\+\)\ \+\ [:0-9:]\+\ \+\([:a-z0-9\/:]\+\).*/mknod \3 b \1 \2 ; / ; s/\//_/g" < /proc/partitions) - export CREATECMD - export DEVDIR - # and we need array nodes, of course - ( - cd $DEVDIR ; - eval $CREATECMD ; - for x in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 ; do - mknod ${BASE}$x b 9 $x - done - ) - PARTLIST=$(sed -e "s/.*major.*//; s/.*\ \([:0-9:]\+\)\ \+\ \([:0-9:]\+\)\ \+\ [:0-9:]\+\ \+\([:a-z0-9\/:]\+\).*/DEVDIR\3 /; s/\//_/g ; s/DEVDIR/$DEVDIRESC\//;" < /proc/partitions) -else - PARTLIST=$(sed -e "s/.*major.*//; s/^[:0-9 :]* \([:a-z:].[:a-z0-9\/:]*\).*/\1/; s/^\([:a-z:].*\)/$DEVDIRESC\/\1/g" < /proc/partitions) -fi - -for SRC in $PARTLIST $MORERAIDVOLUMES ; do - SUM=$(mdadm -E $SRC 2>/dev/null | grep UUID | sed 's/.*: \(.*\)/\1/') - for x in $SUM; do - UUIDS="$UUIDS $SUM" - setarr MDS $SUM "`arr MDS $SUM` $SRC" - done -done - -if [ "$#" -gt 1 ] ; then - NUMBER=${BASE}$1 - MD=$2 - shift ; shift - if [ "`arr MDS $MD`" != "started" ] ; then - mdadm -A -a yes $NUMBER -f `arr MDS $MD` && setarr MDS $MD "started" - # just to be sure - ln /dev/md/$NUMBER /dev/md$NUMBER 2>/dev/null - fi -fi - -# and process the rest, if it exists -# do not touch active arrays -#dropactive() { - for NUMBER in `cat /proc/mdstat | grep "^md. : active" | sed -e 's/^md\(.\) :.*/\1/'`; do - setarr MDS `mdadm -D ${BASE}$NUMBER 2>/dev/null |grep UUID | sed 's/.*: \(.*\)/\1/'` "started" - done -#} - - -for MD in $UUIDS; do - if [ "`arr MDS $MD`" != "started" ] ; then - NUMBER=`next_free_md` - mdadm -A -a yes $NUMBER -f `arr MDS $MD` && setarr MDS $MD "started" - # just to be sure - ln /dev/md/$NUMBER /dev/md$NUMBER 2>/dev/null - fi -done - -$UMNTDEVFS diff --git a/debian/mdrun.8 b/debian/mdrun.8 deleted file mode 100644 index 5d405c90..00000000 --- a/debian/mdrun.8 +++ /dev/null @@ -1,65 +0,0 @@ -.\" -.\" This man page writeen aug 13 3004 by Robert Collins <robertc@robertcollins.net> -.\" This template provided by Tom Christiansen <tchrist@jhereg.perl.com>. -.\" -.TH MDRUN 8 -.SH NAME -mdrun \- autodetect and activate all raid partitions -.SH SYNOPSIS -mdrun detects all (or named) raid partitions and activates them. - -Without arguments: autodetect all RAID partitions and activate MDs. -.PP -.B mdrun -.B LIST -.PP -.B mdrun -[ -.I DEVDIR -] -.I NUMBER UUID -[ -.I NUMBER UUID ... -] -.SH WARNING -mdrun has been deprecated on Debian. Please use -.B mdadm -instead. You can find information on how to use and configure -.B mdadm -in the -.BR mdadm(8) -and -.BR mdadm.conf(5) -manpages -.SH OPTIONS -.TP -.B LIST -lists all raids in the syntax needed for the number uuid pairs the alternative syntax accepts. -.TP -.I DEVDIR -An optional override for the /dev directory. -.TP -.I NUMBER UUID -pairs of number, uuids that define a md element to run. number comes from /dev/md/*. -.SH "RETURN VALUE" -Nothing is displayed and mdrun returns 0 on success. -.SH ERRORS -On error, non-zero is returned, and a diagnostic string is printed. -.SH EXAMPLES -mdrun. -.SH ENVIRONMENT -MORERAIDVOLUMES (list of strings) : additional raid disks to scan, eg. loop devices. -.SH NOTES -If the first argument is a directory, it will be used as a writeable temporary directory for device nodes. -mdrun needs mknod to create them on-the-fly. -.SH CAVEATS -Create /dev/fs directory if you have devfs support in the kernel but do not want to mount it over /dev. -Usage of /dev/fs directory will keep mdrun away from /dev. -.SH AUTHOR -Eduard Bloch <blade@debian.org>. -.SH HISTORY -This man page was created Aug 13 2004 by Robert Collins. -.SH "SEE ALSO" -.BR mdadm (8). - - diff --git a/debian/rules b/debian/rules index 1be602ec..7f751d7b 100755 --- a/debian/rules +++ b/debian/rules @@ -61,10 +61,7 @@ install: build dh_clean -k dh_installdirs install -m0755 mdadm $(DESTDIR)/sbin - install -m0755 debian/mdrun $(DESTDIR)/sbin - install -m0755 mdadm.udeb $(DESTDIR_UDEB)/sbin/mdadm - install -m0755 debian/mdrun $(DESTDIR_UDEB)/sbin install -m0755 debian/initramfs/hook \ $(DESTDIR)/usr/share/initramfs-tools/hooks/mdadm |