shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-03-09 12:58:38 +03:00
Code Issues Projects Releases Wiki Activity

Drop support for fifos and devices

Browse Source 
While the first was useful way back in the day when we were importing
Debian bits and /sbin/init was expecting to find /dev/.initctl as a
named pipe, that's no longer an issue with systemd since it uses
dynamic Unix sockets.

Likewise, character and block devices in /dev are now dynamically
created by the devtmpfs from the kernel.

Less complexity and code here if we just support directories, regular
files, and symbolic links.
This commit is contained in:
Colin Walters 2013-07-16 09:35:44 -04:00
parent 8724565291
commit 62a896350b
2 changed files with 1 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/libostree/ostree-core.c
View File

@ -1117,14 +1117,6 @@ ostree_file_header_parse (GVariant *metadata,
{ {
g_file_info_set_attribute_byte_string (ret_file_info, "standard::symlink-target", symlink_target); g_file_info_set_attribute_byte_string (ret_file_info, "standard::symlink-target", symlink_target);
} }
else if (S_ISCHR (mode) || S_ISBLK (mode))
{
g_file_info_set_attribute_uint32 (ret_file_info, "unix::rdev", rdev);
}
else if (S_ISFIFO (mode))
{
;
}
else else
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
@ -1178,14 +1170,6 @@ ostree_zlib_file_header_parse (GVariant *metadata,
{ {
g_file_info_set_attribute_byte_string (ret_file_info, "standard::symlink-target", symlink_target); g_file_info_set_attribute_byte_string (ret_file_info, "standard::symlink-target", symlink_target);
} }
else if (S_ISCHR (mode) || S_ISBLK (mode))
{
g_file_info_set_attribute_uint32 (ret_file_info, "unix::rdev", rdev);
}
else if (S_ISFIFO (mode))
{
;
}
else else
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
@ -1259,23 +1243,6 @@ ostree_create_file_from_input (GFile *dest_file,
goto out; goto out;
} }
} }
else if (S_ISCHR (mode) || S_ISBLK (mode))
{
guint32 dev = g_file_info_get_attribute_uint32 (finfo, "unix::rdev");
if (mknod (dest_path, mode, dev) < 0)
{
ot_util_set_error_from_errno (error, errno);
goto out;
}
}
else if (S_ISFIFO (mode))
{
if (mkfifo (dest_path, mode) < 0)
{
ot_util_set_error_from_errno (error, errno);
goto out;
}
}
else else
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
@ -1625,11 +1592,7 @@ ostree_validate_structureof_file_mode (guint32 mode,
{ {
gboolean ret = FALSE; gboolean ret = FALSE;
if (!(S_ISREG (mode) if (!(S_ISREG (mode) || S_ISLNK (mode)))
|| S_ISLNK (mode)
|| S_ISCHR (mode)
|| S_ISBLK (mode)
|| S_ISFIFO (mode)))
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"Invalid file metadata mode %u; not a valid file type", mode); "Invalid file metadata mode %u; not a valid file type", mode);

1
tests/libtest.sh
View File

@ -103,7 +103,6 @@ setup_test_repository () {
$OSTREE commit -b test2 -s "Test Commit 1" -m "Commit body first" $OSTREE commit -b test2 -s "Test Commit 1" -m "Commit body first"
mkdir baz mkdir baz
mkfifo baz/afifo # named pipe
echo moo > baz/cow echo moo > baz/cow
echo alien > baz/saucer echo alien > baz/saucer
mkdir baz/deeper mkdir baz/deeper