vbatts
/
grub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-09-19 09:05:56 +02:00
parent 386701a8fe
commit 90379808b6
4 changed files with 4 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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.

2
Makefile.util.def
View File

@ -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;

1
include/grub/util/lvm.h
View File

@ -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 */

49
util/lvm.c
View File

@ -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