projects
/
project
/
procd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
procd: Replace strerror(errno) with %m.
[project/procd.git]
/
initd
/
zram.c
diff --git
a/initd/zram.c
b/initd/zram.c
index
4dc1d2e
..
d438372
100644
(file)
--- a/
initd/zram.c
+++ b/
initd/zram.c
@@
-30,7
+30,7
@@
proc_meminfo(void)
fp = fopen("/proc/meminfo", "r");
if (fp == NULL) {
fp = fopen("/proc/meminfo", "r");
if (fp == NULL) {
- ERROR("Can't open /proc/meminfo: %
s\n", strerror(errno)
);
+ ERROR("Can't open /proc/meminfo: %
m\n"
);
return errno;
}
return errno;
}
@@
-44,7
+44,7
@@
proc_meminfo(void)
fclose(fp);
if (val > KB(32))
fclose(fp);
if (val > KB(32))
- val = KB(
16
);
+ val = KB(
32
);
return val;
}
return val;
}
@@
-53,23
+53,23
@@
static int
early_insmod(char *module)
{
pid_t pid = fork();
early_insmod(char *module)
{
pid_t pid = fork();
+ char *modprobe[] = { "/sbin/modprobe", NULL, NULL };
if (!pid) {
if (!pid) {
- char *modprobe[] = { "/usr/sbin/modprobe", NULL, NULL };
char *path;
struct utsname ver;
uname(&ver);
char *path;
struct utsname ver;
uname(&ver);
- path = alloca(s
izeof
(module) + strlen(ver.release) + 1);
+ path = alloca(s
trlen
(module) + strlen(ver.release) + 1);
sprintf(path, module, ver.release);
modprobe[1] = path;
execvp(modprobe[0], modprobe);
sprintf(path, module, ver.release);
modprobe[1] = path;
execvp(modprobe[0], modprobe);
- ERROR("Can't exec
/usr/sbin/modprobe\n"
);
+ ERROR("Can't exec
%s\n", modprobe[0]
);
exit(-1);
}
if (pid <= 0) {
exit(-1);
}
if (pid <= 0) {
- ERROR("Can't exec
/usr/sbin/modprobe\n"
);
+ ERROR("Can't exec
%s\n", modprobe[0]
);
return -1;
} else {
waitpid(pid, NULL, 0);
return -1;
} else {
waitpid(pid, NULL, 0);
@@
-98,7
+98,7
@@
mount_zram_on_tmp(void)
zramsize = proc_meminfo() / 2;
fp = fopen("/sys/block/zram0/disksize", "r+");
if (fp == NULL) {
zramsize = proc_meminfo() / 2;
fp = fopen("/sys/block/zram0/disksize", "r+");
if (fp == NULL) {
- ERROR("Can't open /sys/block/zram0/disksize: %
s\n", strerror(errno)
);
+ ERROR("Can't open /sys/block/zram0/disksize: %
m\n"
);
return errno;
}
fprintf(fp, "%ld", KB(zramsize));
return errno;
}
fprintf(fp, "%ld", KB(zramsize));
@@
-107,10
+107,10
@@
mount_zram_on_tmp(void)
pid = fork();
if (!pid) {
execvp(mkfs[0], mkfs);
pid = fork();
if (!pid) {
execvp(mkfs[0], mkfs);
- ERROR("Can't exec
/sbin/mkfs.ext4\n"
);
+ ERROR("Can't exec
%s\n", mkfs[0]
);
exit(-1);
} else if (pid <= 0) {
exit(-1);
} else if (pid <= 0) {
- ERROR("Can't exec
/sbin/mkfs.ext4\n"
);
+ ERROR("Can't exec
%s\n", mkfs[0]
);
return -1;
} else {
waitpid(pid, NULL, 0);
return -1;
} else {
waitpid(pid, NULL, 0);
@@
-118,11
+118,17
@@
mount_zram_on_tmp(void)
ret = mount("/dev/zram0", "/tmp", "ext4", MS_NOSUID | MS_NODEV | MS_NOATIME, "errors=continue,noquota");
if (ret < 0) {
ret = mount("/dev/zram0", "/tmp", "ext4", MS_NOSUID | MS_NODEV | MS_NOATIME, "errors=continue,noquota");
if (ret < 0) {
- ERROR("Can't mount /dev/zram0 on /tmp: %
s\n", strerror(errno)
);
+ ERROR("Can't mount /dev/zram0 on /tmp: %
m\n"
);
return errno;
}
LOG("Using up to %ld kB of RAM as ZRAM storage on /mnt\n", zramsize);
return errno;
}
LOG("Using up to %ld kB of RAM as ZRAM storage on /mnt\n", zramsize);
+ ret = chmod("/tmp", 01777);
+ if (ret < 0) {
+ ERROR("Can't set /tmp mode to 1777: %m\n");
+ return errno;
+ }
+
return 0;
}
return 0;
}