diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile.am | 10 | ||||
| -rw-r--r-- | bind-mount.c | 2 | ||||
| -rw-r--r-- | bind-mount.h | 2 | ||||
| -rw-r--r-- | bubblewrap.c (renamed from build-root.c) | 10 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | network.c | 2 | ||||
| -rw-r--r-- | network.h | 2 | ||||
| -rw-r--r-- | utils.c | 2 | ||||
| -rw-r--r-- | utils.h | 2 | ||||
| -rwxr-xr-x | xdg-app-run.sh | 2 |
11 files changed, 19 insertions, 19 deletions
@@ -13,4 +13,4 @@ stamp-h1 config.log config.status configure -build-root +bubblewrap diff --git a/Makefile.am b/Makefile.am index 6b8ec98..6d2c442 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,10 +4,10 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} AM_CPPFLAGS = -DDATADIR='"$(datadir)"' -DLIBEXECDIR='"$(libexecdir)"' AM_CFLAGS = $(WARN_CFLAGS) -bin_PROGRAMS = build-root +bin_PROGRAMS = bubblewrap -build_root_SOURCES = \ - build-root.c \ +bubblewrap_SOURCES = \ + bubblewrap.c \ bind-mount.h \ bind-mount.c \ network.h \ @@ -16,5 +16,5 @@ build_root_SOURCES = \ utils.c \ $(NULL) -build_root_CFLAGS = $(AM_CFLAGS) -build_root_LDFLAGS = +bubblewrap_CFLAGS = $(AM_CFLAGS) +bubblewrap_LDFLAGS = diff --git a/bind-mount.c b/bind-mount.c index 5076121..c32b943 100644 --- a/bind-mount.c +++ b/bind-mount.c @@ -1,4 +1,4 @@ -/* build-root +/* bubblewrap * Copyright (C) 2016 Alexander Larsson * * This program is free software; you can redistribute it and/or diff --git a/bind-mount.h b/bind-mount.h index 430a520..1ad833c 100644 --- a/bind-mount.h +++ b/bind-mount.h @@ -1,4 +1,4 @@ -/* build-root +/* bubblewrap * Copyright (C) 2016 Alexander Larsson * * This program is free software; you can redistribute it and/or diff --git a/build-root.c b/bubblewrap.c index a157557..f1a48f3 100644 --- a/build-root.c +++ b/bubblewrap.c @@ -1,4 +1,4 @@ -/* build-root +/* bubblewrap * Copyright (C) 2016 Alexander Larsson * * This program is free software; you can redistribute it and/or @@ -700,7 +700,7 @@ main (int argc, if (argc == 0) usage (); - __debug__(("Creating build-root dir\n")); + __debug__(("Creating root mount point\n")); uid = getuid (); gid = getgid (); @@ -715,11 +715,11 @@ main (int argc, /* We need *some* mountpoint where we can mount the root tmpfs. We first try in /run, and if that fails, try in /tmp. */ - base_path = strdup_printf ("/run/user/%d/.build-root", uid); + base_path = strdup_printf ("/run/user/%d/.bubblewrap", uid); if (mkdir (base_path, 0755) && errno != EEXIST) { free (base_path); - base_path = xstrdup ("/tmp/.build-root"); + base_path = strdup_printf ("/tmp/.bubblewrap-%d", uid); if (mkdir (base_path, 0755) && errno != EEXIST) die_with_error ("Creating root mountpoint failed"); } @@ -750,7 +750,7 @@ main (int argc, if (!is_privileged) { if (errno == EINVAL) - die ("Creating new namespace failed, likely because the kernel does not support user namespaces. Give the build-root setuid root or cap_sys_admin+ep rights, or switch to a kernel with user namespace support."); + die ("Creating new namespace failed, likely because the kernel does not support user namespaces. Give bubblewrap setuid root or cap_sys_admin+ep rights, or switch to a kernel with user namespace support."); else if (errno == EPERM) die ("No permissions to creating new namespace, likely because the kernel does not allow non-privileged user namespaces. On e.g. debian this can be enabled with 'sysctl kernel.unprivileged_userns_clone=1'."); } diff --git a/configure.ac b/configure.ac index 60eeeaf..b4a1b26 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.63]) -AC_INIT([build-root], [0.1], [alexl@redhat.com]) +AC_INIT([bubblewrap], [0.1], [alexl@redhat.com]) AC_CONFIG_HEADER([config.h]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) @@ -1,4 +1,4 @@ -/* build-root +/* bubblewrap * Copyright (C) 2016 Alexander Larsson * * This program is free software; you can redistribute it and/or @@ -1,4 +1,4 @@ -/* build-root +/* bubblewrap * Copyright (C) 2016 Alexander Larsson * * This program is free software; you can redistribute it and/or @@ -1,4 +1,4 @@ -/* build-root +/* bubblewrap * Copyright (C) 2016 Alexander Larsson * * This program is free software; you can redistribute it and/or @@ -1,4 +1,4 @@ -/* build-root +/* bubblewrap * Copyright (C) 2016 Alexander Larsson * * This program is free software; you can redistribute it and/or diff --git a/xdg-app-run.sh b/xdg-app-run.sh index 98dc70a..39a3d2e 100755 --- a/xdg-app-run.sh +++ b/xdg-app-run.sh @@ -29,7 +29,7 @@ runtime=runtime/org.gnome.Platform/x86_64/master EOF -./build-root \ +./bubblewrap \ --mount-ro-bind ~/.local/share/xdg-app/runtime/org.gnome.Platform/x86_64/master/active/files /usr \ --lock-file /usr/.ref \ --mount-ro-bind ~/.local/share/xdg-app/app/org.gnome.Weather/x86_64/master/active/files/ /app \ |