diff options
author | Simon Rettberg | 2022-05-11 10:41:01 +0200 |
---|---|---|
committer | Simon Rettberg | 2022-05-11 10:41:01 +0200 |
commit | a12e3c379cf2e5946c7316259ef46736cdd5f222 (patch) | |
tree | 49638dad528a4490e293ea4a0f87e39ce862a75b /src/include/ipxe/settings.h | |
parent | Local UEFI disk boot support (diff) | |
parent | [cloud] Allow aws-import script to run on Python 3.6 (diff) | |
download | ipxe-a12e3c379cf2e5946c7316259ef46736cdd5f222.tar.gz ipxe-a12e3c379cf2e5946c7316259ef46736cdd5f222.tar.xz ipxe-a12e3c379cf2e5946c7316259ef46736cdd5f222.zip |
Merge branch 'master' into openslx
Diffstat (limited to 'src/include/ipxe/settings.h')
-rw-r--r-- | src/include/ipxe/settings.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/include/ipxe/settings.h b/src/include/ipxe/settings.h index 2bffe2fb..9759a600 100644 --- a/src/include/ipxe/settings.h +++ b/src/include/ipxe/settings.h @@ -427,6 +427,7 @@ extern const struct setting_type setting_type_hexraw __setting_type; extern const struct setting_type setting_type_md5 __setting_type; extern const struct setting_type setting_type_base64 __setting_type; extern const struct setting_type setting_type_uuid __setting_type; +extern const struct setting_type setting_type_guid __setting_type; extern const struct setting_type setting_type_busdevfn __setting_type; extern const struct setting_type setting_type_dnssl __setting_type; |