diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-03-10 20:35:52 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-03-10 20:35:52 +0100 |
| commit | 1b9e5b126359a2a2ec37de1f94f046093abc74b8 (patch) | |
| tree | e2183ca0b1cb09c1d3e789ffd68e25220cf451cd /src/shared | |
| parent | 79fbcd8869f5d2d0236f7272bf45ba6b3d4abbea (diff) | |
nspawn: add --image= switch to boot GPT disk images that follow the Discoverable Partitions Specification
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/blkid-util.h | 33 | ||||
| -rw-r--r-- | src/shared/gpt.h | 1 |
2 files changed, 34 insertions, 0 deletions
diff --git a/src/shared/blkid-util.h b/src/shared/blkid-util.h new file mode 100644 index 0000000000..c689310324 --- /dev/null +++ b/src/shared/blkid-util.h @@ -0,0 +1,33 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + +#pragma once + +/*** + This file is part of systemd. + + Copyright 2014 Lennart Poettering + + systemd is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + systemd 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with systemd; If not, see <http://www.gnu.org/licenses/>. +***/ + +#ifdef HAVE_BLKID +#include <blkid/blkid.h> +#endif + +#include "util.h" + +#ifdef HAVE_BLKID +DEFINE_TRIVIAL_CLEANUP_FUNC(blkid_probe, blkid_free_probe); +#define _cleanup_blkid_free_probe_ _cleanup_(blkid_free_probep) +#endif diff --git a/src/shared/gpt.h b/src/shared/gpt.h index e23073e1f9..320cf47823 100644 --- a/src/shared/gpt.h +++ b/src/shared/gpt.h @@ -35,6 +35,7 @@ #if defined(__x86_64__) # define GPT_ROOT_NATIVE GPT_ROOT_X86_64 +# define GPT_ROOT_SECONDARY GPT_ROOT_X86 #elif defined(__i386__) # define GPT_ROOT_NATIVE GPT_ROOT_X86 #endif |