ostree.git
8 years agolib/sysroot: fix placement for not-default deployment
Guy Shapiro [Mon, 21 Aug 2017 06:42:48 +0000 (09:42 +0300)]
lib/sysroot: fix placement for not-default deployment

When using the
OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NOT_DEFAULT flag, the
deployment is said to be added after the booted or merge deployment.
Fix the condition to do so instead of adding it in the second place.

Closes: #1097
Approved by: cgwalters

8 years agolib/deploy: Add .img to end of initramfs in /usr/lib/modules
Colin Walters [Sat, 19 Aug 2017 00:51:10 +0000 (20:51 -0400)]
lib/deploy: Add .img to end of initramfs in /usr/lib/modules

Follow up to <https://github.com/ostreedev/ostree/pull/1079>; I was working on
the rpm-ostree updates for this, and I think it's more consistent if we have
`.img` here, since that's a closer match to the "remove $kver" that results in
`vmlinuz`. Also just best practice to have file suffix types where they make
sense.

The astute reader might notice this sneaks in a change where we'd crash if the
legacy bootdir didn't have an initramfs...yeah, should probably have test
coverage of that.

Closes: #1095
Approved by: jlebon

8 years agodocs/build: s/libOSTree/libostree/
Colin Walters [Fri, 18 Aug 2017 15:04:58 +0000 (11:04 -0400)]
docs/build: s/libOSTree/libostree/

I find "libOSTree" awkward to type and really to look at. Let's be nicer on
people's pinky fingers and eyes and drop it all down to lowercase.

Closes: #1093
Approved by: jlebon

8 years agolib/sysroot: Support /usr/lib/modules/$kver for kernel/initramfs
Colin Walters [Tue, 15 Aug 2017 15:22:21 +0000 (11:22 -0400)]
lib/sysroot: Support /usr/lib/modules/$kver for kernel/initramfs

This is the new Fedora kernel standard layout; it has the advantage
of being in `/usr` like `/usr/lib/ostree-boot`, but it's not OSTree
specific.

Further, I think in practice forcing tree builders to compute the checksum is an
annoying stumbling block; since we already switched to e.g. computing checksums
always when doing pulls, the cost of doing another checksum for the
kernel/initramfs is tiny. The "bootcsum" becomes more of an internal
implementation detail.

Now, there is a transition; my current thought for this is that rpm-ostree will
change to default to injecting into both `/usr/lib/ostree-boot` and
`/usr/lib/modules`, and stop doing `/boot`, then maybe next year say we drop the
`/usr/lib/ostree-boot` by default.

A twist here is that the default Fedora kernel RPM layout (and what's in
rpm-ostree today) includes a kernel but *not* an initramfs in
`/usr/lib/modules`. If we looked only there, we'd just find the kernel. So we
need to look in both, and then special case this - pick the legacy layout if we
have `/usr/lib/modules` but not an initramfs.

While here, rework the code to have an `OstreeKernelLayout` struct which makes
dealing with all of the variables nicer.

Closes: #1079
Approved by: jlebon

8 years agobin: Squash some -Wuninit warnings with porting to new style
Colin Walters [Thu, 17 Aug 2017 20:49:26 +0000 (16:49 -0400)]
bin: Squash some -Wuninit warnings with porting to new style

I noticed this with a local build of an RPM:

```
/usr/include/glib-2.0/glib/glib-autocleanups.h:28:3: warning: 'help' may be used uninitialized in this function [-Wmaybe-uninitialized]
   g_free (*pp);
   ^~~~~~~~~~~~
src/ostree/ot-main.c:82:20: note: 'help' was declared here
   g_autofree char *help;
                    ^~~~
```

Closes: #1091
Approved by: jlebon

8 years agoboot: Add a tmpfiles.d snippet to clean up /var/tmp/ostree-ovl.XXX
Colin Walters [Thu, 17 Aug 2017 18:00:08 +0000 (14:00 -0400)]
boot: Add a tmpfiles.d snippet to clean up /var/tmp/ostree-ovl.XXX

This is simplest for now.  Compare with similar logic from
`/usr/lib/tmpfiles.d/tmp.conf`:
```
R! /tmp/systemd-private-*
```

Closes: https://github.com/ostreedev/ostree/issues/393
Closes: #1090
Approved by: jlebon

8 years agobuild-sys: Post-release version bump
Colin Walters [Thu, 17 Aug 2017 17:23:51 +0000 (13:23 -0400)]
build-sys: Post-release version bump

Closes: #1089
Approved by: jlebon

8 years agoRelease 2017.10
Colin Walters [Thu, 17 Aug 2017 14:25:07 +0000 (10:25 -0400)]
Release 2017.10

Closes: #1089
Approved by: jlebon

8 years agolib: Fix v2017.10 symbols to inherit from v2017.8
Colin Walters [Thu, 17 Aug 2017 16:16:35 +0000 (12:16 -0400)]
lib: Fix v2017.10 symbols to inherit from v2017.8

I actually don't quite know what the version inheritance really does, but let's
be safe and fix this. I'm being conservative here and fixing it to inherit from
2017.8, skipping .9 since that doesn't have a parent.

Related: https://github.com/ostreedev/ostree/issues/1087

Closes: #1088
Approved by: jlebon

8 years agodocs/related-projects: Tweak client side snapshot text, add casync
Colin Walters [Wed, 16 Aug 2017 21:37:27 +0000 (17:37 -0400)]
docs/related-projects: Tweak client side snapshot text, add casync

The latter came up on the list.

Closes: #1086
Approved by: jlebon

8 years agolib/sysroot: Port a few functions to new style
Colin Walters [Wed, 16 Aug 2017 19:47:03 +0000 (15:47 -0400)]
lib/sysroot: Port a few functions to new style

Not sure why we didn't do this earlier. Just noticed them when looking at the
code for a different reason.

Closes: #1085
Approved by: jlebon

8 years agolib/deploy: Ignore errors from FITHAW
Colin Walters [Wed, 16 Aug 2017 16:44:05 +0000 (12:44 -0400)]
lib/deploy: Ignore errors from FITHAW

In the production case since we used `daemon()` our stderr is `/dev/null`¹
there's not much use in logging errors from `FITHAW` or `exit(1)`, and doing so
breaks the test suite which checks the return from `waitpid()`. There's nothing
we can really do if `FITHAW` fails, and in most of those cases `EINVAL`,
`EOPNOTSUPP`, we *shouldn't* do anything anyways.

