* include/grub/util/lvm.h: Removed.

diff --git a/ChangeLog b/ChangeLog
index 325652a86c5dd37a67e0c90e1f595e455a8f06d3..0f81cbcbe1df28d07153e65bf073e4b3e0998501 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-08  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * include/grub/util/lvm.h: Removed.
+
 2013-10-08  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/kern/emu/misc.c (fsync) [__MINGW32__]: Move to ...

diff --git a/grub-core/osdep/apple/getroot.c b/grub-core/osdep/apple/getroot.c
index 9ca8afcefa32f9f1b24c20dbde5a7de795273cfe..d8690e123c942b2f2678376c7f706ea4e412ab40 100644 (file)
--- a/grub-core/osdep/apple/getroot.c
+++ b/grub-core/osdep/apple/getroot.c
@@ -38,7 +38,7 @@
 #include <grub/types.h>
 
 #include <grub/util/misc.h>
-#include <grub/util/lvm.h>
+
 #include <grub/mm.h>
 #include <grub/misc.h>
 #include <grub/emu/misc.h>

diff --git a/grub-core/osdep/aros/getroot.c b/grub-core/osdep/aros/getroot.c
index a16cb3abae299923f92d8d081a555b1345e0253b..7d09b7af7989862c34937ea1307642f133154a55 100644 (file)
--- a/grub-core/osdep/aros/getroot.c
+++ b/grub-core/osdep/aros/getroot.c
@@ -20,7 +20,7 @@
 #include <config.h>
 
 #include <grub/util/misc.h>
-#include <grub/util/lvm.h>
+
 #include <grub/mm.h>
 #include <grub/misc.h>
 #include <grub/emu/misc.h>

diff --git a/grub-core/osdep/basic/getroot.c b/grub-core/osdep/basic/getroot.c
index 0242c9cc18ff75031fad746205684d24e5084b92..8831eb3afd9f1b5340acc3f4b34fb455cce271a7 100644 (file)
--- a/grub-core/osdep/basic/getroot.c
+++ b/grub-core/osdep/basic/getroot.c
@@ -38,7 +38,7 @@
 #include <grub/types.h>
 
 #include <grub/util/misc.h>
-#include <grub/util/lvm.h>
+
 #include <grub/mm.h>
 #include <grub/misc.h>
 #include <grub/emu/misc.h>

diff --git a/grub-core/osdep/bsd/getroot.c b/grub-core/osdep/bsd/getroot.c
index 062bce29405c1b8bfac1b27d007c3e76f862a5ab..db2fb07d3f712606807e622c28bf256a66c113d3 100644 (file)
--- a/grub-core/osdep/bsd/getroot.c
+++ b/grub-core/osdep/bsd/getroot.c
@@ -38,7 +38,7 @@
 #include <grub/types.h>
 
 #include <grub/util/misc.h>
-#include <grub/util/lvm.h>
+
 #include <grub/mm.h>
 #include <grub/misc.h>
 #include <grub/emu/misc.h>

diff --git a/grub-core/osdep/devmapper/getroot.c b/grub-core/osdep/devmapper/getroot.c
index d919a40d3be152fc6abecfc2a7a95d2a33344186..b5df7c2c7d35a2d7224e94d9aad1603177749d04 100644 (file)
--- a/grub-core/osdep/devmapper/getroot.c
+++ b/grub-core/osdep/devmapper/getroot.c
@@ -44,7 +44,7 @@
 
 #include <grub/types.h>
 #include <grub/util/misc.h>
-#include <grub/util/lvm.h>
+
 #include <grub/mm.h>
 #include <grub/misc.h>
 #include <grub/emu/misc.h>

diff --git a/grub-core/osdep/freebsd/getroot.c b/grub-core/osdep/freebsd/getroot.c
index 024743300a6498ca5dd6e5725921841912dc0381..620d2b553989d8f34247119484d2cb72cd50e832 100644 (file)
--- a/grub-core/osdep/freebsd/getroot.c
+++ b/grub-core/osdep/freebsd/getroot.c
@@ -44,7 +44,7 @@
 #include <libgeom.h>
 
 #include <grub/util/misc.h>
-#include <grub/util/lvm.h>
+
 #include <grub/mm.h>
 #include <grub/misc.h>
 #include <grub/emu/misc.h>
@@ -56,6 +56,8 @@
 
 #include <libgeom.h>
 
