Skip to content

Ensure directories/mountpoints exist for initial scripts #1504

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shahs-ais wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Ensure directories/mountpoints exist for initial scripts #1504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions recipes-core/base-files/files/fstab.early
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,6 @@ tmpfs /var/cache tmpfs defaults,rootcontext=system_u:ob

# OpenXT: modutils.sh loads before mountall.sh, and modutils.sh will load the txt module, which needs this:
securityfs /sys/kernel/security securityfs defaults 0 0

# OpenXT: xenmgr.initscript requires early storage mount with new boot timing introduced by LUKS2
/dev/mapper/xenclient-storage /storage ext4 errors=remount-ro,user_xattr,noatime 1 5
4 changes: 4 additions & 0 deletions recipes-openxt/manager/xenmgr/xenmgr.initscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ cmdline_options() {

# Create/Label /storage/isos/null.iso if not present.
check_null_iso() {
# Ensure /storage exists
[ -d /storage ] || mkdir -p /storage
mountpoint -q /storage || mount /storage

if [ -f "/storage/isos/null.iso" ]; then
return 0
fi
Expand Down
5 changes: 5 additions & 0 deletions recipes-openxt/xenclient-root-ro/xenclient-root-ro/init.root-ro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,11 @@ unlock_config()
local tss_path="${SYS_TPM_DIR}/config.tss"
local measured_flag="/config/tpm/measured-boot"

# LUKS2 changes some early boot timing, so /run may not be mounted yet.
# Perform check here to ensure it is mounted to prevent cryptsetup failures
[ -d /run ] || mkdir -p /run
mountpoint -q /run || mount -t tmpfs -o mode=0755,nosuid,nodev tmpfs /run

local sig=$(dd if="${lv_path}" bs=4 count=1 2>/dev/null)
case "${sig}" in
LUKS)
Expand Down