From 1172c1e817d26d5f9bb0ec289dd9a71aadf2759c Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Tue, 20 Apr 2021 00:00:22 +0000 Subject: Add portability infrastructure --- src/os/deps-lib/os-freebsd | 3 +++ src/os/deps-lib/os-linux | 4 ++++ src/os/linux-os_kbspecials.c | 33 +++++++++++++++++++++++++++++++++ src/os/linux-os_mount_devtmpfs.c | 10 ++++++++++ src/os/linux-os_mount_tmpfs.c | 31 +++++++++++++++++++++++++++++++ src/os/linux-os_reboot.c | 10 ++++++++++ 6 files changed, 91 insertions(+) create mode 100644 src/os/deps-lib/os-freebsd create mode 100644 src/os/deps-lib/os-linux create mode 100644 src/os/linux-os_kbspecials.c create mode 100644 src/os/linux-os_mount_devtmpfs.c create mode 100644 src/os/linux-os_mount_tmpfs.c create mode 100644 src/os/linux-os_reboot.c (limited to 'src/os') diff --git a/src/os/deps-lib/os-freebsd b/src/os/deps-lib/os-freebsd new file mode 100644 index 0000000..a8c2a99 --- /dev/null +++ b/src/os/deps-lib/os-freebsd @@ -0,0 +1,3 @@ +freebsd-os_reboot.o +freebsd-os_kbspecials.o +freebsd-os_mount_tmpfs.o diff --git a/src/os/deps-lib/os-linux b/src/os/deps-lib/os-linux new file mode 100644 index 0000000..56fe3fc --- /dev/null +++ b/src/os/deps-lib/os-linux @@ -0,0 +1,4 @@ +linux-os_reboot.o +linux-os_kbspecials.o +linux-os_mount_devtmpfs.o +linux-os_mount_tmpfs.o diff --git a/src/os/linux-os_kbspecials.c b/src/os/linux-os_kbspecials.c new file mode 100644 index 0000000..0d407ab --- /dev/null +++ b/src/os/linux-os_kbspecials.c @@ -0,0 +1,33 @@ +/* ISC license. */ + +#include +#include +#include + +#include +#include +#include + +#include +#include + +#include "os.h" + +void os_kbspecials (int inns) +{ + int fd ; + if (inns) return ; + fd = open("/dev/tty0", O_RDONLY | O_NOCTTY) ; + if (fd < 0) + strerr_warnwu2sys("open /dev/", "tty0 (kbrequest will not be handled)") ; + else + { + if (ioctl(fd, KDSIGACCEPT, SIGWINCH) < 0) + strerr_warnwu2sys("ioctl KDSIGACCEPT on ", "tty0 (kbrequest will not be handled)") ; + close(fd) ; + } + + sig_block(SIGINT) ; /* don't panic on early cad before s6-svscan catches it */ + if (reboot(RB_DISABLE_CAD) == -1) + strerr_warnwu1sys("trap ctrl-alt-del") ; +} diff --git a/src/os/linux-os_mount_devtmpfs.c b/src/os/linux-os_mount_devtmpfs.c new file mode 100644 index 0000000..b3f34a1 --- /dev/null +++ b/src/os/linux-os_mount_devtmpfs.c @@ -0,0 +1,10 @@ +/* ISC license. */ + +#include + +#include "os.h" + +int os_mount_devtmpfs (char const *point) +{ + return mount("dev", point, "devtmpfs", MS_NOSUID | MS_NOEXEC, "") ; +} diff --git a/src/os/linux-os_mount_tmpfs.c b/src/os/linux-os_mount_tmpfs.c new file mode 100644 index 0000000..0e173d0 --- /dev/null +++ b/src/os/linux-os_mount_tmpfs.c @@ -0,0 +1,31 @@ +/* ISC license. */ + +#include + +#include + +#include + +#include "os.h" + +void os_mount_tmpfs (char const *point, unsigned int mounttype) +{ + if (mounttype) + { + if (mounttype == 2) + { + if (mount("tmpfs", point, "tmpfs", MS_REMOUNT | MS_NODEV | MS_NOSUID, "mode=0755") == -1) + strerr_diefu2sys(111, "remount ", point) ; + } + else + { + if (umount(point) == -1) + { + if (errno != EINVAL) + strerr_warnwu2sys("umount ", point) ; + } + if (mount("tmpfs", point, "tmpfs", MS_NODEV | MS_NOSUID, "mode=0755") == -1) + strerr_diefu2sys(111, "mount tmpfs on ", point) ; + } + } +} diff --git a/src/os/linux-os_reboot.c b/src/os/linux-os_reboot.c new file mode 100644 index 0000000..fb41584 --- /dev/null +++ b/src/os/linux-os_reboot.c @@ -0,0 +1,10 @@ +/* ISC license. */ + +#include + +#include "os.h" + +void os_reboot (int what) +{ + reboot(what == 3 ? RB_AUTOBOOT : what == 2 ? RB_POWER_OFF : RB_HALT_SYSTEM) ; +} -- cgit v1.3.1