NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "makedevs: make device node creation idempotent"

Browse Source 
This reverts commit c85cd189dc.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Korsgaard 2016-11-27 20:33:50 +01:00
parent ca41a78c2d
commit 4c6d5e33ae
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
package/makedevs/makedevs.c
View File

@ -601,7 +601,6 @@ int main(int argc, char **argv)
dev_t rdev;
unsigned i;
char *full_name_inc;
struct stat st;
if (type == 'p') {
mode |= S_IFIFO;
@ -623,23 +622,10 @@ int main(int argc, char **argv)
for (i = start; i <= start + count; i++) {
sprintf(full_name_inc, count ? "%s%u" : "%s", full_name, i);
rdev = makedev(major, minor + (i - start) * increment);
if (stat(full_name_inc, &st) == 0) {
if ((mode & S_IFMT) != (st.st_mode & S_IFMT)) {
bb_error_msg("line %d: node %s exists but is of wrong file type", linenum, full_name_inc);
ret = EXIT_FAILURE;
continue;
}
if (st.st_rdev != rdev) {
bb_error_msg("line %d: node %s exists but is wrong device number", linenum, full_name_inc);
ret = EXIT_FAILURE;
continue;
}
} else if (mknod(full_name_inc, mode, rdev) < 0) {
if (mknod(full_name_inc, mode, rdev) < 0) {
bb_perror_msg("line %d: can't create node %s", linenum, full_name_inc);
ret = EXIT_FAILURE;
continue;
}
if (chown(full_name_inc, uid, gid) < 0) {
} else if (chown(full_name_inc, uid, gid) < 0) {
bb_perror_msg("line %d: can't chown %s", linenum, full_name_inc);
ret = EXIT_FAILURE;
} else if (chmod(full_name_inc, mode) < 0) {