shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-03 13:47:04 +03:00
Code

fstab-generator: Support root on tmpfs (or other deviceless FS)

Browse Source 
This allows for stateless systems.
This commit is contained in:
Tobias Hunger 2015-03-24 00:52:59 +01:00 committed by Zbigniew Jędrzejewski-Szmek
parent ea342a99fd
commit b043846208
3 changed files with 43 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/fstab-generator/fstab-generator.c
View File

@ -397,15 +397,20 @@ static int add_root_mount(void) {
_cleanup_free_ char *what = NULL;
const char *opts;
if (isempty(arg_root_what)) {
log_debug("Could not find a root= entry on the kernel command line.");
return 0;
}
if (fstype_is_deviceless(arg_root_fstype)) {
if (free_and_strdup(&what, arg_root_what) < 0)
return log_oom();
} else {
if (isempty(arg_root_what)) {
log_debug("Could not find a root= entry on the kernel command line.");
return 0;
}
what = fstab_node_to_udev_node(arg_root_what);
if (!path_is_absolute(what)) {
log_debug("Skipping entry what=%s where=/sysroot type=%s", what, strna(arg_root_fstype));
return 0;
what = fstab_node_to_udev_node(arg_root_what);
if (!path_is_absolute(what)) {
log_debug("Skipping entry what=%s where=/sysroot type=%s", what, strna(arg_root_fstype));
return 0;
}
}
if (!arg_root_options)

29
src/shared/util.c
View File

@ -1713,6 +1713,35 @@ bool fstype_is_network(const char *fstype) {
return nulstr_contains(table, fstype);
}
bool fstype_is_deviceless(const char *fstype) {
static const char table[] =
"autofs\0"
"bdev\0"
"cgroup\0"
"configfs\0"
"cpuset\0"
"debugfs\0"
"devpts\0"
"devtmpfs\0"
"efivarfs\0"
"hugetlbfs\0"
"mqueue\0"
"overlayfs\0"
"pipefs\0"
"proc\0"
"pstore\0"
"ramfs\0"
"rootfs\0"
"rpc_pipefs\0"
"securityfs\0"
"sockfs\0"
"sysfs\0"
"tmpfs\0";
return !isempty(fstype) && (
nulstr_contains(table, fstype) || fstype_is_network(fstype));
}
int chvt(int vt) {
_cleanup_close_ int fd;

1
src/shared/util.h
View File

@ -409,6 +409,7 @@ int fd_cloexec(int fd, bool cloexec);
int close_all_fds(const int except[], unsigned n_except);
bool fstype_is_network(const char *fstype);
bool fstype_is_deviceless(const char *fstype);
int chvt(int vt);