mirror of
https://github.com/troglobit/finit.git
synced 2026-11-18 19:30:56 +00:00
Fixed signal handling in shutdown()
Signed-off-by: Claudio Matsuoka <cmatsuoka@gmail.com>
This commit is contained in:
1 parent
2996545772
commit
5f6d9d0109
1 file changed
+12
-11
@@ -29,10 +29,10 @@
|
|||||||
#define touch(x) close(open((x), O_CREAT|O_WRONLY|O_TRUNC, 0644))
|
#define touch(x) close(open((x), O_CREAT|O_WRONLY|O_TRUNC, 0644))
|
||||||
|
|
||||||
|
|
||||||
void shutdown();
|
void shutdown(int);
|
||||||
void wait_all();
|
void wait_all(int);
|
||||||
|
|
||||||
void dummy()
|
void dummy(int sig)
|
||||||
{
|
{
|
||||||
/* do nothing */
|
/* do nothing */
|
||||||
}
|
}
|
||||||
@@ -174,7 +174,7 @@ int main()
|
|||||||
umask(0);
|
umask(0);
|
||||||
mkdir("/tmp/.X11-unix", 01777);
|
mkdir("/tmp/.X11-unix", 01777);
|
||||||
mkdir("/tmp/.ICE-unix", 01777);
|
mkdir("/tmp/.ICE-unix", 01777);
|
||||||
umask(0022);
|
umask(022);
|
||||||
|
|
||||||
if (!fork()) {
|
if (!fork()) {
|
||||||
/* child process */
|
/* child process */
|
||||||
@@ -224,9 +224,8 @@ int main()
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void shutdown()
|
void shutdown(int sig)
|
||||||
{
|
{
|
||||||
int ret;
|
|
||||||
int fd;
|
int fd;
|
||||||
|
|
||||||
system("/usr/bin/touch /tmp/shutdown");
|
system("/usr/bin/touch /tmp/shutdown");
|
||||||
@@ -248,9 +247,9 @@ void shutdown()
|
|||||||
sync();
|
sync();
|
||||||
system("/bin/mount -n -o remount,ro /");
|
system("/bin/mount -n -o remount,ro /");
|
||||||
|
|
||||||
ret = system("/sbin/unionctl.static / --remove / > /dev/null 2>&1");
|
system("/sbin/unionctl.static / --remove / > /dev/null 2>&1");
|
||||||
|
|
||||||
if (ret == 2 && ret == 10)
|
if (sig == SIGINT || sig == SIGUSR1)
|
||||||
reboot(RB_AUTOBOOT);
|
reboot(RB_AUTOBOOT);
|
||||||
|
|
||||||
if ((fd = open("/proc/acpi/sleep", O_WRONLY)) >= 0) {
|
if ((fd = open("/proc/acpi/sleep", O_WRONLY)) >= 0) {
|
||||||
@@ -260,11 +259,13 @@ void shutdown()
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void wait_all()
|
void wait_all(int sig)
|
||||||
{
|
{
|
||||||
int status;
|
int status;
|
||||||
|
pid_t pid;
|
||||||
|
|
||||||
do {
|
do {
|
||||||
waitpid(-1, &status, WNOHANG);
|
pid = waitpid(-1, &status, WNOHANG);
|
||||||
} while (errno != ECHILD);
|
} while (pid != 0 && errno != ECHILD);
|
||||||
}
|
}
|
||||||
|
|
||||||
Reference in new issue
Block a user