shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-25 23:21:33 +03:00
Code

[PATCH] remove default_* permissions from udev.conf file

Browse Source 
With the "permissions only rules" we can just place:
 
   MODE="0660", OWNER="root", GROUP="root"
 
at the beginning of the rules file and get exactly the same behavior.
If no values are given the compiled-in defaults are used.
This commit is contained in:
kay.sievers@vrfy.org 2004-12-21 06:10:57 +01:00 committed by Greg KH
parent eb8700908c
commit b9a8c4821a
6 changed files with 3 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
etc/udev/udev.conf.in
View File

@ -14,18 +14,6 @@ udev_db="@udevdir@/.udevdb"
# udev_rules - The name and location of the udev rules file
udev_rules="@configdir@/rules.d"
# default_mode - set the default mode for all nodes that have no
# permissions specified
default_mode="0660"
# default_owner - set the default owner for all nodes that have no
# permissions specified
default_owner="root"
# default_group - set the default group for all nodes that have no
# permissions specified
default_group="root"
# udev_log - set to "yes" if you want logging, else "no"
udev_log="yes"

3
test/udev-test.pl
View File

@ -1255,9 +1255,6 @@ open CONF, ">$main_conf" || die "unable to create config file: $main_conf";
print CONF "udev_root=\"$udev_root\"\n";
print CONF "udev_db=\"$udev_db\"\n";
print CONF "udev_rules=\"$conf_tmp\"\n";
print CONF "default_mode=\"0660\"\n";
print CONF "default_owner=\"root\"\n";
print CONF "default_group=\"root\"\n";
close CONF;
my $test_num = 1;

28
udev.8.in
View File

@ -59,22 +59,6 @@ All rule files are read in lexical order. The default value is
The switch to enable/disable logging of udev information
The default value is
.IR yes .
.TP
.B default_mode
The default mode for all nodes where no explicit value is given by a rule.
The default value is
.IR 0660 .
.TP
.B default_owner
The default owner for all nodes where no explicit value is given by a rule.
The default value is
.IR root .
.TP
.B default_group
The default group for all nodes where no explicitly value is given by a rule.
The default value is
.IR root .
.br
.P
.RI "A sample " udev.conf " file might look like this:
.sp
@ -91,18 +75,6 @@ udev_rules="/etc/udev/rules.d/"
# udev_log - set to "yes" if you want logging, else "no"
udev_log="yes"
# default_mode - set the default mode for all nodes that have no
# permissions specified
default_mode="0660"
# default_owner - set the default owner for all nodes that have no
# permissions specified
default_owner="root"
# default_group - set the default group for all nodes that have no
# permissions specified
default_group="root"
.fi
.P
The rules for device naming are read from the files located in the

3
udev.h
View File

@ -81,9 +81,6 @@ extern char udev_root[PATH_MAX];
extern char udev_db_path[PATH_MAX+NAME_MAX];
extern char udev_config_filename[PATH_MAX+NAME_MAX];
extern char udev_rules_filename[PATH_MAX+NAME_MAX];
extern mode_t default_mode;
extern char default_owner[USER_SIZE];
extern char default_group[USER_SIZE];
extern int udev_log;
extern int udev_dev_d;
extern int udev_hotplug_d;

22
udev_config.c
View File

@ -45,9 +45,6 @@ char udev_root[PATH_MAX];
char udev_db_path[PATH_MAX+NAME_MAX];
char udev_rules_filename[PATH_MAX+NAME_MAX];
char udev_config_filename[PATH_MAX+NAME_MAX];
mode_t default_mode;
char default_owner[USER_SIZE];
char default_group[USER_SIZE];
int udev_log;
int udev_dev_d;
int udev_hotplug_d;
@ -74,10 +71,6 @@ static void init_variables(void)
strcpy(udev_config_filename, UDEV_CONFIG_FILE);
strcpy(udev_rules_filename, UDEV_RULES_FILE);
strcpy(default_owner, "root");
strcpy(default_group, "root");
default_mode = 0660;
udev_log = string_is_true(UDEV_LOG_DEFAULT);
udev_dev_d = 1;
@ -169,21 +162,6 @@ static int parse_config_file(void)
continue;
}
if (strcasecmp(variable, "default_mode") == 0) {
default_mode = strtol(value, NULL, 8);
continue;
}
if (strcasecmp(variable, "default_owner") == 0) {
strfieldcpy(default_owner, value);
continue;
}
if (strcasecmp(variable, "default_group") == 0) {
strfieldcpy(default_group, value);
continue;
}
if (strcasecmp(variable, "udev_log") == 0) {
udev_log = string_is_true(value);
continue;

6
udev_utils.c
View File

@ -57,9 +57,9 @@ void udev_init_device(struct udevice *udev, const char* devpath, const char *sub
else if (strncmp(udev->devpath, "/class/", 7) == 0)
udev->type = 'c';
udev->mode = default_mode;
strfieldcpy(udev->owner, default_owner);
strfieldcpy(udev->group, default_group);
udev->mode = 0660;
strcpy(udev->owner, "root");
strcpy(udev->group, "root");
}
int kernel_release_satisfactory(int version, int patchlevel, int sublevel)