Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#1229 - Add macro for "mkmp" mount option #1409

Open
wants to merge 2 commits into
base: staging
Choose a base branch
from
Open

#1229 - Add macro for "mkmp" mount option #1409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6951e7a
Moved Discord link to the very right side of the link section
ggracechoi Apr 10, 2024
6e631dc
lib/vfscore: defined LIBVFSCORE_INITRD_OPT_MKMP macro for "mkmp"
ggracechoi Apr 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
·
<a href="https://github.com/unikraft/unikraft/issues/new?assignees=&labels=kind%2Fenhancement&projects=&template=project_backlog.yml">Feature Request</a>
·
<a href="https://unikraft.org/discord">Join Our Discord</a>
·
<a href="https://x.com/UnikraftSDK">X.com</a>
·
<a href="https://unikraft.org/discord">Join Our Discord</a>

Check notice on line 38 in README.md

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

README.md#L38 

Element: a
</p>

<br />
Expand Down
11 changes: 6 additions & 5 deletions lib/vfscore/automount.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,17 +56,18 @@
#include <uk/argparse.h>

#define LIBVFSCORE_MOUNTOPTS_SEP ','
#define LIBVFSCORE_FSTAB_VOLUME_ARGS_SEP ':'
#define LIBVFSCORE_FSTAB_VOLUME_ARGS_SEP ':'
#define LIBVFSCORE_FSTAB_UKOPTS_ARGS_SEP \
LIBVFSCORE_MOUNTOPTS_SEP

#define LIBVFSCORE_EXTRACT_DRV "extract"
#define LIBVFSCORE_EXTRACT_DEV_INITRD0 "initrd0"
#define LIBVFSCORE_EXTRACT_DEV_EMBEDDED "embedded"
#define LIBVFSCORE_EXTRACT_DEV_INITRD0 "initrd0"
#define LIBVFSCORE_EXTRACT_DEV_EMBEDDED "embedded"
#define LIBVFSCORE_INITRD_OPT_MKMP "mkmp"

#define LIBVFSCORE_UKOPT_MKMP (0x1 << 0)
#define LIBVFSCORE_UKOPT_IFINITRD0 (0x1 << 1)
#define LIBVFSCORE_UKOPT_IFNOINITRD0 (0x1 << 2)
#define LIBVFSCORE_UKOPT_IFNOINITRD0 (0x1 << 2)

struct vfscore_volume {
/* Volume source device */
Expand Down Expand Up @@ -727,7 +728,7 @@ static unsigned int vfscore_volume_parse_ukopts(char *ukopts)
continue; /* empty option */
}

if (!strcmp(opt, "mkmp")) {
if (!strcmp(opt, LIBVFSCORE_INITRD_OPT_MKMP)) {
ret |= LIBVFSCORE_UKOPT_MKMP;
continue;
}
Expand Down
Loading