¹ Though perhaps we should set up the systemd journal, but let's not
  go there right now.

Closes: #1084
Approved by: jlebon

8 years agolib/deploy: Really close testing race condition
Colin Walters [Wed, 16 Aug 2017 16:18:22 +0000 (12:18 -0400)]
lib/deploy: Really close testing race condition

I added `waitpid()`, but that didn't actually help because we were
`daemon()`izing. Don't daemonize if we're testing so that we can `waitpid()`.

Note I still haven't reproduced this race locally, but I'm pretty sure this will
fix it.

While here, actually check the return value from `waitpid()` just in case
something goes wrong there.

Closes: #1084
Approved by: jlebon

8 years agobuild-sys: Move bash completions to /usr/share/ by default
Colin Walters [Wed, 16 Aug 2017 14:15:38 +0000 (10:15 -0400)]
build-sys: Move bash completions to /usr/share/ by default

This is in line with the "/etc is for sysadmins", "/usr is OS" model;
e.g. systemd's bash completions go there.

Making this change since I was looking at the required spec file changes.

Closes: #1083
Approved by: mbarnes

8 years agoot-main.c: fix signal callback signature
Jonathan Lebon [Wed, 16 Aug 2017 13:10:39 +0000 (09:10 -0400)]
ot-main.c: fix signal callback signature

Signal callbacks take a void* as their final parameter, which we don't
use in this case.

Closes: #1082
Approved by: cgwalters

8 years agopull: mention libcurl in NOT_SUPPORTED pull path
Jonathan Lebon [Wed, 16 Aug 2017 13:10:39 +0000 (09:10 -0400)]
pull: mention libcurl in NOT_SUPPORTED pull path

Since it's now possible to build without libsoup but still have HTTP
functionality.

Closes: #1082
Approved by: cgwalters

8 years agoostree-deployment.c: simplify equality check
Jonathan Lebon [Wed, 16 Aug 2017 13:10:39 +0000 (09:10 -0400)]
ostree-deployment.c: simplify equality check

Just a random cozy patch I made while perusing the codebase. When
determining if two OstreeDeployment objects are the same, rather than
just checking for NULL, we can just directly check for equality of
pointers to also catch the trivial case.

Closes: #1082
Approved by: cgwalters

8 years agoUpdate libglnx
Colin Walters [Wed, 2 Aug 2017 19:44:34 +0000 (15:44 -0400)]
Update libglnx

This is mostly the `copy_file_range` changes plus the Coverity files.

```
Colin Walters (4):
      localalloc: Abort on EBADF from close() by default
      local-alloc: Remove almost all macros like glnx_free, glnx_unref_variant
      console: Fix Coverity NULL deref warning
      fdio: Merge systemd code to use copy_file_range(), use FICLONE

Jonathan Lebon (1):
      console: trim useless check

Matthew Leeds (1):
      dirfd: Fix typo in comment

Philip Withnall (1):
      glnx-console: Add missing NULL check before writing out text
```

Update submodule: libglnx

Closes: #1081
Approved by: jlebon

8 years agoostree: Add naggy comments to help keep options in sync
Matthew Barnes [Tue, 15 Aug 2017 16:26:23 +0000 (16:26 +0000)]
ostree: Add naggy comments to help keep options in sync

/* ATTENTION:
 * Please remember to update the bash-completion script (bash/ostree) and
 * man page (man/ostree-$COMMANDNAME.xml) when changing the option list.
 */

Closes: #1080
Approved by: cgwalters

8 years agobash: Add bash completion
Matthew Barnes [Sat, 12 Aug 2017 01:17:23 +0000 (01:17 +0000)]
bash: Add bash completion

Completes commands, options, commit checksums, ref names, remotes, and file paths.

Closes: #1077
Approved by: jlebon

8 years agorepo: Introduce ostree_repo_open_at() and ostree_repo_create_at()
Colin Walters [Fri, 28 Apr 2017 19:51:32 +0000 (15:51 -0400)]
repo: Introduce ostree_repo_open_at() and ostree_repo_create_at()

This essentially completes our fd-relative conversion.

While here, I cleaned up the semantics of `ostree_repo_create()` and
`ostree_repo_create_at()` to be more atomic - basically various scripts were
testing for the `objects` subdirectory, so let's formalize that.

Closes: #820
Approved by: jlebon

8 years agopull: mark commits from local cache as partial
Jonathan Lebon [Fri, 11 Aug 2017 14:16:17 +0000 (10:16 -0400)]
pull: mark commits from local cache as partial

If one of the localcache repos has the exact same commit we resolved
from the remote, then we need to make sure to mark it as partial so that
we download the full tree.

Closes: #1074
Closes: #1076
Approved by: cgwalters

8 years agolib/repo-finder-config: Add some more debug output
Philip Withnall [Fri, 11 Aug 2017 09:14:58 +0000 (10:14 +0100)]
lib/repo-finder-config: Add some more debug output

This makes diagnosing false negatives a little easier.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
Closes: #1075
Approved by: jlebon

8 years agoman: document configured branches
Jonathan Lebon [Thu, 10 Aug 2017 13:05:15 +0000 (09:05 -0400)]
man: document configured branches

Closes: #1072
Closes: #1073
Approved by: guyshapiro

8 years agolib/deploy: Close test suite race condition
Colin Walters [Wed, 9 Aug 2017 13:07:11 +0000 (09:07 -0400)]
lib/deploy: Close test suite race condition

Saw this in a PR result; we need to wait for the child to have written its
result to stderr before we exit, otherwise the test suite may not read it in
time.

Closes: #1070
Approved by: jlebon

8 years agoman: Update ostree-refs manpage
Matthew Leeds [Tue, 8 Aug 2017 21:55:23 +0000 (14:55 -0700)]
man: Update ostree-refs manpage

Update the ostree-refs manpage to document recently added options, and
fix some minor mistakes.

Closes: #1068
Approved by: cgwalters

8 years agolib/sysroot: Add journal-msg signal
Colin Walters [Fri, 4 Aug 2017 01:45:50 +0000 (21:45 -0400)]
lib/sysroot: Add journal-msg signal

