diff options
| author | W. Trevor King <wking@tremily.us> | 2018-06-30 15:52:01 -0700 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-07-06 00:48:39 +0000 |
| commit | 83968de28c37117d5e2ae6d713b30535fa6a163c (patch) | |
| tree | 1e5d848e8ee2419104af65f744935d05076a08dd /pkg/annotations | |
| parent | 4b54a471a49cfae617c65b2027ae1e7cc1671cfc (diff) | |
| download | podman-83968de28c37117d5e2ae6d713b30535fa6a163c.tar.gz podman-83968de28c37117d5e2ae6d713b30535fa6a163c.tar.bz2 podman-83968de28c37117d5e2ae6d713b30535fa6a163c.zip | |
rootless: Merge rootless.go back into rootless_linux.go
The files were split apart by b96be3af (changes to allow for darwin
compilation, 2018-06-20, #1015), but the C import and two functions
left in rootless.go are all Linux-specific as well. This commit moves
all of the pre-b96be3af rootless.go into rootless_linux.go, just
adding the '// +build linux' header (b96be3af also scrambled the + in
that header) and keeping the new GetRootlessUID from a1545fe6
(rootless: add function to retrieve the original UID, 2018-07-05, #1048).
Signed-off-by: W. Trevor King <wking@tremily.us>
Closes: #1034
Approved by: baude
Diffstat (limited to 'pkg/annotations')
0 files changed, 0 insertions, 0 deletions