X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=util-linux%2Fpivot_root.c;h=28af00cc1530c723ec0e7fd15a5740182fdfb00f;hb=64bb95a361c9d82e2abed90e0402459c68fb14b2;hp=4e67043cd708ab5f69c192f12aa1a952fb9053f2;hpb=b1629b1b2abc17a6430e4173d64d7956784118e0;p=oweals%2Fbusybox.git diff --git a/util-linux/pivot_root.c b/util-linux/pivot_root.c index 4e67043cd..28af00cc1 100644 --- a/util-linux/pivot_root.c +++ b/util-linux/pivot_root.c @@ -6,23 +6,22 @@ * pivot_root syscall stubbed by Erik Andersen, so it will compile * regardless of the kernel being used. * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPL version 2, see file LICENSE in this tarball for details. */ -#include -#include -#include -#include "busybox.h" +#include "libbb.h" extern int pivot_root(const char * new_root,const char * put_old); +int pivot_root_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int pivot_root_main(int argc, char **argv) { - if (argc != 3) - bb_show_usage(); + if (argc != 3) + bb_show_usage(); - if (pivot_root(argv[1],argv[2]) < 0) - bb_perror_msg_and_die("pivot_root"); - - return EXIT_SUCCESS; + if (pivot_root(argv[1], argv[2]) < 0) { + /* prints "pivot_root: " */ + bb_perror_nomsg_and_die(); + } + return EXIT_SUCCESS; }