diff --git a/CHANGELOG.md b/CHANGELOG.md index 34334ddd..40d18e16 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -57,6 +57,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Added a troubleshooting guide. #1234 - Added documentation about `rootfstype=ramfs` for SELinux support. #1001 - Added workaround documentation for importing containers with sockets. #892 +- Added documentation for building iPXE locally. #1114 ### Changed diff --git a/userdocs/contents/containers.rst b/userdocs/contents/containers.rst index 93c834f8..b3f63012 100644 --- a/userdocs/contents/containers.rst +++ b/userdocs/contents/containers.rst @@ -232,12 +232,14 @@ Files which should always be present in a container image like ``resolv.conf`` can be specified in ``warewulf.conf``: .. code-block:: yaml + container mounts: - source: /etc/resolv.conf dest: /etc/resolv.conf readonly: true .. note:: + Instead of ``readonly: true`` you can set ``copy: true``. This causes the source file to be copied to the container and removed if it was not modified. This can be useful for files used for registrations. @@ -399,7 +401,7 @@ issues in most circumstances: Duplicating a container ======================= -It is possible to duplicate an installed image by using : +It is possible to duplicate an installed image by using: .. code-block:: console diff --git a/userdocs/contents/disks.rst b/userdocs/contents/disks.rst index dcb3e0d7..3a731ca4 100644 --- a/userdocs/contents/disks.rst +++ b/userdocs/contents/disks.rst @@ -99,7 +99,7 @@ is created and the filesystems are mounted; and so the `--fswipe` can be omitted data is on the disk isn't wiped. If there are pre-existing partitions and filesystem on the disk, omitting the `--fswipe` may lead to the outcome that no filesystems are created and mounted. In that case you should: -* wipe the existing data with the means of tools like `wipefs` or `dd` [#] +* wipe the existing data with the means of tools like `wipefs` or `dd` [#]_ * set the `--fswipe` flag and remove it after one reboot, if you want to keep existing data on the disk.