diff options
author | martin f. krafft <madduck@debian.org> | 2009-03-09 16:45:01 +0100 |
---|---|---|
committer | martin f. krafft <madduck@debian.org> | 2009-03-09 16:46:36 +0100 |
commit | 98a2dee0543c3d6fceeffb904a0a3959105bc677 (patch) | |
tree | 8cd89c9da7c861eb15cb821099ffa3f35c53853b /debian | |
parent | db7c9194514f7b8b2d00a8f4333554e8e127a7a6 (diff) |
remove trailing whitespace
Diffstat (limited to 'debian')
-rw-r--r-- | debian/FAQ | 22 | ||||
-rw-r--r-- | debian/NEWS | 12 | ||||
-rw-r--r-- | debian/README.recipes | 2 | ||||
-rwxr-xr-x | debian/bugscript | 2 | ||||
-rw-r--r-- | debian/changelog | 8 | ||||
-rw-r--r-- | debian/copyright | 4 | ||||
-rw-r--r-- | debian/initramfs/hook | 8 | ||||
-rw-r--r-- | debian/mdadm-startall.sgml | 4 | ||||
-rw-r--r-- | debian/mdadm.config | 4 | ||||
-rw-r--r-- | debian/mdadm.postinst | 2 | ||||
-rw-r--r-- | debian/mkconf | 4 | ||||
-rwxr-xr-x | debian/newdisk | 2 | ||||
-rw-r--r-- | debian/po/es.po | 2 | ||||
-rw-r--r-- | debian/po/eu.po | 2 |
14 files changed, 39 insertions, 39 deletions
@@ -59,11 +59,11 @@ The latest version of this FAQ is available here: mdadm --detail /dev/mdX | sed -ne 's,.*Version : ,,p' to determine the superblock version of a running array, or - + mdadm --examine /dev/sdXY | sed -ne 's,.*Version : ,,p' to determine the superblock version from a component device of an array. - + Version 0 superblocks (00.90.XX) '''''''''''''''''''''''''''''''' You need to know the preferred minor number stored in the superblock, @@ -111,7 +111,7 @@ The latest version of this FAQ is available here: space. For example, if you have disks of size X, then in order to get 2X storage, you need 3 disks for RAID5, but 4 if you use RAID10 or RAID1+0 (or RAID6). - + This gain in usable space comes at a price: performance; RAID1/10 can be up to four times faster than RAID4/5/6. @@ -206,7 +206,7 @@ The latest version of this FAQ is available here: RAID1+0/10 has a greater chance to survive two disk failures, its performance suffers less when in degraded state, and it resyncs faster after replacing a failed disk. - + See http://aput.net/~jheiss/raid10/ for more details. 7. Which RAID10 layout scheme should I use @@ -239,7 +239,7 @@ The latest version of this FAQ is available here: hdd4 Bb1 Db1 .... Ba2 Da2 Where the second set start half-way through the drives. - + The advantage of far= is that you can easily spread a long sequential read across the drives. The cost is more seeking for writes. offset= can possibly get similar benefits with large enough chunk size. Neither upstream @@ -266,7 +266,7 @@ The latest version of this FAQ is available here: * dm-crypt * EVMS * The array is used by a process (check with `lsof') - + 9. Should I use RAID0 (or linear)? ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ No. Unless you know what you're doing and keep backups, or use it for data @@ -290,7 +290,7 @@ The latest version of this FAQ is available here: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In certain configurations, especially if your last partition extends all the way to the end of the disk, mdadm may display a warning like: - + mdadm: WARNING /dev/hdc3 and /dev/hdc appear to have very similar superblocks. If they are really different, please --zero the superblock on one. If they are the same or overlap, please remove one from the DEVICE @@ -313,7 +313,7 @@ The latest version of this FAQ is available here: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In almost all cases, mdadm updates the super-minor field in an array's superblock when assembling the array. It does *not* do this for RAID0 - arrays. Thus, you may end up seeing something like this when you run + arrays. Thus, you may end up seeing something like this when you run mdadm -E or mkconf: ARRAY /dev/md0 level=raid0 num-devices=2 UUID=abcd... @@ -438,7 +438,7 @@ The latest version of this FAQ is available here: 2 0/0 1/1 1/1 1/1 3 0/0 1/1 2/2 2/2 4 0/0 1/2 2/2 3/3 - 5 0/0 1/2 2/2 3/3 + 5 0/0 1/2 2/2 3/3 6 0/0 1/3 2/3 3/3 7 0/0 1/3 2/3 3/3 8 0/0 1/4 2/3 3/4 @@ -450,7 +450,7 @@ The latest version of this FAQ is available here: 19. What should I do if a disk fails? ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Replace it as soon as possible: - + mdadm --remove /dev/md0 /dev/sda1 halt <replace disk and start the machine> @@ -460,7 +460,7 @@ The latest version of this FAQ is available here: array? ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Did you read the previous question and its answer? - + For cases when you have two copies of each block, the question is easily answered by looking at the output of /proc/mdstat. For instance on a four disk array: diff --git a/debian/NEWS b/debian/NEWS index f6b46e98..a82c6aba 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -40,16 +40,16 @@ mdadm (2.5-1) unstable; urgency=low mdadm (2.4.1-5) unstable; urgency=low - This version drops the automatic generation of the /etc/mdadm/mdadm.conf - file on every boot (if it was missing). This means that you need to ensure + This version drops the automatic generation of the /etc/mdadm/mdadm.conf + file on every boot (if it was missing). This means that you need to ensure that you have a valid configuration file. If none is present during package configuration, mdadm *will* try to generate one, but it will only contain - information about arrays that were running at the time of package - configuration. Arrays not listed in the configuration file will *not* be + information about arrays that were running at the time of package + configuration. Arrays not listed in the configuration file will *not* be started automatically after boot (with the exception of the root partition). - If you want to recreate your configuration file, either figure out what it - should contain from the mdadm.conf(5) manpage, or simply assemble and run + If you want to recreate your configuration file, either figure out what it + should contain from the mdadm.conf(5) manpage, or simply assemble and run all the arrays the way you like it, then run /usr/share/mdadm/mkconf force-generate /etc/mdadm/mdadm.conf diff --git a/debian/README.recipes b/debian/README.recipes index 004e0ca8..ad8c5fb2 100644 --- a/debian/README.recipes +++ b/debian/README.recipes @@ -86,7 +86,7 @@ The latest version of this document is available here: 10. convert existing filesystem to RAID 1 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # The idea is to create a degraded RAID 1 on the second partition, move - # data, then hot add the first. This seems safer to me than simply to + # data, then hot add the first. This seems safer to me than simply to # force-add a superblock to the existing filesystem. # # Assume /dev/sda1 holds the data (and let's assume it's mounted on diff --git a/debian/bugscript b/debian/bugscript index d78a69b9..4fb920c2 100755 --- a/debian/bugscript +++ b/debian/bugscript @@ -52,7 +52,7 @@ echo >&3 echo "--- /proc/mdstat:" >&3 cat /proc/mdstat >&3 2>&3 || : echo >&3 - + echo "--- /proc/partitions:" >&3 cat /proc/partitions >&3 2>&3 || : echo >&3 diff --git a/debian/changelog b/debian/changelog index 32be2399..78f599a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1195,7 +1195,7 @@ mdadm (1.2.0-1) unstable; urgency=low mdadm (1.0.1-4) unstable; urgency=low - * Changed mdrun so that it can deal with partition statistics in + * Changed mdrun so that it can deal with partition statistics in /proc/partitions. (closes: Bug#174000, Bug#175130) * Added russian (ru) debconf template translation. Thanks to Sergey @@ -1245,7 +1245,7 @@ mdadm (0.7.2-1) unstable; urgency=low mdctl (0.5-4) unstable; urgency=low * Added debconf template to ask the user if the init script links - should be updated. + should be updated. -- Mario Joussen <joussen@debian.org> Mon, 4 Mar 2002 22:53:37 +0100 @@ -1253,7 +1253,7 @@ mdctl (0.5-3) unstable; urgency=low * Splitted up init script in two parts. One starts the md array and the other starts the raid monitor daemon. - (closes: Bug#136184) + (closes: Bug#136184) -- Mario Joussen <joussen@debian.org> Thu, 28 Feb 2002 22:45:57 +0100 @@ -1266,7 +1266,7 @@ mdctl (0.5-2) unstable; urgency=low * Added an init script, which can start md arrays and the raid monitor daemon * MD devices are now created under /dev if necessary - * Added a sample configuration file + * Added a sample configuration file -- Mario Joussen <mario@joussen.org> Sun, 13 Jan 2002 23:43:40 +0100 diff --git a/debian/copyright b/debian/copyright index 1ef87bf9..371947a4 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,6 @@ This package was debianized by Mario Jou/3en <joussen@debian.org> on Wed, 26 Dec 2001 17:07:09 +0100. -Martin F. Krafft <madduck@debian.org> took over on +Martin F. Krafft <madduck@debian.org> took over on Tue, 16 May 2006 13:21:06 -0500 The mdadm source was downloaded from @@ -17,5 +17,5 @@ it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. -On Debian GNU/Linux systems, the complete text of the GNU General +On Debian GNU/Linux systems, the complete text of the GNU General Public License can be found in '/usr/share/common-licenses/GPL'. diff --git a/debian/initramfs/hook b/debian/initramfs/hook index e0a42bfd..d824285d 100644 --- a/debian/initramfs/hook +++ b/debian/initramfs/hook @@ -110,7 +110,7 @@ install_config() if [ ! -f $CONFIG ]; then # there is no configuration file, so let's create one - + if /usr/share/mdadm/mkconf generate $CONFIG; then # all is well install_config $CONFIG $DESTMDADMCONF @@ -120,9 +120,9 @@ if [ ! -f $CONFIG ]; then warn "failed to auto-generate the mdadm.conf file." warn "please read /usr/share/doc/mdadm/README.upgrading-2.5.3.gz ." fi - -else - + +else + use_temp=0 if [ -e /var/lib/mdadm/CONF-UNCHECKED ]; then # the file comes from an old installation and hence is not guaranteed to diff --git a/debian/mdadm-startall.sgml b/debian/mdadm-startall.sgml index f64aba05..c47b1f89 100644 --- a/debian/mdadm-startall.sgml +++ b/debian/mdadm-startall.sgml @@ -8,7 +8,7 @@ manpage.1: manpage.sgml docbook-to-man $< > $@ - + The docbook-to-man binary is found in the docbook-to-man package. Please remember that if you create the nroff version in one of the debian/rules file targets (such as build), you will need to include @@ -84,7 +84,7 @@ manpage.1: manpage.sgml <para>This manual page was written by &dhusername; &dhemail; for the &debian; system (but may be used by others). Permission is granted to copy, distribute and/or modify this document under - the terms of the &gnu; General Public License, Version 2 any + the terms of the &gnu; General Public License, Version 2 any later version published by the Free Software Foundation. </para> <para> diff --git a/debian/mdadm.config b/debian/mdadm.config index 45b9f221..39fffe2b 100644 --- a/debian/mdadm.config +++ b/debian/mdadm.config @@ -16,7 +16,7 @@ set -eu CONFIG=/etc/mdadm/mdadm.conf ALTCONFIG=/etc/mdadm.conf -[ ! -f $CONFIG ] && [ -f $ALTCONFIG ] && CONFIG=$ALTCONFIG +[ ! -f $CONFIG ] && [ -f $ALTCONFIG ] && CONFIG=$ALTCONFIG DEBIANCONFIG=/etc/default/mdadm DEBIANCONFIG_OLD=/etc/mdadm/debian.conf @@ -138,7 +138,7 @@ while true; do if ! mdadm --detail "$i" >/dev/null 2>&1; then error=1; msg=errmd; suffix=": $i"; break fi - + if [ -f $CONFIG ]; then if ! egrep -q "^(ARRAY)?[[:space:]]+$i([[:space:]]+|$)" $CONFIG; then t="$(readlink -nf "$i")" diff --git a/debian/mdadm.postinst b/debian/mdadm.postinst index bfb8d72b..acd03a66 100644 --- a/debian/mdadm.postinst +++ b/debian/mdadm.postinst @@ -164,7 +164,7 @@ esac # not affect woody upgraders) if [ "${1:-}" = "configure" ] && [ "${2:-}" = "1.9.0-2.1" ] \ && test -L /etc/rcS.d/S04mdadm-raid; -then +then update-rc.d -f mdadm-raid remove fi diff --git a/debian/mkconf b/debian/mkconf index f712e959..85a8f6fa 100644 --- a/debian/mkconf +++ b/debian/mkconf @@ -40,7 +40,7 @@ case "${1:-}" in echo "E: $ME: $CONFIG already exists." >&2 exit 255 fi - + mkdir --parent ${CONFIG%/*} exec >$CONFIG generate=1 @@ -72,7 +72,7 @@ if [ -n "${PROGRAM:-}" ]; then cat <<-_eof # program to run when mdadm monitor detects potentially interesting events PROGRAM ${PROGRAM} - + _eof fi diff --git a/debian/newdisk b/debian/newdisk index 7c18339d..3dd3e49c 100755 --- a/debian/newdisk +++ b/debian/newdisk @@ -187,7 +187,7 @@ while read STRING; do if echo "$STRING" |grep -q "^ARRAY "; then MD_DEV=$(echo "$STRING" |awk '{ print $2 }') fi - + if echo "$STRING" |grep -q "devices=.*$SOURCE"; then NO_ADD=0 PARTITION_NR="$(echo "$STRING" |sed -e s:".*devices=.*$SOURCE":"": -e s:",.*":"":)" diff --git a/debian/po/es.po b/debian/po/es.po index 046aa777..06e5536e 100644 --- a/debian/po/es.po +++ b/debian/po/es.po @@ -9,7 +9,7 @@ # Fernando Cerezal # # -# Traductores, si no conoce el formato PO, merece la pena leer la +# Traductores, si no conoce el formato PO, merece la pena leer la # documentación de gettext, especialmente las secciones dedicadas a este # formato, por ejemplo ejecutando: # info -n '(gettext)PO Files' diff --git a/debian/po/eu.po b/debian/po/eu.po index 5a385cf3..498c4105 100644 --- a/debian/po/eu.po +++ b/debian/po/eu.po @@ -185,7 +185,7 @@ msgid "" msgstr "" "Kernelak onartzen badu (2.6.14 baino bertsio berriagoak), mdadm-ek aldiro " "MD array-en (RAID-en) erredundantzia aldiro egiazta dezake. Hau errekurtso-behar " -"handiko prozesu bat izan daiteke, konfigurazio lokalaren arabera, baina datu " +"handiko prozesu bat izan daiteke, konfigurazio lokalaren arabera, baina datu " "galera kasuak saihesten lagundu dezake. Kontutan izan errorerik aurkitzen ez bada " "irakurketa-soileko egiaztapen bat dela; errorerik arukituko balitz mdadm " "konpontzen saiatuko da, honetarako euskarrian idaztea beharrezko izan daitekeelarik." |