From: Karel Zak <kzak@redhat.com>
Date: Wed, 19 Nov 2008 10:15:44 +0000 (+0100)
Subject: pivot_root: clean up
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1dabcd2498d12753a99832b88a75300d30eb1f66;p=util-linux

pivot_root: clean up

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/sys-utils/pivot_root.c b/sys-utils/pivot_root.c
index ba2dbbed..f2a6f483 100644
--- a/sys-utils/pivot_root.c
+++ b/sys-utils/pivot_root.c
@@ -1,30 +1,31 @@
-/* pivot_root.c - Change the root file system */
-
-/* Written 2000 by Werner Almesberger */
-
+/*
+ * pivot_root.c - Change the root file system
+ *
+ * Copyright (C) 2000 Werner Almesberger
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
 #include <stdio.h>
 #include <sys/syscall.h>
 #include <unistd.h>
 
 #define pivot_root(new_root,put_old) syscall(SYS_pivot_root,new_root,put_old)
 
-#if 0
-/*
- * With kernelheaders 2.3.41 or later, and ancient libc, try the following.
- */
-#include <errno.h>
-#include <linux/unistd.h>
-static
-_syscall2(int,pivot_root,const char *,new_root,const char *,put_old)
-#endif
-
 int main(int argc, const char **argv)
 {
 	if (argc != 3) {
 		fprintf(stderr, "usage: %s new_root put_old\n", argv[0]);
 		return 1;
 	}
-	if (pivot_root(argv[1],argv[2]) < 0) {
+	if (pivot_root(argv[1], argv[2]) < 0) {
 		perror("pivot_root");
 		return 1;
 	}