diff options
| -rw-r--r-- | usr.bin/Makefile | 1 | ||||
| -rw-r--r-- | usr.bin/osh/osh.c | 8 | ||||
| -rw-r--r-- | usr.bin/reboot/Makefile | 6 | ||||
| -rw-r--r-- | usr.bin/reboot/reboot.c | 38 |
4 files changed, 45 insertions, 8 deletions
diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 47ba752..542b143 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -27,3 +27,4 @@ all: make -C oemu/ $(ARGS) make -C dmidump/ $(ARGS) make -C sysctl/ $(ARGS) + make -C reboot/ $(ARGS) diff --git a/usr.bin/osh/osh.c b/usr.bin/osh/osh.c index 5062e64..1c9f508 100644 --- a/usr.bin/osh/osh.c +++ b/usr.bin/osh/osh.c @@ -78,7 +78,6 @@ static bool bs_bell = true; /* Beep on backspace */ static void cmd_help(int argc, char *argv[]); static void cmd_echo(int argc, char *argv[]); static void cmd_exit(int argc, char *argv[]); -static void cmd_reboot(int argc, char *argv[]); static void cmd_shutdown(int argc, char *argv[]); static void cmd_bell(int argc, char *argv[]); static void cmd_clear(int argc, char *argv[]); @@ -100,7 +99,6 @@ struct parse_state { static struct builtin_cmd cmds[] = { {"help",cmd_help}, {"exit",cmd_exit}, - {"reboot",cmd_reboot}, {"shutdown", cmd_shutdown}, {"bell", cmd_bell}, {"clear", cmd_clear}, @@ -120,12 +118,6 @@ cmd_exit(int argc, char *argv[]) } static void -cmd_reboot(int argc, char *argv[]) -{ - cpu_reboot(REBOOT_RESET); -} - -static void cmd_shutdown(int argc, char *argv[]) { cpu_reboot(REBOOT_POWEROFF | REBOOT_HALT); diff --git a/usr.bin/reboot/Makefile b/usr.bin/reboot/Makefile new file mode 100644 index 0000000..3700676 --- /dev/null +++ b/usr.bin/reboot/Makefile @@ -0,0 +1,6 @@ +include user.mk + +CFILES = $(shell find . -name "*.c") + +$(ROOT)/base/usr/bin/reboot: + gcc $(CFILES) -o $@ $(INTERNAL_CFLAGS) diff --git a/usr.bin/reboot/reboot.c b/usr.bin/reboot/reboot.c new file mode 100644 index 0000000..08580d5 --- /dev/null +++ b/usr.bin/reboot/reboot.c @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2023-2025 Ian Marco Moffett and the Osmora Team. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Hyra nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include <sys/reboot.h> +#include <stdio.h> + +int +main(void) +{ + cpu_reboot(REBOOT_RESET); + return 0; +} |