Drop upstream-applied patch: 25_support_lvm_for_live-media

diff --git a/debian/patches/25_support_lvm_for_live-media.patch b/debian/patches/25_support_lvm_for_live-media.patch
deleted file mode 100644 (file)
index 63b6f03..0000000
--- a/debian/patches/25_support_lvm_for_live-media.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 25_support_lvm_for_live-media.dpatch by  <mru@grml.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Support lvm and raid devices for live-media
-
-@DPATCH@
-
-Index: b/scripts/live
-===================================================================
---- a/scripts/live     2011-07-24 22:08:10.000000000 +0200
-+++ b/scripts/live     2011-07-24 22:08:11.000000000 +0200
-@@ -1669,6 +1669,29 @@
-                       umount $mountpoint
-               fi
-       fi
-+
-+      IFS=","
-+      for device in ${devname} ; do
-+              case "$device" in
-+                      *mapper*)  # add lvm support
-+                      if [ -x /scripts/local-top/lvm2 ] ; then
-+                              ROOT="$device" resume="" /scripts/local-top/lvm2
-+                      fi
-+                      ;;
-+                      /dev/md*)
-+                      if [ -x /scripts/local-top/mdadm ] ; then
-+                              cp /conf/conf.d/md /conf/conf.d/md.orig
-+                              echo "MD_DEVS=$device " >> /conf/conf.d/md
-+                              /scripts/local-top/mdadm
-+                              mv /conf/conf.d/md.orig /conf/conf.d/md
-+                      fi
-+                      ;;
-+              esac
-+      done
-+      unset IFS
-+
-+      [ -n "$device" ] && devname="$device"
-+
-       [ -e "$devname" ] || continue
- 
-       if [ -n "${LIVE_MEDIA_OFFSET}" ]

diff --git a/debian/patches/series b/debian/patches/series
index 2acd7d7..fd69bf2 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,7 +9,6 @@
 15_networking_grml.patch
 16_nodhcp.patch
 19_revert_toram_bootoption_to_expected_behaviour.patch
-25_support_lvm_for_live-media.patch
 26_support_dns_bootoption.patch
 27_support_static_ip.patch
 28_remove_localized_manpages.patch