/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009-2010 Red Hat Inc.
+ * Copyright (C) 2009-2011 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include <config.h>
-#define _BSD_SOURCE /* for daemon(3) */
-
#ifdef HAVE_WINDOWS_H
# include <windows.h>
#endif
#ifdef WIN32
static int
-daemon (int nochdir, int noclose)
-{
- fprintf (stderr,
- "On Windows the daemon does not support forking into the "
- "background.\nYou *must* run the daemon with the -f option.\n");
- exit (EXIT_FAILURE);
-}
-#endif /* WIN32 */
-
-#ifdef WIN32
-static int
winsock_init (void)
{
int r;
/* Location to mount root device. */
const char *sysroot = "/sysroot"; /* No trailing slash. */
-int sysroot_len = 8;
+size_t sysroot_len = 8;
+
+/* If set (the default), do 'umount-all' when performing autosync. */
+int autosync_umount = 1;
/* Not used explicitly, but required by the gnulib 'error' module. */
const char *program_name = "guestfsd";
usage (void)
{
fprintf (stderr,
- "guestfsd [-f|--foreground] [-v|--verbose]\n");
+ "guestfsd [-r] [-v|--verbose]\n");
}
int
main (int argc, char *argv[])
{
- static const char *options = "fv?";
+ static const char *options = "rv?";
static const struct option long_options[] = {
- { "foreground", 0, 0, 'f' },
{ "help", 0, 0, '?' },
{ "verbose", 0, 0, 'v' },
{ 0, 0, 0, 0 }
};
int c;
- int dont_fork = 0;
char *cmdline;
+ ignore_value (chdir ("/"));
+
if (winsock_init () == -1)
error (EXIT_FAILURE, 0, "winsock initialization failed");
if (c == -1) break;
switch (c) {
- case 'f':
- dont_fork = 1;
+ /* The -r flag is used when running standalone. It changes
+ * several aspects of the daemon.
+ */
+ case 'r':
+ sysroot = "";
+ sysroot_len = 0;
+ autosync_umount = 0;
break;
case 'v':
"output to the libguestfs developers, either in a bug report\n"
"or on the libguestfs redhat com mailing list.\n"
"\n");
+ perror ("/dev/virtio-ports/org.libguestfs.channel.0");
exit (EXIT_FAILURE);
}
xdrmem_create (&xdr, lenbuf, sizeof lenbuf, XDR_ENCODE);
xdr_u_int (&xdr, &len);
- if (xwrite (sock, lenbuf, sizeof lenbuf) == -1)
+ if (xwrite (sock, lenbuf, sizeof lenbuf) == -1) {
+ perror ("xwrite");
exit (EXIT_FAILURE);
+ }
xdr_destroy (&xdr);
- /* Fork into the background. */
- if (!dont_fork) {
- if (daemon (0, 1) == -1) {
- perror ("daemon");
- exit (EXIT_FAILURE);
- }
- }
-
/* Enter the main loop, reading and performing actions. */
main_loop (sock);
}
if (pid == 0) { /* Child process running the command. */
+ signal (SIGALRM, SIG_DFL);
+ signal (SIGPIPE, SIG_DFL);
close (0);
if (flag_copy_stdin) {
dup2 (stdin_fd[0], 0);
quit = 0;
while (quit < 2) {
+ again:
rset2 = rset;
r = select (MAX (so_fd[0], se_fd[0]) + 1, &rset2, NULL, NULL, NULL);
if (r == -1) {
+ if (errno == EINTR)
+ goto again;
+
perror ("select");
quit:
if (stdoutput) free (*stdoutput);
}
/* printf helper function so we can use %Q ("quoted") and %R to print
- * shell-quoted strings. See HACKING file for more details.
+ * shell-quoted strings. See guestfs(3)/EXTENDING LIBGUESTFS for more
+ * details.
*/
static int
print_shell_quote (FILE *stream,