This will allow us to drop the awful hack in rpm-ostree where we watch our own
stdout. In general, libraries shouldn't write to stdout.

Also we can kill the systemd journal wrapper code. There's some duplication at
each call site now...but it's easier than trying to write a `sd_journal_send()`
wrapper.

I was originally going to have this emit all of the structured data too as a
`GVariant` but decided it wasn't worth it right now.

Closes: #1052
Approved by: jlebon

8 years agolib/gpg-verify: Add an OstreeGpgError error domain
Philip Withnall [Wed, 9 Aug 2017 13:35:53 +0000 (14:35 +0100)]
lib/gpg-verify: Add an OstreeGpgError error domain

Add a new error domain for GPG signing/verification errors, and use it
throughout libostree for describing verification errors. This replaces
various uses of G_IO_ERROR_FAILED, and one instance of
G_IO_ERROR_NOT_FOUND (for which some code in ot-builtin-show.c had to be
changed to ensure it was still handled correctly).

The use of a separate error domain allows failures in GPG operations to
be handled separately from network failures (where the summary file
could not be found to be downloaded, for example) or timeouts.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
Closes: #1064
Closes: #1071
Approved by: mbarnes

8 years agolib/sysroot-deploy: Refactor kernel layout parsing
Colin Walters [Fri, 4 Aug 2017 19:58:41 +0000 (15:58 -0400)]
lib/sysroot-deploy: Refactor kernel layout parsing

I'd like to move the new canonical kernel directory to `/usr/lib/modules/$kver`,
as Fedora has done. The `get_kernel_from_tree()` function now abstracts over
parsing the data (src vs destination filenames, as well as checksum) in
preparation for adding the new case.

In preparation for this, let's change the current test suite to use the
*current* directory of `/usr/lib/ostree-boot`, and also add coverage of `/boot`.

Closes: #1053
Approved by: jlebon

8 years agolib/sysroot-deploy: Port a kernel finding logic to new style
Colin Walters [Fri, 4 Aug 2017 18:18:14 +0000 (14:18 -0400)]
lib/sysroot-deploy: Port a kernel finding logic to new style

Prep for more work here.

Closes: #1053
Approved by: jlebon

8 years agoUpdate introduction.md
Lisa St. John [Tue, 8 Aug 2017 21:10:07 +0000 (22:10 +0100)]
Update introduction.md

Added missing "is" in the first sentence.
Closes: #1067
Approved by: cgwalters

8 years agolib/repo-finder: Emit gpg-verify-summary=false in dynamic remote config
Philip Withnall [Tue, 8 Aug 2017 17:58:52 +0000 (18:58 +0100)]
lib/repo-finder: Emit gpg-verify-summary=false in dynamic remote config

When returning results from finding repos, set gpg-verify-summary=false
in their configs, since any pulls from such remotes will necessarily
involve collection IDs, and hence should be using the unsigned summary
support. In the intended deployment mode for P2P transmission of OSTree
refs, summaries *cannot* be signed, so setting gpg-verify-summary=true
would cause all the pulls to fail.

The unsigned summary support is the move of repository metadata from
the summary file (not spliceable) to the well-known ostree-metadata ref
(spliceable, as it can exist for multiple collection IDs in the same
repository).

Signed-off-by: Philip Withnall <withnall@endlessm.com>
Closes: #1066
Approved by: cgwalters

8 years agolib/deploy: Use a FIFREEZE/FITHAW cycle for /boot
Colin Walters [Thu, 3 Aug 2017 02:07:26 +0000 (22:07 -0400)]
lib/deploy: Use a FIFREEZE/FITHAW cycle for /boot

See: http://marc.info/?l=linux-fsdevel&m=149520244919284&w=2

