r133 - mdadm/trunk/debian

[madduck at users.alioth.debian.org]

Author: madduck
Date: 2006-08-20 23:34:27 +0000 (Sun, 20 Aug 2006)
New Revision: 133

Removed:
   mdadm/trunk/debian/mdadm-name-generator.sh
   mdadm/trunk/debian/mdadm.udev
Modified:
   mdadm/trunk/debian/control
   mdadm/trunk/debian/rules
Log:
removing udev stuff

Modified: mdadm/trunk/debian/control
===================================================================
--- mdadm/trunk/debian/control	2006-08-20 23:28:37 UTC (rev 132)
+++ mdadm/trunk/debian/control	2006-08-20 23:34:27 UTC (rev 133)
@@ -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.0.32), po-debconf, dpatch, groff-base
+Build-Depends: debhelper (>= 5), po-debconf, dpatch, groff-base
 Standards-Version: 3.7.2
 
 Package: mdadm

Deleted: mdadm/trunk/debian/mdadm-name-generator.sh
===================================================================
--- mdadm/trunk/debian/mdadm-name-generator.sh	2006-08-20 23:28:37 UTC (rev 132)
+++ mdadm/trunk/debian/mdadm-name-generator.sh	2006-08-20 23:34:27 UTC (rev 133)
@@ -1,61 +0,0 @@
-#!/bin/sh
-#
-# mdadm-name-generator.sh -- determines the md node name to be used by udev
-#
-# This script determines which naming convention is expected for a given md
-# device name, passed in as udev kernel name (%k; e.g. md1). It will output
-# the name to use relative to /dev/.
-#
-# It currently looks at /etc/fstab, /etrc/crypttab, and the output of
-# pvdisplay (LVM). If it cannot determine the name, it falls back to the
-# default: /dev/mdX.
-#
-# Intended use is in udev rules:
-#
-# KERNEL=="md[0-9]*", PROGRAM="/etc/udev/scripts/mdadm-name-generator.sh %k", \
-#   NAME="%c", SYMLINK=""
-# KERNEL=="md_d[0-9]*", PROGRAM="/etc/udev/scripts/mdadm-name-generator.sh %k", \
-#   NAME="%c", SYMLINK=""
-#
-# Copyright © martin f. krafft <madduck at madduck.net>
-# distributed under the terms of the Artistic Licence 2.0
-#
-# $Id: mkconf 89 2006-08-08 09:33:05Z madduck $
-#
-
-set -eu
-
-case "$1" in
-  md*) :;;
-  '')
-    echo "E: missing device name argument." >&2
-    exit 1
-    ;;
-  *)
-    echo "E: invalid device name: $1" >&2
-    exit 2
-    ;;
-esac
-
-KNAME="$1"
-
-PVS=$(pvdisplay 2>/dev/null || :)
-
-add_file()
-{
-  [ -f "$1" ] && EXTRAFILES="${EXTRAFILES:-$EXTRAFILES }$1" || :
-}
-
-EXTRAFILES=""
-add_file /etc/fstab
-add_file /etc/crypttab
-
-DEVFS_KNAME="${KNAME#md}"; DEVFS_KNAME="${DEVFS_KNAME#_}"
-if echo $PVS | eval grep -q "/dev/md/$DEVFS_KNAME" - "$EXTRAFILES"; then
-  # devfs-style naming expected
-  echo "md/${DEVFS_KNAME}"
-  exit 0
-fi
-
-echo "$KNAME"
-exit 0

Deleted: mdadm/trunk/debian/mdadm.udev
===================================================================
--- mdadm/trunk/debian/mdadm.udev	2006-08-20 23:28:37 UTC (rev 132)
+++ mdadm/trunk/debian/mdadm.udev	2006-08-20 23:34:27 UTC (rev 133)
@@ -1,7 +0,0 @@
-# mdadm creates its own device nodes, and it gets really annoyed when someone
-# creates /dev/mdX nodes and it's not supposed to use them. see #381181. But
-# sometimes udev needs to create them (#382263), so we now use a script to
-# determine which one to use.
-
-KERNEL=="md[0-9]*|md_d[0-9]*", PROGRAM="mdadm-name-generator.sh %k", \
-  NAME="%c", SYMLINK=""

Modified: mdadm/trunk/debian/rules
===================================================================
--- mdadm/trunk/debian/rules	2006-08-20 23:28:37 UTC (rev 132)
+++ mdadm/trunk/debian/rules	2006-08-20 23:34:27 UTC (rev 133)
@@ -83,7 +83,6 @@
 	install -m0755 debian/mkconf $(DESTDIR)/usr/share/mdadm
 	install -m0755 debian/checkarray $(DESTDIR)/usr/share/mdadm
 	install -m0755 debian/bugscript $(DESTDIR)/usr/share/bug/mdadm/script
-#	install -m0755 debian/mdadm-name-generator.sh $(DESTDIR)/lib/udev
 
 	install -m0644 debian/mdadm.lintian-overrides \
 		$(DESTDIR)/usr/share/lintian/overrides/mdadm
@@ -102,7 +101,6 @@
 	dh_installcron
 	dh_installchangelogs ChangeLog
 	dh_installlogcheck
-#	dh_installudev
 	dh_strip
 	dh_compress
 	dh_fixperms