[Dmraid-debian-commits] r18 - in /trunk/debian: changelog control dmraid.install initramfs/dmraid.initramfs-local-top/ initramfs/dmraid.initramfs-local-top/dmraid patches/00list patches/12_support_virtio_devices.dpatch rules
derevko-guest at users.alioth.debian.org
derevko-guest at users.alioth.debian.org
Mon Nov 17 15:11:47 UTC 2008
Author: derevko-guest
Date: Mon Nov 17 15:11:47 2008
New Revision: 18
URL: http://svn.debian.org/wsvn/dmraid-debian/?sc=1&rev=18
Log:
Backported changes in unstable
Added:
trunk/debian/initramfs/dmraid.initramfs-local-top/
trunk/debian/initramfs/dmraid.initramfs-local-top/dmraid
trunk/debian/patches/12_support_virtio_devices.dpatch (with props)
Modified:
trunk/debian/changelog
trunk/debian/control
trunk/debian/dmraid.install
trunk/debian/patches/00list
trunk/debian/rules
Modified: trunk/debian/changelog
URL: http://svn.debian.org/wsvn/dmraid-debian/trunk/debian/changelog?rev=18&op=diff
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Mon Nov 17 15:11:47 2008
@@ -1,4 +1,4 @@
-dmraid (1.0.0.rc15-1~exp0) experimental; urgency=low
+dmraid (1.0.0.rc15-1~exp1) experimental; urgency=low
* New upstream release
* debian/control:
@@ -30,6 +30,31 @@
-- Giuseppe Iuculano <giuseppe at iuculano.it> Sat, 04 Oct 2008 22:10:18 +0200
+dmraid (1.0.0.rc14-6) unstable; urgency=low
+
+ * debian/rules: Added execution rights to
+ /usr/share/initramfs-tools/scripts/local-top/dmraid
+ * debian/patches/02_raid45_toraid456.dpatch: Remove, this not fix #411172
+ and the new dm-raid45 (not yet in Debian) is using the target that the
+ dmraid code originally expected.
+
+ -- Giuseppe Iuculano <giuseppe at iuculano.it> Thu, 06 Nov 2008 08:50:02 +0100
+
+dmraid (1.0.0.rc14-5) unstable; urgency=low
+
+ * debian/control: dmraid and dmraid-udeb should depend on dmsetup and
+ dmsetup-udeb respecitvely, to ensure UUID symlinks are correctly created.
+ * Place a script in the local-top directory of the initramfs, to catch any
+ arrays that have not been activated by udev and vol_id. This is because
+ vol_id does not yet have knowledge of newer array metadata. Thanks to Luke
+ Yelavich <themuso at ubuntu.com> (Workaround for #500883)
+ * Removed pointless debian/initramfs/dmraid.initramfs-local directory
+ * debian/patches/12_support_virtio_devices.dpatch: Check virtio devices for
+ dmraid metadata, patch thanks to Colin Watson <cjwatson at ubuntu.com>.
+ * Fixed a typo in the previous changelog entry
+
+ -- Giuseppe Iuculano <giuseppe at iuculano.it> Wed, 22 Oct 2008 01:13:55 +0200
+
dmraid (1.0.0.rc14-4) unstable; urgency=high
* debian/dmraid.postinst: Activate existing arrays once the package is
Modified: trunk/debian/control
URL: http://svn.debian.org/wsvn/dmraid-debian/trunk/debian/control?rev=18&op=diff
==============================================================================
--- trunk/debian/control (original)
+++ trunk/debian/control Mon Nov 17 15:11:47 2008
@@ -13,7 +13,7 @@
Section: admin
Priority: optional
Architecture: any
-Depends: ${shlibs:Depends}, udev
+Depends: ${shlibs:Depends}, udev, dmsetup
Description: Device-Mapper Software RAID support tool
dmraid discovers, activates, deactivates and displays properties
of software RAID sets (eg, ATARAID) and contained DOS partitions.
@@ -37,7 +37,7 @@
Architecture: any
Section: debian-installer
XC-Package-Type: udeb
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, dmsetup-udeb
Description: Device-Mapper Software RAID support tool
dmraid discovers, activates, deactivates and displays properties
of software RAID sets (eg, ATARAID) and contained DOS partitions.
Modified: trunk/debian/dmraid.install
URL: http://svn.debian.org/wsvn/dmraid-debian/trunk/debian/dmraid.install?rev=18&op=diff
==============================================================================
--- trunk/debian/dmraid.install (original)
+++ trunk/debian/dmraid.install Mon Nov 17 15:11:47 2008
@@ -1,4 +1,5 @@
debian/initramfs/dmraid.initramfs-hook/dmraid usr/share/initramfs-tools/hooks
+debian/initramfs/dmraid.initramfs-local-top/dmraid usr/share/initramfs-tools/scripts/local-top
debian/standard/sbin/dmraid sbin
debian/standard/usr/share/man usr/share
debian/dmraid-activate sbin
Added: trunk/debian/initramfs/dmraid.initramfs-local-top/dmraid
URL: http://svn.debian.org/wsvn/dmraid-debian/trunk/debian/initramfs/dmraid.initramfs-local-top/dmraid?rev=18&op=file
==============================================================================
--- trunk/debian/initramfs/dmraid.initramfs-local-top/dmraid (added)
+++ trunk/debian/initramfs/dmraid.initramfs-local-top/dmraid Mon Nov 17 15:11:47 2008
@@ -1,0 +1,23 @@
+#!/bin/sh
+
+# local-top script for dmraid.
+
+PREREQS=""
+prereqs()
+{
+ echo $PREREQS
+}
+
+case $1 in
+# get pre-requisites
+prereqs)
+ prereqs
+ exit 0
+ ;;
+esac
+
+# Activate any dmraid arrays that were not identified by udev and vol_id.
+
+for dev in $(dmraid -r -c); do
+ dmraid-activate $(basename $dev)
+done
Modified: trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/dmraid-debian/trunk/debian/patches/00list?rev=18&op=diff
==============================================================================
--- trunk/debian/patches/00list (original)
+++ trunk/debian/patches/00list Mon Nov 17 15:11:47 2008
@@ -1,6 +1,6 @@
01_fix_broken_linking.dpatch
-02_raid45_to_raid4-5.dpatch
03_fix_hyphen-used-as-minus-sign.dpatch
04_do_not_use_p_for_partition.dpatch
05_kernel-event-handling.dpatch
09_promise-add-offsets.dpatch
+12_support_virtio_devices.dpatch
Added: trunk/debian/patches/12_support_virtio_devices.dpatch
URL: http://svn.debian.org/wsvn/dmraid-debian/trunk/debian/patches/12_support_virtio_devices.dpatch?rev=18&op=file
==============================================================================
--- trunk/debian/patches/12_support_virtio_devices.dpatch (added)
+++ trunk/debian/patches/12_support_virtio_devices.dpatch Mon Nov 17 15:11:47 2008
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 12_support_virtio_devices.dpatch by Luke Yelavich <themuso at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Support for checking virtio devices for dmraid metadata.
+
+ at DPATCH@
+diff -urNad trunk~/1.0.0.rc15/lib/device/scan.c trunk/1.0.0.rc15/lib/device/scan.c
+--- trunk~/1.0.0.rc15/lib/device/scan.c 2008-09-29 18:47:41.000000000 +0200
++++ trunk/1.0.0.rc15/lib/device/scan.c 2008-11-17 15:42:48.000000000 +0100
+@@ -174,7 +174,7 @@
+ * Whole IDE and SCSI disks only.
+ */
+ return (!isdigit(name[strlen(name) - 1]) &&
+- (*(name + 1) == 'd' && (*name == 'h' || *name == 's')))
++ (*(name + 1) == 'd' && (*name == 'h' || *name == 's' || *name == 'v')))
+ #ifdef DMRAID_TEST
+ /*
+ * Include dm devices for testing.
Propchange: trunk/debian/patches/12_support_virtio_devices.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: trunk/debian/rules
URL: http://svn.debian.org/wsvn/dmraid-debian/trunk/debian/rules?rev=18&op=diff
==============================================================================
--- trunk/debian/rules (original)
+++ trunk/debian/rules Mon Nov 17 15:11:47 2008
@@ -96,6 +96,7 @@
dh_installdocs ${version}/CREDITS ${version}/KNOWN_BUGS ${version}/README ${version}/TODO
dh_installchangelogs ${version}/CHANGELOG
chmod 755 debian/dmraid/usr/share/initramfs-tools/hooks/dmraid
+ chmod 755 debian/dmraid/usr/share/initramfs-tools/scripts/local-top/dmraid
chmod 755 debian/dmraid/sbin/dmraid-activate
dh_strip -a
dh_compress -a
More information about the Dmraid-debian-commits
mailing list