XFS doesn't flush the journal on `syncfs()`. GRUB doesn't know how to follow the
XFS journal, so if the filesystem is in a dirty state (possible with xfs
`/boot`, extremely likely with `/`, if the journaled data includes content for
`/boot`, the system may be unbootable if a system crash occurs.

Fix this by doing a `FIFREEZE`+`FITHAW` cycle.  Now, most people
probably would have replaced the `syncfs()` invocation with those two
ioctls.  But this would have become (I believe) the *only* place in
libostree where we weren't safe against interruption.  The failure
mode would be ugly; nothing else would be able to write to the filesystem
until manual intervention.

The real fix here I think is to land an atomic `FIFREEZETHAW` ioctl
in the kernel.  I might try a patch.

In the meantime though, let's jump through some hoops and set up
a "watchdog" child process that acts as a fallback unfreezer.

Closes: https://github.com/ostreedev/ostree/issues/876
Closes: #1049
Approved by: jlebon

8 years agolib: Port gpg verification for remotes to fd-relative
Colin Walters [Mon, 24 Jul 2017 20:39:01 +0000 (16:39 -0400)]
lib: Port gpg verification for remotes to fd-relative

This was the last use of `repo->repodir` internally, and will help finally add
`ostree_repo_open_at()`.

Closes: #1034
Approved by: jlebon

8 years agolib/repo: Fix handling of missing summary files when downloading
Philip Withnall [Tue, 8 Aug 2017 14:39:34 +0000 (15:39 +0100)]
lib/repo: Fix handling of missing summary files when downloading

The API for downloading a summary file can legitimately return NULL for
the summary file contents when it returns TRUE (success). This indicates
an error 404 — the summary file was not found.

Two call sites were not handling that correctly, which was causing later
assertion failures.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
Closes: #1061
Closes: #1065
Approved by: cgwalters

8 years agoostree/parse-datetime: Ensure tm structs are initialised
Philip Withnall [Mon, 7 Aug 2017 13:13:30 +0000 (14:13 +0100)]
ostree/parse-datetime: Ensure tm structs are initialised

Otherwise tm.tm_wday remains uninitialised and gets propagated
elsewhere.

Spotted by Coverity as issue #209265.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
Closes: #1059
Approved by: cgwalters

8 years agolib/sepolicy: Drop duplicate assignment
Philip Withnall [Mon, 7 Aug 2017 13:11:31 +0000 (14:11 +0100)]
lib/sepolicy: Drop duplicate assignment

Spotted by Coverity as issue #1452619.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
Closes: #1059
Approved by: cgwalters

8 years agolib/repo-commit: Drop unreachable conditional branch
Philip Withnall [Mon, 7 Aug 2017 13:09:07 +0000 (14:09 +0100)]
lib/repo-commit: Drop unreachable conditional branch

(remaining > 0) is asserted by the loop condition, and remaining is not
modified between that check and the G_UNLIKELY — so the condition in the
G_UNLIKELY will always be true.

Spotted by Coverity as issue #1452617.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
Closes: #1059
Approved by: cgwalters

8 years agolib/repo-finder-avahi: Drop redundant conditional
Philip Withnall [Mon, 7 Aug 2017 13:06:43 +0000 (14:06 +0100)]
lib/repo-finder-avahi: Drop redundant conditional

summary_timestamp is checked for non-NULL-ness above, and the function
bails if it’s NULL.

Fixes Coverity issue #1452616.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
Closes: #1059
Approved by: cgwalters

8 years agolib/repo-refs: Add ostree_repo_remote_list_collection_refs() API
Philip Withnall [Mon, 7 Aug 2017 18:52:17 +0000 (19:52 +0100)]
lib/repo-refs: Add ostree_repo_remote_list_collection_refs() API

This parallels ostree_repo_remote_list_refs(), but returns a map of
OstreeCollectionRef → checksum, and includes refs from collection IDs
other than the remote repository’s main collection ID.

Use this in OstreeRepoFinderConfig to ensure that refs are matched
against even if they’re stored in the repository summary file’s
collection map, rather than its main ref map. This fixes false negatives
when searching for refs in some situations.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
Closes: #1058
Approved by: cgwalters

8 years agolib/repo-pull: Add a missing precondition
Philip Withnall [Mon, 7 Aug 2017 18:50:40 +0000 (19:50 +0100)]
lib/repo-pull: Add a missing precondition

This catches a few failure modes in the pull code a little earlier,
before the incorrectly-NULL repo makes its way into a closure and a
worker thread, where the cause of the problem is harder to track down.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
Closes: #1058
Approved by: cgwalters

8 years agolib/repo-finder: Avoid a potential unref-of-NULL crash
Philip Withnall [Mon, 7 Aug 2017 18:49:17 +0000 (19:49 +0100)]
lib/repo-finder: Avoid a potential unref-of-NULL crash

As the comment explains, it’s possible for a result to be freed while
ref_to_checksum is NULL, even though normally the data structure
guarantees it’s non-NULL. This was causing crashes when results were
filtered out of a find-remotes call. Guard against that.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
Closes: #1058
Approved by: cgwalters

8 years agolib/repo-pull: Fix counting of latest commits when finding repos
Philip Withnall [Mon, 7 Aug 2017 12:37:57 +0000 (13:37 +0100)]
lib/repo-pull: Fix counting of latest commits when finding repos

The intended behaviour of ostree_repo_find_remotes() is to return
results which have the latest version of at least one of the requested
refs. Results which have some of the requested refs, but don’t have the
latest version of any of them, should be ignored. The logic to do this
was broken in the case that a result contained a positive number of the
requested refs, but none of them were the latest version. (It previously
worked when the result contained none of the requested refs.)

Fix the counting to work correctly in both cases.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
Closes: #1058
Approved by: cgwalters

8 years agoman: The min-free-space-percent item goes in [core] section
Stef Walter [Tue, 8 Aug 2017 05:59:17 +0000 (07:59 +0200)]
man: The min-free-space-percent item goes in [core] section

The documentation incorrectly indicates that min-free-space-percent
goes in the [remote "name"] section. It should go in [core] instead.

Closes: #1062
Approved by: cgwalters

8 years agoautogen.sh: Fix running out of tree
Stef Walter [Tue, 8 Aug 2017 06:14:13 +0000 (08:14 +0200)]
autogen.sh: Fix running out of tree

The autogen.sh script should be runnable out of tree. It's mostly
already the case, just one little tweak to make it work.

   $ mkdir build
   $ cd build
   $ ../autogen.sh --prefix=/usr

Closes: #1063
Approved by: cgwalters

8 years agotree-wide: Remove trailing semicolon from autoptr declarations
Colin Walters [Sat, 5 Aug 2017 19:20:04 +0000 (15:20 -0400)]
tree-wide: Remove trailing semicolon from autoptr declarations

It confuses `g-ir-scanner`, and isn't necessary.

Closes: #1056
Approved by: pwithnall

8 years agobin/pull: Fix @ override syntax when pulling multiple refs
Colin Walters [Mon, 31 Jul 2017 16:22:16 +0000 (12:22 -0400)]
bin/pull: Fix @ override syntax when pulling multiple refs

Coverity spotted an infloop here since we were incrementing `i++`
instead of `j++`.  But adding a test revealed other bugs - we need
to keep the arrays in sync.

Coverity CID: 1452204

Closes: #1041
Approved by: pwithnall

8 years agolib/deltas: Squash Coverity warning for div-by-zero in delta show
Colin Walters [Mon, 31 Jul 2017 16:27:31 +0000 (12:27 -0400)]
lib/deltas: Squash Coverity warning for div-by-zero in delta show

If a delta happens to have zero objects, we could end up doing
a divide-by-zero when inferring endianness.  In practice,
a zero-object delta isn't possible to generate I think, but
let's make sure the code is defensive all the same.

Spotted by Coverity.

Coverity CID: 1452208

Closes: #1041
Approved by: pwithnall

8 years agoDocumentation: static delta default from
Guy Shapiro [Sun, 6 Aug 2017 08:26:51 +0000 (11:26 +0300)]
Documentation: static delta default from

Document that the default behavior of `ostree static-delta generate` if to generate the delta from the parent.
Closes: #1057
Approved by: cgwalters

8 years agomain: Fix subcommand usage output
Matthew Leeds [Fri, 4 Aug 2017 20:18:40 +0000 (13:18 -0700)]
main: Fix subcommand usage output

This commit sets prgname correctly so that the "ostree subcommand
--help" output prints the subcommand rather than just "ostree".

This was removed in commit f0519e541f29 because it tripped the thread
sanitizer, but it's being added back conditionally so most users who
don't compile with -fsanitize=adress see proper help output.

Closes: #1054
Approved by: cgwalters

8 years agotree-wide: Fix the build with old glib (Ubuntu Trusty etc.)
Colin Walters [Thu, 3 Aug 2017 14:55:51 +0000 (10:55 -0400)]
tree-wide: Fix the build with old glib (Ubuntu Trusty etc.)

This regressed with <https://github.com/ostreedev/ostree/pull/1040>
but currently the Travis builds aren't gating.

Closes: #1051
Approved by: jlebon

8 years agolib: Define and use an autoptr cleanup for gpgme_key_t
Colin Walters [Mon, 31 Jul 2017 15:31:13 +0000 (11:31 -0400)]
lib: Define and use an autoptr cleanup for gpgme_key_t

Followup for previous patch, allows porting a bit to new code style.

Closes: #1039
Approved by: jlebon

8 years agotree-wide: Use g_autoptr(Ostree*)
Colin Walters [Mon, 31 Jul 2017 16:16:59 +0000 (12:16 -0400)]
tree-wide: Use g_autoptr(Ostree*)

Part of cleaning up our usage of libglnx; we want to use what's in GLib where we
can.

Had to change a few .c files to `#include ostree.h` early on to pick up
autoptrs for the core types.

Closes: #1040
Approved by: jlebon

8 years agoDocumentation: README: Remove deprecated wiki link
Guy Shapiro [Thu, 3 Aug 2017 09:32:36 +0000 (12:32 +0300)]
Documentation: README: Remove deprecated wiki link

The old wiki only contains link back to readthedocs.
The link to is useless.
Closes: #1050
Approved by: cgwalters

8 years agotests/libtest-core.sh: Add a comment that this copy is canonical
Colin Walters [Wed, 2 Aug 2017 17:26:23 +0000 (13:26 -0400)]
tests/libtest-core.sh: Add a comment that this copy is canonical

Ref: https://github.com/projectatomic/bubblewrap/pull/203

Closes: #1047
Approved by: jlebon

8 years agolib/pull: Log state of summary/commit GPG verification
Colin Walters [Wed, 2 Aug 2017 14:40:56 +0000 (10:40 -0400)]
lib/pull: Log state of summary/commit GPG verification

Since we have both, we should clearly log the state of both of
them.  Split this out of a larger patch.

Closes: #1046
Approved by: jlebon

8 years agolib/repo: Add API to create and list ref aliases
Colin Walters [Fri, 28 Jul 2017 01:22:48 +0000 (21:22 -0400)]
lib/repo: Add API to create and list ref aliases

There are multiple use cases where we'd like to alias refs.

First, having a "stable" alias which gets swapped across major
versions: https://pagure.io/atomic-wg/issue/228

Another case is when a ref is obsoleted;
<https://pagure.io/atomic-wg/issue/303>
This second one could be done with endoflife rebase, but I think
this case is better on the server side, as we might later change
our minds and do actual releases there.

I initially just added some test cases for symlinks in the `refs/heads` dir to
ensure this actually works (and it did), but I think it's worth having APIs.

Closes: #1033
Approved by: jlebon

8 years agolib/deploy: Add structured logging info for syncfs() times
Colin Walters [Tue, 1 Aug 2017 13:05:21 +0000 (09:05 -0400)]
lib/deploy: Add structured logging info for syncfs() times

I plan to at some point change rpm-ostree to read the journal messages from
libostree and render things like the time we spent in syncfs().

Closes: #1044
Approved by: jlebon

8 years agolib/sysroot: Add prefixes to syncfs/fsync error messages
Colin Walters [Tue, 1 Aug 2017 09:43:35 +0000 (05:43 -0400)]
lib/sysroot: Add prefixes to syncfs/fsync error messages

And clean up one other bare `glnx_throw_errno()`.

Closes: #1044
Approved by: jlebon

8 years agotree-wide: Use GLib autocleanups for libarchive
Colin Walters [Mon, 31 Jul 2017 17:28:16 +0000 (13:28 -0400)]
tree-wide: Use GLib autocleanups for libarchive

Define typedefs for read/write archives, and use the GLib
autocleanups for them.   Prep for updating libglnx to drop its
custom autocleanup macros.

Closes: #1042
Approved by: jlebon

8 years agolib/gpg: Switch to GLib autocleanups for gpgme types
Colin Walters [Mon, 31 Jul 2017 17:24:25 +0000 (13:24 -0400)]
lib/gpg: Switch to GLib autocleanups for gpgme types

Prep for dropping `GLNX_DEFINE_CLEANUP_FUNCTION` from libglnx
in favor of using GLib's `G_DEFINE_AUTO_CLEANUP_FREE_FUNC()`.

Closes: #1042
Approved by: jlebon

8 years agolib/curl: Only check individual request errors
Colin Walters [Mon, 31 Jul 2017 14:48:57 +0000 (10:48 -0400)]
lib/curl: Only check individual request errors

It looks like `curl_multi_socket_action()` will return an error
if *one* of the requests has an error, but we already check
for that explicitly by iterating over each handle.

In libcurl, the "easy" layer doesn't really make use of this
return value.  I did a bit of looking elsewhere; systemd
does check it as a runtime error, not an assertion.  librepo
doesn't use the multi interface.

Closes: https://github.com/ostreedev/ostree/issues/1035
Closes: #1038
Approved by: jlebon

8 years agolib/commit: Rework a conditional set for clarity and Coverity
Colin Walters [Mon, 31 Jul 2017 16:35:58 +0000 (12:35 -0400)]
lib/commit: Rework a conditional set for clarity and Coverity

Coverity complained that the `else if (bytes_read == 0)` was dead
code if we happened to find it was already false when testing
`else if (G_UNLIKELY (bytes_read == 0 ...`.

There was nothing wrong with the logic, but let's rework it to
only test the value once; I think it does end up nicer anyways.

Coverity CID: 1452186

Closes: #1037
Approved by: jlebon

8 years agotests/lzma: Fix off-by-one in buffer size
Colin Walters [Mon, 31 Jul 2017 14:05:04 +0000 (10:05 -0400)]
tests/lzma: Fix off-by-one in buffer size

Coverity spotted that we had an off-by-one here since we were using
`i+1`.  Fix this by adding a `-1` to the bounds check.  Also use
`sizeof()` to ensure the data and size are coupled.

Coverity CID: 1452207

Closes: #1037
Approved by: jlebon

8 years agorofiles-fuse: Add missing error handling for fcntl()
Colin Walters [Mon, 31 Jul 2017 13:34:33 +0000 (09:34 -0400)]
rofiles-fuse: Add missing error handling for fcntl()

Spotted by Coverity.

Coverity CID: 1452201

Closes: #1037
Approved by: jlebon

8 years agotests/lzma: Use GRand over random()
Colin Walters [Mon, 31 Jul 2017 13:31:55 +0000 (09:31 -0400)]
tests/lzma: Use GRand over random()

It's designed for test suites and non-critical random uses like this. This
silences a Coverity warning about weak randomness.

Closes: #1037
Approved by: jlebon

8 years agobin/refs: Fix error handling logic
Colin Walters [Mon, 31 Jul 2017 13:30:09 +0000 (09:30 -0400)]
bin/refs: Fix error handling logic

Spotted by Coverity.

Coverity CID: 1452202

Closes: #1037
Approved by: jlebon

8 years agotests: Add some return value checking to pacify Coverity
Colin Walters [Mon, 31 Jul 2017 13:27:56 +0000 (09:27 -0400)]
tests: Add some return value checking to pacify Coverity

No real problems here, but Coverity likes to see consistent checking of return
values, and I agree with it.

Coverity CID: 1452213
Coverity CID: 1452211

Closes: #1037
Approved by: jlebon

8 years agodocs/pull: Finish incomplete docs for pull@hash syntax
Colin Walters [Tue, 1 Aug 2017 13:12:16 +0000 (09:12 -0400)]
docs/pull: Finish incomplete docs for pull@hash syntax

Closes: https://github.com/ostreedev/ostree/issues/1043
Closes: #1045
Approved by: guyshapiro

8 years agogpg-verify-result: try to display the primary key ID from signatures
Robert McQueen [Sun, 30 Jul 2017 16:44:35 +0000 (17:44 +0100)]
gpg-verify-result: try to display the primary key ID from signatures

The fingerprint associated with each signature can be different to
the primary key ID (the normal one that people use to identify a
GPG key) if the signature is from a signing subkey. Try to find the
primary key and print this ID in preference to the subkey signature.

https://github.com/ostreedev/ostree/issues/608

Closes: #1036
Approved by: cgwalters

8 years agogpg-verify-result: canonicalise key when looking up signatures
Robert McQueen [Sun, 30 Jul 2017 16:35:46 +0000 (17:35 +0100)]
gpg-verify-result: canonicalise key when looking up signatures

Use gpgme_get_key to find the primary key for the key we are
looking for, and the primary key for each signature, and
compare these when looking up signatures.

The primary key is the first in the list of subkeys, which is
the normal key ID people use when referring to a GPG key as an
identity.

If the key has a signing subkey, signature->fpr will not match
the provided key_id, so looking up both keys and comparing the
primary key fingerprints ensures they are both canonicalised.

https://github.com/ostreedev/ostree/issues/608

Closes: #1036
Approved by: cgwalters

8 years agolib/pull: Journal fetch results
Colin Walters [Thu, 27 Jul 2017 19:49:05 +0000 (15:49 -0400)]
lib/pull: Journal fetch results

This is a continuation of addition of journaling to libostree; see
e.g. <https://github.com/ostreedev/ostree/pull/708>.

I wanted more information at the end of fetches; in particular
some details about the delta execution (what opcodes etc.), but
this is a first step: we log things like the transferred data
as well as whether or not GPG was enabled, etc.

One awkward thing about this is how we map the fetcher options like
`tls-ca-path` back out into an enum for the code to log. But eh, hard to fix
without a bigger refactoring.

Closes: #1032
Approved by: jlebon

8 years agogrub2: Handle aarch64 (at least on Fedora/RHEL)
Colin Walters [Wed, 19 Jul 2017 19:59:46 +0000 (15:59 -0400)]
grub2: Handle aarch64 (at least on Fedora/RHEL)

See: https://github.com/projectatomic/rpm-ostree-toolbox/issues/102#issuecomment-316483554

The logic here should now match what grubby does.  I have no
idea whether this applies to other distributions though.

Closes: #1021
Approved by: jlebon

8 years agobuild-sys: Post-release version bump
Colin Walters [Wed, 26 Jul 2017 19:13:06 +0000 (15:13 -0400)]
build-sys: Post-release version bump

Closes: #1029
Approved by: jlebon

8 years agoRelease 2017.9
Colin Walters [Wed, 26 Jul 2017 19:11:41 +0000 (15:11 -0400)]
Release 2017.9

Closes: #1029
Approved by: jlebon

8 years agoci: Enable libcurl by default on Fedora
Colin Walters [Wed, 26 Jul 2017 19:51:57 +0000 (15:51 -0400)]
ci: Enable libcurl by default on Fedora

The insttest fell over since its build used libsoup, but that just dropped out
of FAH.

Closes: #1030
Approved by: jlebon

8 years agolib/core: Add #defines for ref/collection binding
Colin Walters [Tue, 25 Jul 2017 14:11:57 +0000 (10:11 -0400)]
lib/core: Add #defines for ref/collection binding

These were previously private, but since we expect people to use them, let's add
`#define`s like we did for some of the other commit metadata.

Closes: #1028
Approved by: jlebon

8 years agoUpdate libglnx, port some uses to newer APIs
Colin Walters [Mon, 24 Jul 2017 16:25:07 +0000 (12:25 -0400)]
Update libglnx, port some uses to newer APIs

Mostly for the latest `-Wmaybe-uninitialized` fix, but while here also port some
places to newer APIs.

Update submodule: libglnx

Closes: #1027
Approved by: jlebon

8 years agobuild: Turn off default warnings if we find -Werror specified
Colin Walters [Thu, 20 Jul 2017 19:37:27 +0000 (15:37 -0400)]
build: Turn off default warnings if we find -Werror specified

Our CI runs use `-Werror`; there's no point to our default warning set kicking
in, it just bloats the command line output.

Closes: #1023
Approved by: jlebon

8 years agoci: Enable -Werror for clang
Colin Walters [Thu, 20 Jul 2017 19:34:15 +0000 (15:34 -0400)]
ci: Enable -Werror for clang

I hit an unused-variable warning with `GLNX_AUTO_PREFIX_ERROR` for
rpm-ostree and led me to wonder why ostree didn't fail, then I noticed
we had lost the special `-Werror=unused-variable` bit.  Let's go
ahead and use `-Werror` for clang too.

Closes: #1023
Approved by: jlebon

8 years agotests: More fixes for gjs tests
Colin Walters [Thu, 20 Jul 2017 14:32:44 +0000 (10:32 -0400)]
tests: More fixes for gjs tests

Previous to this commit, the gjs tests were installed-only; and our
logic for handling the "--enable-installed-tests=exclusive" logic
actually also meant they weren't installed.

It did work for me locally with `--enable-installed-tests`.

However, to make things fully symmetric, let's enable the js tests to also be
run under `make check`.

Also remove `corrupt-repo-ref.js` from the PAPR invocation since it's not
actually a unit test, it's a utility helper.

Closes: #1022
Approved by: jlebon

8 years agolib: Add #define for endoflife metadata key
Ruixin [Fri, 21 Jul 2017 15:20:50 +0000 (15:20 +0000)]
lib: Add #define for endoflife metadata key

It is a continuation of https://github.com/ostreedev/ostree/pull/1024
It adds documentation for endoflife metadata key.

Closes: #1025
Approved by: cgwalters

8 years agolib: Add #defines for current well-known metadata keys
Colin Walters [Fri, 21 Jul 2017 13:44:12 +0000 (09:44 -0400)]
lib: Add #defines for current well-known metadata keys

This came up in https://github.com/projectatomic/rpm-ostree/issues/142

Let's add `#define`s for our metadata keys, with documentation so
that, well, they're documented.

Closes: #1024
Approved by: peterbaouoft

8 years agoci/papr: Add a suite to run introspection-based tests without ASAN
Colin Walters [Wed, 19 Jul 2017 13:21:23 +0000 (09:21 -0400)]
ci/papr: Add a suite to run introspection-based tests without ASAN

Unfortunately we can't do gobject-introspection based tests
while compiling with `-fsanitize=address`, since it needs to hook
`malloc` early on.

Add a new suite which just runs the introspection-based tests without ASAN.

Closes: #1016
Approved by: jlebon

8 years agolib/commit: Fix EBADF with GENERATE_SIZES option for commit
Colin Walters [Wed, 19 Jul 2017 13:19:16 +0000 (09:19 -0400)]
lib/commit: Fix EBADF with GENERATE_SIZES option for commit

Regression from previous tmpfile refactoring; unfortunately
the `OSTREE_REPO_COMMIT_MODIFIER_FLAGS_GENERATE_SIZES` option
only has coverage via gjs currently.

Might expose it via the cmdline in a later option, but in the big picture the
idea was that this data is better kept in static deltas.

Closes: https://github.com/ostreedev/ostree/issues/1014
Closes: #1016
Approved by: jlebon

8 years agoci/papr: Switch primary to libcurl, add libsoup context
Colin Walters [Wed, 19 Jul 2017 13:08:41 +0000 (09:08 -0400)]
ci/papr: Switch primary to libcurl, add libsoup context

Sometime in the next few releases I think we should make libcurl
the default.

Prep for more CI work.

Closes: #1016
Approved by: jlebon

8 years agolib/repo: Auto-recreate repo/tmp if it's deleted
Colin Walters [Wed, 19 Jul 2017 14:35:06 +0000 (10:35 -0400)]
lib/repo: Auto-recreate repo/tmp if it's deleted

We can accumulate a lot of space there; let's be nice to people who delete the
whole directory.

Closes: https://github.com/ostreedev/ostree/issues/1018
Closes: #1020
Approved by: jlebon

8 years agocore: Sanitize error text validating refs (e.g. against HTML)
Colin Walters [Wed, 19 Jul 2017 09:47:33 +0000 (05:47 -0400)]
core: Sanitize error text validating refs (e.g. against HTML)

See: https://github.com/projectatomic/rpm-ostree/issues/885

If we get a successful Apache directory listing HTML when fetching what we
intend to be a ref, we'd dump the HTML into the error.

I did some scanning of the pull code, and this was the only case
I saw offhand where we were dumping text out into an error.  Which
makes sense, since most of our formats are binary, the exeptions I
think are just `repo/config` and `repo/refs/`.

Closes: #1015
Approved by: mbarnes

8 years agobuild: Don't distribute generated man pages
Simon McVittie [Wed, 21 Jun 2017 09:27:18 +0000 (10:27 +0100)]
build: Don't distribute generated man pages

We build them in "make" and clean them in "make clean", so there
doesn't seem much point in shipping them pre-generated in the tarball.

Signed-off-by: Simon McVittie <smcv@debian.org>
Closes: #1013
Approved by: cgwalters

8 years agoUpdate libglnx, port various bits to new API
Colin Walters [Tue, 18 Jul 2017 01:14:04 +0000 (21:14 -0400)]
Update libglnx, port various bits to new API

Using the error prefixing in the delta processing allows us to
do new code style.  Also strip trailing whitespace.

Use error prefixing in a few other random places.  I didn't
hunt for all of them, just testing out the new API.

Use `glnx_fchmod()`.  Also note I dropped one `fchmod (tmpf, 0600)`
which is no longer necessary.

Update submodule: libglnx

Closes: #1011
Approved by: jlebon

8 years agolib/pull: Drop direct use of ->repodir
Colin Walters [Tue, 18 Jul 2017 00:50:55 +0000 (20:50 -0400)]
lib/pull: Drop direct use of ->repodir

Prep for `ostree_repo_new_at()`.  Down the line perhaps
we should extend libcurl to accept a file descriptor for cookies,
but this works OK for now.

Closes: #1010
Approved by: jlebon

8 years agobin/cookies: Drop libsoup code, fix fd-relative issues, new style
Colin Walters [Mon, 17 Jul 2017 22:05:25 +0000 (18:05 -0400)]
bin/cookies: Drop libsoup code, fix fd-relative issues, new style

Prep for `ostree_repo_new_at()`. These commands were directly accessing
`repo->repodir`, which it turns out was unnecessary since the the APIs they then
used were fd-relative. Except actually there were bugs there, so fix all of the
cookie util code to actually use the passed `dfd` and not just hardcode
`AT_FDCWD`.

Also, libsoup can't handle this (its APIs require fully qualifed paths), and
there's not a really good reason to have two implementations now; historically
it was useful to cross-check them, but I don't think we need that.

While I'm here, port to new style.

Closes: #1010
Approved by: jlebon

8 years agoAdd a notion of "physical" sysroot, use for remote writing
Colin Walters [Tue, 30 May 2017 18:07:13 +0000 (14:07 -0400)]
Add a notion of "physical" sysroot, use for remote writing

(Note this PR was reverted in <https://github.com/ostreedev/ostree/pull/902>;
 this version should be better)

Using `${sysroot}` to mean the physical storage root: We don't want to write to
`${sysroot}/etc/ostree/remotes.d`, since nothing will read it, and really
`${sysroot}` should just have `/ostree` (ideally). Today the Anaconda rpmostree
code ends up writing there. Fix this by adding a notion of "physical" sysroot.
We determine whether the path is physical by checking for `/sysroot`, which
exists in deployment roots (and there shouldn't be a `${sysroot}/sysroot`).

In order to unit test this, I added a `--sysroot` argument to `remote add`.
However, doing this better would require reworking the command line parsing for
the `remote` argument to support specifying `--repo` or `--sysroot`, and I
didn't quite want to do that yet in this patch.

This second iteration of this patch fixes the bug we hit the first time;
embarassingly enough I broke `ostree remote list` finding system remotes.
The fix is to have `ostree_repo_open()` figure out whether it's the same
as `/ostree/repo` for now.

Down the line...we might consider having the `ostree remote` command line itself
instatiate an `OstreeSysroot` by default, but this maximizes compatibility; we
just have to pay a small cost that `ostree` usage outside of that case like
`ostree static-delta` in a releng Jenkins job or whatever will do this `stat()`
too.

Closes: https://github.com/ostreedev/ostree/issues/892
Closes: #1008
Approved by: mbarnes

8 years agolib/pull: Do local content imports async too
Colin Walters [Fri, 14 Jul 2017 16:51:21 +0000 (16:51 +0000)]
lib/pull: Do local content imports async too

This came up in <https://github.com/ostreedev/ostree/pull/982>; when
we added more direct local importing, we did it synchronously.

This was actually quite a regression when doing local pulls between different
modes; in particular between a bare mode and `archive`, as we were suddenly
doing gzip {de,}compression in the main thread.

Down the line actually...a simpler fix is probably to change things so that the
local path is really only used when we know we can hardlink; everything else
would go though the fetcher codepath but with `file://`.

But this isn't a lot more code, and the speed/interactivity win is large.

Note we're only doing content async with this patch. We could do metadata as
well; we have the object already local. But the metadata code path is messier,
and metadata objects are smaller.

Another area where this comes up is that in e.g. Fedora releng, most operations
talk to a NetApp via NFS. So this has the classic network filesystem problem
that operations that are normally cheap like `stat()` can actually have
nontrivial latency. Doing as much as possible in threads is better there too.

Closes: #1006
Approved by: jlebon

8 years agoci/papr: Update to F26
Colin Walters [Tue, 18 Jul 2017 09:59:04 +0000 (05:59 -0400)]
ci/papr: Update to F26

In particular F25AH will stop getting updates.

Closes: #1012
Approved by: jlebon

8 years agoMove the include directive to the enum template
Emmanuele Bassi [Mon, 17 Jul 2017 14:44:58 +0000 (15:44 +0100)]
Move the include directive to the enum template

There is no actual written guarantee in glib-mkenums that the template
line specified using --fhead will be added after the templates specified
inside the template file. Since the template file is only used once, we
can simply move the `#include` directive inside the template, so that it
is guaranteed to be in the right place.

Closes: #1007
Approved by: cgwalters

8 years agolib/pull: Avoid journaling 404s for optional content
Colin Walters [Wed, 5 Jul 2017 20:41:38 +0000 (16:41 -0400)]
lib/pull: Avoid journaling 404s for optional content

Currently in Fedora we don't sign summaries, and every use of
`rpm-ostree` would emit to the journal an error when we failed
to fetch it.

Fix this by having `OSTREE_FETCHER_REQUEST_OPTIONAL_CONTENT` tell the fetcher
not to journal 404 errors. While fixing this, we had a mix of two booleans vs
the flags; fix things so we consistently use the flags in the fetcher and pull
code.

Closes: #1004
Approved by: mbarnes

8 years agobuild: Ensure all experimental tests are distributed in tarballs
Philip Withnall [Wed, 12 Jul 2017 14:04:34 +0000 (15:04 +0100)]
build: Ensure all experimental tests are distributed in tarballs

As with the previous commit, ensure that tests which are run when
configured with --enable-experimental-api, are always distributed; even
when running `make dist` from a source tree configured with
--disable-experimental-api.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
Closes: #1002
Approved by: cgwalters

8 years agobuild: Ensure all .sym files are distributed in tarballs
Philip Withnall [Wed, 12 Jul 2017 12:58:16 +0000 (13:58 +0100)]
build: Ensure all .sym files are distributed in tarballs

Since we’re using a custom variable for listing the .sym files,
automake’s magic support for automatically distributing all files in
conditionals doesn’t work, and the devel and experimental .sym files
were only being distributed if `make dist` was run on a source tree
which had been configured with --enable-experimental-api or not a
release flag.

Fix that by explicitly listing all the .sym files in EXTRA_DIST.

Specifically, this fixes the case of trying to compile with
--enable-experimental-api from a release tarball which was disted with
--disable-experimental-api.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
Closes: #1001
Approved by: cgwalters

8 years agolib/repo: Add OSTREE_REPO_METADATA_REF as a well-known metadata store
Philip Withnall [Tue, 11 Jul 2017 19:46:03 +0000 (20:46 +0100)]
lib/repo: Add OSTREE_REPO_METADATA_REF as a well-known metadata store

As discussed in https://github.com/ostreedev/ostree/pull/946, the
summary file is becoming an unsigned cache of ref information; any
additional metadata for the repository needs to move elsewhere in order
to remain signed. Introduce OSTREE_REPO_METADATA_REF as the well-known
name of a ref where such metadata can live, as the metadata on
contentless commits.

Don’t yet update the documentation for summary-related methods to
mention this, since it’s still hidden behind the
--enable-experimental-api configure option.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
Closes: #946
Approved by: cgwalters