diff options
author | Michael Tokarev <mjt@tls.msk.ru> | 2014-09-27 20:01:06 +0400 |
---|---|---|
committer | Michael Tokarev <mjt@tls.msk.ru> | 2014-09-27 20:03:44 +0400 |
commit | d2b1527c56e76c5d07de0126c444cbd3eb5a7199 (patch) | |
tree | 6e09048a38bfcc1447da66e91f8fe1c840dc8453 /debian | |
parent | 943e30a6ff5afd69a6374b68dabfc1c8e3e284c3 (diff) |
removed mdadm-startall wrapper script
Diffstat (limited to 'debian')
-rw-r--r-- | debian/.gitignore | 1 | ||||
-rw-r--r-- | debian/FAQ | 2 | ||||
-rw-r--r-- | debian/NEWS | 2 | ||||
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | debian/control | 2 | ||||
-rw-r--r-- | debian/mdadm-startall | 31 | ||||
-rw-r--r-- | debian/mdadm-startall.sgml | 115 | ||||
-rw-r--r-- | debian/mdadm.links | 1 | ||||
-rw-r--r-- | debian/mdadm.manpages | 1 | ||||
-rwxr-xr-x | debian/rules | 10 |
10 files changed, 5 insertions, 162 deletions
diff --git a/debian/.gitignore b/debian/.gitignore index bb62f98a..e9191d6e 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -1,4 +1,3 @@ -/mdadm-startall.8 .*.sw? /*.substvars /files @@ -547,8 +547,6 @@ The latest version of this FAQ is available here: instead of mdrun. - Or make use of /usr/share/mdadm/startall . - 25. Why are my arrays marked auto-read-only in /proc/mdstat? ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Arrays are kept read-only until the first write occurs. This allows md to diff --git a/debian/NEWS b/debian/NEWS index f0c0e93f..691f7171 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -51,8 +51,6 @@ mdadm (2.6.7-2) unstable; urgency=low mdadm --assemble --scan --auto=yes - instead of mdrun. Or make use of /usr/share/mdadm/startall . - -- martin f. krafft <madduck@debian.org> Wed, 02 Jul 2008 10:57:32 +0200 mdadm (2.5.3.git200608201206-1) unstable; urgency=low diff --git a/debian/changelog b/debian/changelog index 7187897b..7debaeb4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,8 @@ mdadm (3.3.2-1) UNRELEASED; urgency=low RAID5_versus_RAID10.txt docs. Maybe it's a good idea to remove other docs shipped with the package, since these becoming stale and these days, better alternatives exist online + * removed debian-specific mdadm-startall script which does nothing more than + "mdadm --assemble --scan". Remove docbook-to-man from build-deps. -- Michael Tokarev <mjt@tls.msk.ru> Sat, 20 Sep 2014 08:49:59 +0400 diff --git a/debian/control b/debian/control index 55925d96..012f790d 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: admin Priority: optional Maintainer: Debian mdadm maintainers <pkg-mdadm-devel@lists.alioth.debian.org> Uploaders: Michael Tokarev <mjt@tls.msk.ru> -Build-Depends: debhelper (>= 6.0.7~), po-debconf, groff-base, docbook-to-man +Build-Depends: debhelper (>= 6.0.7~), po-debconf, groff-base Standards-Version: 3.9.3 Vcs-Git: git://git.debian.org/git/pkg-mdadm/mdadm Vcs-Browser: http://git.debian.org/?p=pkg-mdadm/mdadm.git diff --git a/debian/mdadm-startall b/debian/mdadm-startall deleted file mode 100644 index aa947b01..00000000 --- a/debian/mdadm-startall +++ /dev/null @@ -1,31 +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@madduck.net> -# distributed under the terms of the Artistic Licence 2.0 -# -set -eu - -CONFIG=/etc/mdadm/mdadm.conf -ALTCONFIG=/etc/mdadm.conf - -modprobe -q 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 diff --git a/debian/mdadm-startall.sgml b/debian/mdadm-startall.sgml deleted file mode 100644 index c47b1f89..00000000 --- a/debian/mdadm-startall.sgml +++ /dev/null @@ -1,115 +0,0 @@ -<!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@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>&dhucpackage;</refname> - - <refpurpose>helper script to start all known arrays</refpurpose> - </refnamediv> - <refsynopsisdiv> - <cmdsynopsis> - <command>&dhucpackage;</command> - </cmdsynopsis> - </refsynopsisdiv> - <refsect1> - <title>DESCRIPTION</title> - - <para>The <command>&dhucpackage;</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: ---> - - diff --git a/debian/mdadm.links b/debian/mdadm.links deleted file mode 100644 index 48ae6562..00000000 --- a/debian/mdadm.links +++ /dev/null @@ -1 +0,0 @@ -sbin/mdadm-startall usr/share/mdadm/startall diff --git a/debian/mdadm.manpages b/debian/mdadm.manpages deleted file mode 100644 index 65605c78..00000000 --- a/debian/mdadm.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/mdadm-startall.8 diff --git a/debian/rules b/debian/rules index 155948aa..2bc6ff72 100755 --- a/debian/rules +++ b/debian/rules @@ -19,12 +19,8 @@ endif .PHONY: configure configure: -debian/mdadm-startall.8: debian/mdadm-startall.sgml - docbook-to-man $< > $@.tmp - mv $@.tmp $@ - build: configure build-stamp -build-stamp: debian/mdadm-startall.8 +build-stamp: dh_testdir $(MAKE) -f debian/rules mdadm.udeb DEBIAN=yes $(MAKE) clean @@ -52,7 +48,7 @@ clean: rm -f $(INTERPOLATED_FILES) rm -f build-stamp [ ! -f Makefile ] || $(MAKE) clean - rm -f mdadm.udeb mdmon.udeb mdadm debian/mdadm-startall.8 + rm -f mdadm.udeb mdmon.udeb mdadm dh_clean debconf-updatepo @@ -81,8 +77,6 @@ install: build $(INTERPOLATED_FILES) install -Dm0755 debian/bugscript $(DESTDIR)/usr/share/bug/mdadm/script install -Dm0644 debian/presubj $(DESTDIR)/usr/share/bug/mdadm/presubj - install -Dm0755 debian/mdadm-startall $(DESTDIR)/sbin/mdadm-startall - install -Dm0755 mdadm.udeb $(DESTDIR_UDEB)/sbin/mdadm install -Dm0755 mdmon.udeb $(DESTDIR_UDEB)/sbin/mdmon install -Dm0644 udev-md-raid-arrays.rules $(DESTDIR_UDEB)/lib/udev/rules.d/63-md-raid-arrays.rules |