Skip to content

Commit

Permalink
Merge pull request warewulf#1396 from anderbubble/tmpfs-mpol-interleave
Browse files Browse the repository at this point in the history
Set mpol=interleave on dracut tmpfs
  • Loading branch information
mslacken authored Sep 17, 2024
2 parents 563b181 + 97620eb commit 43b298f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## v4.5.8, unreleased

### Changed

- Interleave tmpfs across all available NUMA nodes. #1347, #1348

### Fixed

- Return an error during `wwctl container import` if archive filename includes a colon. #1371
Expand Down
2 changes: 1 addition & 1 deletion dracut/modules.d/90wwinit/load-wwinit.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

info "Mounting tmpfs at $NEWROOT"
mount -t tmpfs ${wwinit_tmpfs_size_option} tmpfs "$NEWROOT"
mount -t tmpfs -o mpol=interleave ${wwinit_tmpfs_size_option} tmpfs "$NEWROOT"

for archive in "${wwinit_container}" "${wwinit_kmods}" "${wwinit_system}" "${wwinit_runtime}"
do
Expand Down
2 changes: 1 addition & 1 deletion overlays/wwinit/rootfs/init
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ elif test "$WWROOT" = "tmpfs"; then
else
echo "Setting up tmpfs root file system"
mkdir /newroot
mount wwroot /newroot -t tmpfs
mount wwroot /newroot -t tmpfs -o mpol=interleave
echo "Moving RAMFS to TMPFS"
tar -cf - --exclude ./proc --exclude ./sys --exclude ./dev --exclude ./newroot . | tar -xf - -C /newroot
mkdir /newroot/proc /newroot/dev /newroot/sys /newroot/run 2>/dev/null
Expand Down

0 comments on commit 43b298f

Please sign in to comment.