svn commit: trunk/busybox/util-linux
landley at busybox.net
landley at busybox.net
Tue Dec 20 17:25:52 UTC 2005
Author: landley
Date: 2005-12-20 09:25:51 -0800 (Tue, 20 Dec 2005)
New Revision: 12960
Log:
Fix chroot, leave console alone if -c not specified, and yank debug code.
(I still haven't set up a test environment to confirm this works...)
Modified:
trunk/busybox/util-linux/switch_root.c
Changeset:
Modified: trunk/busybox/util-linux/switch_root.c
===================================================================
--- trunk/busybox/util-linux/switch_root.c 2005-12-20 17:18:01 UTC (rev 12959)
+++ trunk/busybox/util-linux/switch_root.c 2005-12-20 17:25:51 UTC (rev 12960)
@@ -56,17 +56,17 @@
closedir(dir);
// Directory should now be empty. Zap it.
- printf("rmdir %s\n",directory); // rmdir(directory);
+ rmdir(directory);
}
// It wasn't a directory. Zap it.
- } else printf("unlink %s\n",directory); //unlink(directory);
+ } else unlink(directory);
}
int switch_root_main(int argc, char *argv[])
{
- char *newroot, *console="/dev/console";
+ char *newroot, *console=NULL;
struct stat st1, st2;
struct statfs stfs;
@@ -98,20 +98,25 @@
}
// Zap everything out of rootdev
+
delete_contents("/");
- // Overmount / with newdir
+ // Overmount / with newdir and chroot into it. The chdir is needed to
+ // recalculate "." and ".." links.
- if (mount(".", "/", NULL, MS_MOVE, NULL) || chdir("/"))
+ if (mount(".", "/", NULL, MS_MOVE, NULL) || chroot(".") || chdir("/"))
bb_error_msg_and_die("moving root");
- // Reopen stdin/stdout/stderr to /dev/console
- close(0);
- if(open(console, O_RDWR) < 0)
- bb_error_msg_and_die("Bad console '%s'",console);
- dup2(0, 1);
- dup2(0, 2);
+ // If a new console specified, redirect stdin/stdout/stderr to that.
+ if (console) {
+ close(0);
+ if(open(console, O_RDWR) < 0)
+ bb_error_msg_and_die("Bad console '%s'",console);
+ dup2(0, 1);
+ dup2(0, 2);
+ }
+
// Exec real init. (This is why we must be pid 1.)
execv(argv[optind],argv+optind+1);
bb_error_msg_and_die("Bad init '%s'",argv[optind]);
More information about the busybox-cvs
mailing list