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

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

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-10-08 21:01:09 +02:00
parent 2112fb3fef
commit acbbe5cbad
15 changed files with 26 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

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

2
grub-core/osdep/apple/getroot.c
View file

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

2
grub-core/osdep/aros/getroot.c
View file

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

2
grub-core/osdep/basic/getroot.c
View file

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

2
grub-core/osdep/bsd/getroot.c
View file

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

2
grub-core/osdep/devmapper/getroot.c
View file

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

4
grub-core/osdep/freebsd/getroot.c
View file

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

2
grub-core/osdep/hurd/getroot.c
View file

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

3
grub-core/osdep/linux/getroot.c
View file

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

2
grub-core/osdep/sun/getroot.c
View file

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

8
grub-core/osdep/unix/getroot.c
View file

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

2
grub-core/osdep/windows/getroot.c
View file

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

29
include/grub/util/lvm.h
View file

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

2
util/getroot.c
View file

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

2
util/grub-setup.c
View file

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