* util/lvm.c: Remove since unused. Remove remaining references.

diff --git a/ChangeLog b/ChangeLog
index 922bdf87fb7b034f6857c88022a01548f3cf602a..69bfb6f4be84f60538e27c8d2a99d9010b84b2de 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
        * docs/grub.texi (Networking commands): Add documentation for
        network related commands.
 
+2013-09-19  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * util/lvm.c: Remove since unused. Remove remaining references.
+
 2013-09-19  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Handle the case of partitioned LVM properly.

diff --git a/Makefile.util.def b/Makefile.util.def
index 681bf49bda032248775e50a78c2b6a1ba1f38f8d..40781235caa9e287a715cd614711efd2c67c6b2c 100644 (file)
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -301,7 +301,6 @@ program = {
   installdir = sbin;
   mansection = 8;
   common = util/grub-setup.c;
-  common = util/lvm.c;
   common = grub-core/kern/emu/argp_common.c;
   common = grub-core/lib/reed_solomon.c;
 
@@ -318,7 +317,6 @@ program = {
   installdir = sbin;
   mansection = 8;
   common = util/grub-setup.c;
-  common = util/lvm.c;
   common = grub-core/kern/emu/argp_common.c;
   common = grub-core/lib/reed_solomon.c;
   common = util/ieee1275/ofpath.c;

diff --git a/include/grub/util/lvm.h b/include/grub/util/lvm.h
index ff268f83f190583fb534b62554f1fbed37624602..59944333f16f5e631a7d6b2b21abfdd6a0da0e20 100644 (file)
--- a/include/grub/util/lvm.h
+++ b/include/grub/util/lvm.h
@@ -28,7 +28,6 @@
 #define LVM_DEV_MAPPER_STRING "/dev/linux_lvm/"
 #endif
 
-int grub_util_lvm_isvolume (char *name);
 #endif
 
 #endif /* ! GRUB_RAID_UTIL_HEADER */

diff --git a/util/lvm.c b/util/lvm.c
deleted file mode 100644 (file)
index 5dac4f0..0000000
--- a/util/lvm.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* lvm.c - LVM support for GRUB utils.  */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2006,2007,2008,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/>.
- */
-
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-#include <grub/emu/misc.h>
-#include <grub/util/misc.h>
-#include <grub/util/lvm.h>
-
-#include <string.h>
-#include <sys/stat.h>
-
-int
-grub_util_lvm_isvolume (char *name)
-{
-  char *lvmdevname;
-  struct stat st;
-  int err;
-
-  lvmdevname = xmalloc (strlen (name) + sizeof (LVM_DEV_MAPPER_STRING));
-
-  strcpy (lvmdevname, LVM_DEV_MAPPER_STRING);
-  strcpy (lvmdevname + sizeof(LVM_DEV_MAPPER_STRING) - 1, name);
-
-  err = stat (lvmdevname, &st);
-  free (lvmdevname);
-
-  if (err)
-    return 0;
-  else
-    return 1;
-}
-
-#endif