opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-21 00:56:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

libpod: don't make a broken symlink for /etc/mtab on FreeBSD

Browse Source 
This file has not been present in BSD systems since 2.9.1 BSD and as far
as I remember /proc/mounts has never existed on BSD systems.

[NO NEW TESTS NEEDED]

Signed-off-by: Doug Rabson <dfr@rabson.org>
This commit is contained in:
Doug Rabson
2023-07-09 08:42:32 +01:00
parent 7cd1fb77f9
commit f8213a6d53
3 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libpod/container_internal.go
View File

@ -1638,18 +1638,8 @@ func (c *Container) mountStorage() (_ string, deferredErr error) {
}
defer unix.Close(etcInTheContainerFd)
// If /etc/mtab does not exist in container image, then we need to
// create it, so that mount command within the container will work.
err = unix.Symlinkat("/proc/mounts", etcInTheContainerFd, "mtab")
if err != nil && !os.IsExist(err) {
return "", fmt.Errorf("creating /etc/mtab symlink: %w", err)
}
// If the symlink was created, then also chown it to root in the container
if err == nil && (rootUID != 0 || rootGID != 0) {
err = unix.Fchownat(etcInTheContainerFd, "mtab", rootUID, rootGID, unix.AT_SYMLINK_NOFOLLOW)
if err != nil {
return "", fmt.Errorf("chown /etc/mtab: %w", err)
}
if err := c.makePlatformMtabLink(etcInTheContainerFd, rootUID, rootGID); err != nil {
return "", err
}
tz := c.Timezone()

5
libpod/container_internal_freebsd.go
View File

@ -336,3 +336,8 @@ func (s *safeMountInfo) Close() {
func (c *Container) safeMountSubPath(mountPoint, subpath string) (s *safeMountInfo, err error) {
return &safeMountInfo{mountPoint: filepath.Join(mountPoint, subpath)}, nil
}
func (c *Container) makePlatformMtabLink(etcInTheContainerFd, rootUID, rootGID int) error {
// /etc/mtab does not exist on FreeBSD
return nil
}

17
libpod/container_internal_linux.go
View File

@ -784,3 +784,20 @@ func (c *Container) safeMountSubPath(mountPoint, subpath string) (s *safeMountIn
mountPoint: npath,
}, nil
}
func (c *Container) makePlatformMtabLink(etcInTheContainerFd, rootUID, rootGID int) error {
// If /etc/mtab does not exist in container image, then we need to
// create it, so that mount command within the container will work.
err := unix.Symlinkat("/proc/mounts", etcInTheContainerFd, "mtab")
if err != nil && !os.IsExist(err) {
return fmt.Errorf("creating /etc/mtab symlink: %w", err)
}
// If the symlink was created, then also chown it to root in the container
if err == nil && (rootUID != 0 || rootGID != 0) {
err = unix.Fchownat(etcInTheContainerFd, "mtab", rootUID, rootGID, unix.AT_SYMLINK_NOFOLLOW)
if err != nil {
return fmt.Errorf("chown /etc/mtab: %w", err)
}
}
return nil
}