+#define LVM_DEV_MAPPER_STRING "/dev/linux_lvm/"
+
 static const char *
 grub_util_get_geom_abstraction (const char *dev)
 {

diff --git a/grub-core/osdep/hurd/getroot.c b/grub-core/osdep/hurd/getroot.c
index 0cd29dc0e865e19dab59e700922205806c8e111a..b3e8d8140a4770b2bb1395f1adb69a7f9fe18ba2 100644 (file)
--- a/grub-core/osdep/hurd/getroot.c
+++ b/grub-core/osdep/hurd/getroot.c
@@ -38,7 +38,7 @@
 #include <grub/types.h>
 
 #include <grub/util/misc.h>
-#include <grub/util/lvm.h>
+
 #include <grub/mm.h>
 #include <grub/misc.h>
 #include <grub/emu/misc.h>

diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c
index b1fede8f6f9bc747f6866bd3223b9044f2d9a0da..fb0bad7650651bd4d09a5fac6f1c521762791fb1 100644 (file)
--- a/grub-core/osdep/linux/getroot.c
+++ b/grub-core/osdep/linux/getroot.c
@@ -40,7 +40,7 @@
 #include <sys/mount.h>
 
 #include <grub/util/misc.h>
-#include <grub/util/lvm.h>
+
 #include <grub/mm.h>
 #include <grub/misc.h>
 #include <grub/emu/misc.h>
@@ -55,6 +55,7 @@
 #include <linux/raid/md_u.h>
 #include <grub/i18n.h>
 
+#define LVM_DEV_MAPPER_STRING "/dev/mapper/"
 
 /* Defines taken from btrfs/ioctl.h.  */
 

diff --git a/grub-core/osdep/sun/getroot.c b/grub-core/osdep/sun/getroot.c
index d63f5a69fc868a80d219ed0eaa7ed57ff0746a99..8535a892a1f605f6b287300cf2136c6ec84e33b7 100644 (file)
--- a/grub-core/osdep/sun/getroot.c
+++ b/grub-core/osdep/sun/getroot.c
@@ -38,7 +38,7 @@
 #include <grub/types.h>
 
 #include <grub/util/misc.h>
-#include <grub/util/lvm.h>
+
 #include <grub/mm.h>
 #include <grub/misc.h>
 #include <grub/emu/misc.h>

diff --git a/grub-core/osdep/unix/getroot.c b/grub-core/osdep/unix/getroot.c
index 619bfefbc8157cc0aa364b6c007b626fe7fab7be..19e6dcf8d677003ce4e4403ea06a8f5e78972135 100644 (file)
--- a/grub-core/osdep/unix/getroot.c
+++ b/grub-core/osdep/unix/getroot.c
@@ -35,7 +35,7 @@
 #include <limits.h>
 #endif
 #include <grub/util/misc.h>
-#include <grub/util/lvm.h>
+
 #include <grub/cryptodisk.h>
 #include <grub/i18n.h>
 
@@ -101,6 +101,12 @@
 # endif /* ! RAW_FLOPPY_MAJOR */
 #endif /* defined(__NetBSD__) */
 
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#define LVM_DEV_MAPPER_STRING "/dev/linux_lvm/"
+#else
+#define LVM_DEV_MAPPER_STRING "/dev/mapper/"
+#endif
+
 #include <sys/types.h>
 #include <sys/wait.h>
 

diff --git a/grub-core/osdep/windows/getroot.c b/grub-core/osdep/windows/getroot.c
index b023af5346e68729c130ebc0efd9c1302b179e40..56756555c12322f23190b845e1f2f6cacdaefd48 100644 (file)
--- a/grub-core/osdep/windows/getroot.c
+++ b/grub-core/osdep/windows/getroot.c
@@ -38,7 +38,7 @@
 #include <grub/types.h>
 
 #include <grub/util/misc.h>
-#include <grub/util/lvm.h>
+
 #include <grub/mm.h>
 #include <grub/misc.h>
 #include <grub/emu/misc.h>

diff --git a/include/grub/util/lvm.h b/include/grub/util/lvm.h
deleted file mode 100644 (file)
index f4577d5..0000000
--- a/include/grub/util/lvm.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* lvm.h - LVM support for GRUB utils.  */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2006,2007,2011  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  GRUB is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef GRUB_LVM_UTIL_HEADER
-#define GRUB_LVM_UTIL_HEADER   1
-
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-#define LVM_DEV_MAPPER_STRING "/dev/linux_lvm/"
-#else
-#define LVM_DEV_MAPPER_STRING "/dev/mapper/"
-#endif
-
-#endif /* ! GRUB_RAID_UTIL_HEADER */

diff --git a/util/getroot.c b/util/getroot.c
index 9e852a681fed9a49d49ce6788d345aa949c3f8a4..f0d98c66ed03916b32adada44a3b78dcf8dd01f1 100644 (file)
--- a/util/getroot.c
+++ b/util/getroot.c
@@ -36,7 +36,7 @@
 #include <limits.h>
 #endif
 #include <grub/util/misc.h>
-#include <grub/util/lvm.h>
+
 #include <grub/cryptodisk.h>
 #include <grub/i18n.h>
 

diff --git a/util/grub-setup.c b/util/grub-setup.c
index 27a815f2e0a91d8ca90e2ebef0b8335b8332d499..e65c7ceedfc3e6351910d0051d38643267caab2a 100644 (file)
--- a/util/grub-setup.c
+++ b/util/grub-setup.c
@@ -30,7 +30,7 @@
 #include <grub/emu/hostdisk.h>
 #include <grub/term.h>
 #include <grub/i18n.h>
-#include <grub/util/lvm.h>
+
 #ifdef GRUB_SETUP_SPARC64
 #include <grub/util/ofpath.h>
 #include <grub/sparc64/ieee1275/boot.h>