{
char *out, *err;
int r;
+ int proc_ok, dev_ok, sys_ok;
/* We need a root filesystem mounted to do this. */
NEED_ROOT (NULL);
return NULL;
}
+ /* While running the command, bind-mount /dev, /proc, /sys
+ * into the chroot. However we must be careful to unmount them
+ * afterwards because otherwise they would interfere with
+ * future mount and unmount operations.
+ *
+ * We deliberately allow these commands to fail silently, BUT
+ * if a mount fails, don't unmount the corresponding mount.
+ */
+ r = command (NULL, NULL, "mount", "--bind", "/dev", "/sysroot/dev", NULL);
+ dev_ok = r != -1;
+ r = command (NULL, NULL, "mount", "--bind", "/proc", "/sysroot/proc", NULL);
+ proc_ok = r != -1;
+ r = command (NULL, NULL, "mount", "--bind", "/sys", "/sysroot/sys", NULL);
+ sys_ok = r != -1;
+
CHROOT_IN;
r = commandv (&out, &err, argv);
CHROOT_OUT;
+ if (sys_ok) command (NULL, NULL, "umount", "/sysroot/sys", NULL);
+ if (proc_ok) command (NULL, NULL, "umount", "/sysroot/proc", NULL);
+ if (dev_ok) command (NULL, NULL, "umount", "/sysroot/dev", NULL);
+
if (r == -1) {
reply_with_error ("%s", err);
free (out);
do_command_lines (char * const * const argv)
{
char *out;
- char **lines = NULL;
- int size = 0, alloc = 0;
- char *p, *pend;
+ char **lines;
out = do_command (argv);
if (out == NULL)
return NULL;
- /* Now convert the output to a list of lines. */
- p = out;
- while (p) {
- pend = strchr (p, '\n');
- if (pend) {
- *pend = '\0';
- pend++;
-
- /* Final \n? Don't return an empty final element. */
- if (*pend == '\0') break;
- }
-
- if (add_string (&lines, &size, &alloc, p) == -1) {
- free (out);
- return NULL;
- }
-
- p = pend;
- }
-
+ lines = split_lines (out);
free (out);
- if (add_string (&lines, &size, &alloc, NULL) == -1)
+ if (lines == NULL)
return NULL;
return lines; /* Caller frees. */