diff options
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 3 | ||||
-rw-r--r-- | debian/patches/disable-incremental-assembly.patch | 12 | ||||
-rw-r--r-- | debian/patches/series | 2 | ||||
-rw-r--r-- | debian/patches/use-external-blkid.diff | 16 | ||||
-rw-r--r-- | debian/patches/use-tempnode-not-devnode.patch | 31 |
5 files changed, 10 insertions, 54 deletions
diff --git a/debian/changelog b/debian/changelog index 36762287..11f8b7f2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ mdadm (3.4-1) unstable; urgency=medium * New upstream release. + * Drop use-tempnode-not-devnode.patch, not needed anymore. + * Drop use-external-blkid.diff. (Closes: #793631) + * Refresh patches. -- Dimitri John Ledkov <xnox@ubuntu.com> Fri, 19 Feb 2016 16:18:36 +0000 diff --git a/debian/patches/disable-incremental-assembly.patch b/debian/patches/disable-incremental-assembly.patch index 693a65dc..d5886ab7 100644 --- a/debian/patches/disable-incremental-assembly.patch +++ b/debian/patches/disable-incremental-assembly.patch @@ -1,12 +1,14 @@ ---- a/udev-md-raid-assembly.rules -+++ b/udev-md-raid-assembly.rules +Index: mdadm/udev-md-raid-assembly.rules +=================================================================== +--- mdadm.orig/udev-md-raid-assembly.rules ++++ mdadm/udev-md-raid-assembly.rules @@ -25,6 +25,9 @@ GOTO="md_inc_end" - + LABEL="md_inc" - + +# Disable incremental assembly to fix Debian bug #784070 +GOTO="md_inc_end" + # remember you can limit what gets auto/incrementally assembled by # mdadm.conf(5)'s 'AUTO' and selectively whitelist using 'ARRAY' - ACTION=="add|change", IMPORT{program}="BINDIR/mdadm --incremental --export $tempnode --offroot ${DEVLINKS}" + ACTION=="add|change", IMPORT{program}="BINDIR/mdadm --incremental --export $devnode --offroot ${DEVLINKS}" diff --git a/debian/patches/series b/debian/patches/series index 9aa3e3d7..fb725144 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,8 +1,6 @@ debian-conffile-location.diff debian-no-Werror.diff sha1-includes.diff -use-external-blkid.diff -use-tempnode-not-devnode.patch readlink-path.patch mdmonitor-service-simplify.diff disable-incremental-assembly.patch diff --git a/debian/patches/use-external-blkid.diff b/debian/patches/use-external-blkid.diff deleted file mode 100644 index 637f7c3a..00000000 --- a/debian/patches/use-external-blkid.diff +++ /dev/null @@ -1,16 +0,0 @@ -From: Michael Tokarev <mjt@tls.msk.ru> -Subject: blkid is not udev builtin, use /sbin/blkid - ---- a/udev-md-raid-arrays.rules -+++ b/udev-md-raid-arrays.rules -@@ -26,9 +26,7 @@ ENV{DEVTYPE}=="partition", ENV{MD_UUID}= - ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[^0-9]", SYMLINK+="md/$env{MD_DEVNAME}%n" - ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[0-9]", SYMLINK+="md/$env{MD_DEVNAME}p%n" - --IMPORT{builtin}="blkid" --OPTIONS+="link_priority=100" --OPTIONS+="watch" -+IMPORT{program}="/sbin/blkid -o udev -p -u noraid $tempnode" - ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}" - ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}" - diff --git a/debian/patches/use-tempnode-not-devnode.patch b/debian/patches/use-tempnode-not-devnode.patch deleted file mode 100644 index 38a55044..00000000 --- a/debian/patches/use-tempnode-not-devnode.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Michael Tokarev <mjt@tls.msk.ru> -Subject: use tempnode not devnode in udev rules -Bug-Debian: http://bugs.debian.org/770883 -Forwarded: no - -udev in wheezy does not understand $devnode construct -in rules file, while upstream uses it in mdadm rules -files. udev in jessie has $devnode and it also supports -old $tempnode which is the way it worked in wheezy and -before, even if $tempnode in jessie's udev is not documented. -So on jessie, both $tempnode and $devnode works fine, while -in wheezy, only $tempnode works. - -Use $tempnode instead of $devnode. Since mdadm is important -enough for system functionality and easily can break system -by making it unbootable, and this is the only incompatibility -between wheezy's and jessie's udev wrt mdadm, it is better than -having a versioned dependency on udev. - -This patch is debian-specific and should be dropped for jessie+1. - ---- a/udev-md-raid-arrays.rules -+++ b/udev-md-raid-arrays.rules -@@ -20 +20 @@ --IMPORT{program}="BINDIR/mdadm --detail --export $devnode" -+IMPORT{program}="BINDIR/mdadm --detail --export $tempnode" ---- a/udev-md-raid-assembly.rules -+++ b/udev-md-raid-assembly.rules -@@ -30 +30 @@ --ACTION=="add|change", IMPORT{program}="BINDIR/mdadm --incremental --export $devnode --offroot ${DEVLINKS}" -+ACTION=="add|change", IMPORT{program}="BINDIR/mdadm --incremental --export $tempnode --offroot ${DEVLINKS}" |