r325 - mdadm/trunk/debian
madduck at users.alioth.debian.org
madduck at users.alioth.debian.org
Sat May 5 18:57:21 UTC 2007
Author: madduck
Date: 2007-05-05 18:57:20 +0000 (Sat, 05 May 2007)
New Revision: 325
Added:
mdadm/trunk/debian/mdadm-startall
mdadm/trunk/debian/mdadm-startall.sgml
Removed:
mdadm/trunk/debian/startall
Modified:
mdadm/trunk/debian/
mdadm/trunk/debian/changelog
mdadm/trunk/debian/control
mdadm/trunk/debian/mdadm.manpages
mdadm/trunk/debian/rules
Log:
* startall is now mdadm-startall and lives in /sbin, thanks to Eduard Bloch.
It now can handle existing mdadm.conf files much more gracefully, mostly
thanks to the above mkconf enhancements (closes: #415336).
Property changes on: mdadm/trunk/debian
___________________________________________________________________
Name: svn:ignore
- *.substvars
files
mdadm
mdadm-udeb
*.debhelper
patched
.*.sw?
*.dch
+ *.substvars
files
mdadm
mdadm-udeb
*.debhelper
patched
.*.sw?
*.dch
mdadm-startall.8
Modified: mdadm/trunk/debian/changelog
===================================================================
--- mdadm/trunk/debian/changelog 2007-05-05 18:49:44 UTC (rev 324)
+++ mdadm/trunk/debian/changelog 2007-05-05 18:57:20 UTC (rev 325)
@@ -9,6 +9,9 @@
HOMEHOST (in addition to MAILADDR, which it preserved previously already).
PROGRAM is preserved but only added to mdadm.conf if it occured in the
previously existing configuration file.
+ * startall is now mdadm-startall and lives in /sbin, thanks to Eduard Bloch.
+ It now can handle existing mdadm.conf files much more gracefully, mostly
+ thanks to the above mkconf enhancements (closes: #415336).
-- martin f. krafft <madduck at debian.org> Sat, 05 May 2007 16:12:29 +0200
Modified: mdadm/trunk/debian/control
===================================================================
--- mdadm/trunk/debian/control 2007-05-05 18:49:44 UTC (rev 324)
+++ mdadm/trunk/debian/control 2007-05-05 18:57:20 UTC (rev 325)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian mdadm maintainers <pkg-mdadm-devel at lists.alioth.debian.org>
Uploaders: martin f. krafft <madduck at debian.org>, Mario Joussen <joussen at debian.org>
-Build-Depends: debhelper (>= 5), po-debconf, dpatch, groff-base
+Build-Depends: debhelper (>= 5), po-debconf, dpatch, groff-base, docbook-to-man
Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.debian.org/pkg-mdadm/mdadm/trunk
Copied: mdadm/trunk/debian/mdadm-startall (from rev 316, mdadm/trunk/debian/startall)
===================================================================
--- mdadm/trunk/debian/startall 2007-03-13 18:35:48 UTC (rev 316)
+++ mdadm/trunk/debian/mdadm-startall 2007-05-05 18:57:20 UTC (rev 325)
@@ -0,0 +1,34 @@
+#!/bin/sh
+#
+# startall -- starts all existing arrays after creating mdadm.conf
+# overrides the AUTOSTART variable in /etc/default/mdadm
+#
+# Copyright © martin f. krafft <madduck at madduck.net>
+# distributed under the terms of the Artistic Licence 2.0
+#
+# $Id$
+#
+
+set -eu
+
+CONFIG=/etc/mdadm/mdadm.conf
+ALTCONFIG=/etc/mdadm.conf
+
+modprobe -kq md 2>/dev/null || :
+
+[ ! -f $CONFIG ] && [ -f $ALTCONFIG ] && CONFIG=$ALTCONFIG
+
+if ! grep -q '^ARRAY' $CONFIG 2>/dev/null; then
+ /usr/share/mdadm/mkconf force-generate || ret=$?
+ case ${ret:-0} in
+ 0) :;;
+ *)
+ echo E: mdadm: mdadm.conf creation failed, aborting. >&2
+ exit $ret
+ ;;
+ esac
+else
+ echo W: mdadm: using ARRAYs defined in existing mdadm.conf. >&2
+fi
+
+MDADM_FORCE_AUTOSTART__=1 exec /etc/init.d/mdadm-raid start
Added: mdadm/trunk/debian/mdadm-startall.sgml
===================================================================
--- mdadm/trunk/debian/mdadm-startall.sgml 2007-05-05 18:49:44 UTC (rev 324)
+++ mdadm/trunk/debian/mdadm-startall.sgml 2007-05-05 18:57:20 UTC (rev 325)
@@ -0,0 +1,117 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+ page: `docbook-to-man manpage.sgml > manpage.1'. You may view
+ the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+ less'. A typical entry in a Makefile or Makefile.am is:
+
+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
+ docbook-to-man in your Build-Depends control field.
+
+ -->
+
+ <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+ <!ENTITY dhfirstname "<firstname>Eduard</firstname>">
+ <!ENTITY dhsurname "<surname>Bloch</surname>">
+ <!-- Please adjust the date whenever revising the manpage. -->
+ <!ENTITY dhdate "<date>April 3, 2007</date>">
+ <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+ allowed: see man(7), man(1). -->
+ <!ENTITY dhsection "<manvolnum>8</manvolnum>">
+ <!ENTITY dhemail "<email>blade at debian.org</email>">
+ <!ENTITY dhusername "Eduard Bloch">
+ <!ENTITY dhucpackage "<refentrytitle>mdadm-startall</refentrytitle>">
+ <!ENTITY dhpackage "mdadm">
+
+ <!ENTITY debian "<productname>Debian</productname>">
+ <!ENTITY gnu "<acronym>GNU</acronym>">
+ <!ENTITY gpl "&gnu; <acronym>GPL</acronym>">
+]>
+
+<refentry>
+ <refentryinfo>
+ <address>
+ &dhemail;
+ </address>
+ <author>
+ &dhfirstname;
+ &dhsurname;
+ </author>
+ <copyright>
+ <year>2007</year>
+ <holder>&dhusername;</holder>
+ </copyright>
+ &dhdate;
+ </refentryinfo>
+ <refmeta>
+ &dhucpackage;
+
+ &dhsection;
+ </refmeta>
+ <refnamediv>
+ <refname>mdadm-startall</refname>
+
+ <refpurpose>helper script to start all known arrays</refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>&dhpackage;</command>
+
+ <arg><option>-r</option></arg>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+ <refsect1>
+ <title>DESCRIPTION</title>
+
+ <para>The <command>mdadm-startall</command> script scans the system for
+ arrays and writes a configuration file matching the current state. It then
+ starts all arrays it found. If a configuration file already exists and
+ defines arrays, it is used instead.
+
+ </refsect1>
+ <refsect1>
+ <title>SEE ALSO</title>
+
+ <para>mdadm (8), mdadm.conf(5)</para>
+ </refsect1>
+ <refsect1>
+ <title>AUTHOR</title>
+
+ <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
+ later version published by the Free Software Foundation.
+ </para>
+ <para>
+ On Debian systems, the complete text of the GNU General Public
+ License can be found in /usr/share/common-licenses/GPL.
+ </para>
+
+ </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
+
+
Modified: mdadm/trunk/debian/mdadm.manpages
===================================================================
--- mdadm/trunk/debian/mdadm.manpages 2007-05-05 18:49:44 UTC (rev 324)
+++ mdadm/trunk/debian/mdadm.manpages 2007-05-05 18:57:20 UTC (rev 325)
@@ -2,3 +2,4 @@
md.4
mdadm.conf.5
debian/mdrun.8
+debian/mdadm-startall.8
Modified: mdadm/trunk/debian/rules
===================================================================
--- mdadm/trunk/debian/rules 2007-05-05 18:49:44 UTC (rev 324)
+++ mdadm/trunk/debian/rules 2007-05-05 18:57:20 UTC (rev 325)
@@ -30,8 +30,11 @@
.PHONY: configure
configure: debian/patches/00list
+debian/mdadm-startall.8: debian/mdadm-startall.sgml
+ docbook-to-man $< > $@
+
build: configure patch build-stamp
-build-stamp:
+build-stamp: debian/mdadm-startall.8
dh_testdir
$(MAKE) -f debian/rules mdadm.udeb DEBIAN=yes
$(MAKE) clean
@@ -82,9 +85,10 @@
install -m0755 debian/mkconf $(DESTDIR)/usr/share/mdadm
install -m0755 debian/checkarray $(DESTDIR)/usr/share/mdadm
- install -m0755 debian/startall $(DESTDIR)/usr/share/mdadm
install -m0755 debian/bugscript $(DESTDIR)/usr/share/bug/mdadm/script
+ install -m0755 debian/mdadm-startall $(DESTDIR)/sbin
+
install -m0644 debian/mdadm.lintian-overrides \
$(DESTDIR)/usr/share/lintian/overrides/mdadm
Deleted: mdadm/trunk/debian/startall
===================================================================
--- mdadm/trunk/debian/startall 2007-05-05 18:49:44 UTC (rev 324)
+++ mdadm/trunk/debian/startall 2007-05-05 18:57:20 UTC (rev 325)
@@ -1,32 +0,0 @@
-#!/bin/sh
-#
-# startall -- starts all existing arrays after creating mdadm.conf
-# overrides the AUTOSTART variable in /etc/default/mdadm
-#
-# Copyright © martin f. krafft <madduck at madduck.net>
-# distributed under the terms of the Artistic Licence 2.0
-#
-# $Id$
-#
-
-set -eu
-
-CONFIG=/etc/mdadm/mdadm.conf
-ALTCONFIG=/etc/mdadm.conf
-
-modprobe -kq md 2>/dev/null || :
-
-if [ ! -f $CONFIG ] && [ ! -f $ALTCONFIG ]; then
- mkdir --parents ${CONFIG%/*}
- /usr/share/mdadm/mkconf > $CONFIG || ret=$?
- case ${ret:-0} in
- 0) :;;
- 255) echo W: mdadm: using existing mdadm.conf file... >&2;;
- *)
- echo E: mdadm: mdadm.conf creation failed, aborting. >&2
- exit $ret
- ;;
- esac
-fi
-
-MDADM_FORCE_AUTOSTART__=1 exec /etc/init.d/mdadm-raid start
More information about the pkg-mdadm-commits
mailing list