summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2007-06-11 14:38:09 -0400
committerRay Strode <rstrode@redhat.com>2007-06-11 14:38:09 -0400
commit52f531cc66fda147ec98e6f2074754693d5f5f91 (patch)
treee878590902c32e9ff1199d98684a611d82c3e057
parent9cfc27cacc1b96092a19f6bb175657d916401374 (diff)
downloadplymouth-52f531cc66fda147ec98e6f2074754693d5f5f91.tar.gz
plymouth-52f531cc66fda147ec98e6f2074754693d5f5f91.tar.xz
plymouth-52f531cc66fda147ec98e6f2074754693d5f5f91.zip
drop lame ply_filesystem_is_mounted function
-rw-r--r--src/libply/ply-terminal.c34
-rw-r--r--src/libply/ply-utils.c17
2 files changed, 0 insertions, 51 deletions
diff --git a/src/libply/ply-terminal.c b/src/libply/ply-terminal.c
index ed43959..b0ca9d9 100644
--- a/src/libply/ply-terminal.c
+++ b/src/libply/ply-terminal.c
@@ -64,28 +64,6 @@ ply_terminal_free (ply_terminal_t *terminal)
free (terminal);
}
-static bool
-ply_terminal_mount_proc_file_system (ply_terminal_t *terminal)
-{
- mkdir ("/proc", 0755);
-
- if (mount ("none", "/proc", "proc", 0, NULL) < 0)
- return false;
-
- return ply_file_system_is_mounted ("proc", "/proc");
-}
-
-static bool
-ply_terminal_mount_devpts_file_system (ply_terminal_t *terminal)
-{
- mkdir ("/dev/pts", 0755);
-
- if (mount ("none", "/dev/pts", "devpts", 0, "gid=5,mode=620") < 0)
- return false;
-
- return ply_file_system_is_mounted ("devpts", "/dev/pts");
-}
-
bool
ply_terminal_create_device (ply_terminal_t *terminal)
{
@@ -94,18 +72,6 @@ ply_terminal_create_device (ply_terminal_t *terminal)
assert (terminal != NULL);
assert (!ply_terminal_has_device (terminal));
- if (!ply_file_system_is_mounted ("proc", "/proc"))
- {
- if (!ply_terminal_mount_proc_file_system (terminal))
- return false;
- }
-
- if (!ply_file_system_is_mounted ("devpts", "/dev/pts"))
- {
- if (!ply_terminal_mount_devpts_file_system (terminal))
- return false;
- }
-
#if 0
terminal->fd = posix_openpt (O_RDWR | O_NOCTTY);
#endif
diff --git a/src/libply/ply-utils.c b/src/libply/ply-utils.c
index 172668b..3930fd3 100644
--- a/src/libply/ply-utils.c
+++ b/src/libply/ply-utils.c
@@ -567,23 +567,6 @@ ply_file_exists (const char *file)
return S_ISREG (file_info.st_mode);
}
-bool
-ply_file_system_is_mounted (const char *type,
- const char *path)
-{
- if (!ply_directory_exists (path))
- return false;
-
- /* XXX: lammmeeee
- */
- if (strcmp (type, "proc") == 0)
- return ply_directory_exists ("/proc/1");
-
- /* FIXME: should check with getmntent() on /etc/mtab or /proc/mounts
- */
- return true;
-}
-
ply_module_handle_t *
ply_open_module (const char *module_path)
{