Don't mount /run during wwinit

- Fixes: #1566

Signed-off-by: Jonathon Anderson <janderson@ciq.com>
This commit is contained in:
Jonathon Anderson
2025-01-30 15:03:51 -07:00
parent dbf8a58885
commit 09503e583c
2 changed files with 9 additions and 9 deletions

View File

@@ -10,6 +10,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Document defining kernel args that include commas. #1679
### Changes
- Don't mount /run during wwinit. #1566
### Fixed
- Fix default nodes.conf to use the new kernel command line list format. #1670

View File

@@ -5,13 +5,9 @@
#
# Edit at your own risk! DANGER DANGER.
echo -n "Mounting kernel file systems:"
mkdir /proc /dev /sys /run 2>/dev/null
mount -t proc proc /proc && echo -n " /proc"
mount -t devtmpfs devtmpfs /dev && echo -n " /dev"
mount -t sysfs sysfs /sys && echo -n " /sys"
mount -t tmpfs tmpfs /run && echo -n " /run"
echo
mountpoint -q /proc || (mkdir -p /proc && mount -t proc proc /proc && echo "Mounted /proc")
mountpoint -q /dev || (mkdir -p /dev && mount -t devtmpfs devtmpfs /dev && echo "Mounted /dev")
mountpoint -q /sys || (mkdir -p /sys && mount -t sysfs sysfs /sys && echo "Mounted /sys")
if [ -f "/warewulf/config" ]; then
. /warewulf/config
@@ -35,8 +31,8 @@ elif [ "${WWROOT}" = "ramfs" -o "${WWROOT}" = "tmpfs" ]; then
echo "Setting up new ${WWROOT} rootfs..."
mkdir /newroot
mount wwroot /newroot -t ${WWROOT} -o mpol=interleave # mpol ignored for ramfs
tar -cf - --exclude ./proc --exclude ./sys --exclude ./dev --exclude ./run --exclude ./newroot . | tar -xf - -C /newroot
mkdir /newroot/proc /newroot/dev /newroot/sys /newroot/run 2>/dev/null
tar -cf - --exclude ./proc --exclude ./sys --exclude ./dev --exclude --exclude ./newroot . | tar -xf - -C /newroot
mkdir /newroot/proc /newroot/dev /newroot/sys 2>/dev/null
echo "Switching to new rootfs and invoking /warewulf/wwinit..."
exec /sbin/switch_root /newroot /warewulf/wwinit
else