[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/16] Move chroot handling to OS specific files.
From: |
Jes . Sorensen |
Subject: |
[Qemu-devel] [PATCH 12/16] Move chroot handling to OS specific files. |
Date: |
Thu, 3 Jun 2010 18:48:08 +0200 |
From: Jes Sorensen <address@hidden>
Move chroot handling to OS specific files.
Signed-off-by: Jes Sorensen <address@hidden>
---
os-posix.c | 19 +++++++++++++++++++
qemu-os-posix.h | 1 +
qemu-os-win32.h | 1 +
vl.c | 18 +-----------------
4 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/os-posix.c b/os-posix.c
index f8a092e..a91e1f6 100644
--- a/os-posix.c
+++ b/os-posix.c
@@ -37,6 +37,7 @@
#include "net/slirp.h"
static struct passwd *user_pwd;
+static const char *chroot_dir;
void os_setup_early_signal_handling(void)
{
@@ -169,6 +170,9 @@ int os_parse_cmd_args(const QEMUOption *popt, const char
*optarg)
exit(1);
}
break;
+ case QEMU_OPTION_chroot:
+ chroot_dir = optarg;
+ break;
default:
ret = -1;
}
@@ -192,3 +196,18 @@ void os_change_process_uid(void)
}
}
}
+
+void os_change_root(void)
+{
+ if (chroot_dir) {
+ if (chroot(chroot_dir) < 0) {
+ fprintf(stderr, "chroot failed\n");
+ exit(1);
+ }
+ if (chdir("/")) {
+ perror("not able to chdir to /");
+ exit(1);
+ }
+ }
+
+}
diff --git a/qemu-os-posix.h b/qemu-os-posix.h
index 6d8cf79..91c7b68 100644
--- a/qemu-os-posix.h
+++ b/qemu-os-posix.h
@@ -32,5 +32,6 @@ static inline void os_host_main_loop_wait(int *timeout)
void os_setup_signal_handling(void);
void os_change_process_uid(void);
+void os_change_root(void);
#endif
diff --git a/qemu-os-win32.h b/qemu-os-win32.h
index 9df0eda..245b188 100644
--- a/qemu-os-win32.h
+++ b/qemu-os-win32.h
@@ -44,5 +44,6 @@ void os_host_main_loop_wait(int *timeout);
static inline void os_setup_signal_handling(void) {};
static inline void os_change_process_uid(void) {};
+static inline void os_change_root(void) {};
#endif
diff --git a/vl.c b/vl.c
index d42be8d..7173684 100644
--- a/vl.c
+++ b/vl.c
@@ -2311,7 +2311,6 @@ int main(int argc, char **argv, char **envp)
const char *incoming = NULL;
#ifndef _WIN32
int fd = 0;
- const char *chroot_dir = NULL;
#endif
int show_vnc_port = 0;
int defconfig = 1;
@@ -3055,11 +3054,6 @@ int main(int argc, char **argv, char **envp)
default_cdrom = 0;
default_sdcard = 0;
break;
-#ifndef _WIN32
- case QEMU_OPTION_chroot:
- chroot_dir = optarg;
- break;
-#endif
case QEMU_OPTION_xen_domid:
if (!(xen_available())) {
printf("Option %s not supported for this target\n",
popt->name);
@@ -3548,17 +3542,7 @@ int main(int argc, char **argv, char **envp)
exit(1);
}
- if (chroot_dir) {
- if (chroot(chroot_dir) < 0) {
- fprintf(stderr, "chroot failed\n");
- exit(1);
- }
- if (chdir("/")) {
- perror("not able to chdir to /");
- exit(1);
- }
- }
-
+ os_change_root();
os_change_process_uid();
if (daemonize) {
--
1.6.5.2
- [Qemu-devel] [PATCH 04/16] vl.c: Move host_main_loop_wait() to OS specific files., (continued)
- [Qemu-devel] [PATCH 04/16] vl.c: Move host_main_loop_wait() to OS specific files., Jes . Sorensen, 2010/06/03
- [Qemu-devel] [PATCH 06/16] Move win32 early signal handling setup to os_setup_signal_handling(), Jes . Sorensen, 2010/06/03
- [Qemu-devel] [PATCH 09/16] Move find_datadir to OS specific files., Jes . Sorensen, 2010/06/03
- [Qemu-devel] [PATCH 07/16] Rename os_setup_signal_handling() to os_setup_early_signal_handling(), Jes . Sorensen, 2010/06/03
- [Qemu-devel] [PATCH 11/16] Move runas handling from vl.c to OS specific files., Jes . Sorensen, 2010/06/03
- [Qemu-devel] [PATCH 08/16] Move main signal handler setup to os specificfiles., Jes . Sorensen, 2010/06/03
- [Qemu-devel] [PATCH 12/16] Move chroot handling to OS specific files.,
Jes . Sorensen <=
- [Qemu-devel] [PATCH 14/16] Make os_change_process_uid and os_change_root os-posix.c local, Jes . Sorensen, 2010/06/03
- [Qemu-devel] [PATCH 10/16] Introduce OS specific cmdline argument handling and move SMB arg to os-posix.c, Jes . Sorensen, 2010/06/03
Re: [Qemu-devel] [PATCH 10/16] Introduce OS specific cmdline argument handling and move SMB arg to os-posix.c, Markus Armbruster, 2010/06/04