Skip to content
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

Jump to bottom

factory: do not mount /lib/{modules,firmware} if there is a drivers tree #238

Merged
merged 4 commits into from
Jun 13, 2024
Merged

factory: do not mount /lib/{modules,firmware} if there is a drivers tree #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
96794bd
factory: do not mount /lib/{modules,firmware} if there is a drivers tree
alfonsosanchezbeato May 30, 2024
19f83e4
tests: enable serial output when repacking gadget
alfonsosanchezbeato Jun 12, 2024
7273f21
tests/build: use channel 24 for the kernel now
alfonsosanchezbeato Jun 12, 2024
c621725
.github: fix typo
alfonsosanchezbeato Jun 12, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ jobs:
echo "************* DOWNLOADING SNAPS *************"
download_core_initrd_snaps 'edge'

echo "************* PREPAREING CORE24 IMAGE *************"
echo "************* PREPARING CORE24 IMAGE *************"
rm -f "upstream-pc-kernel.snap" "upstream-pc-gadget.snap"
mv "pc-kernel.artifact" "upstream-pc-kernel.snap"
mv "pc-gadget.artifact" "upstream-pc-gadget.snap"
Expand Down
15 changes: 14 additions & 1 deletion factory/usr/lib/core/extra-paths
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,21 @@

set -eu

cat <<EOF >>/sysroot/etc/fstab
cat <<'EOF' >>/sysroot/etc/fstab
/run/mnt/data /writable none bind,x-initrd.mount 0 0
EOF

# Find out kernel name / revision
kernelPath=$(cat /sys/dev/block/"$(mountpoint --fs-devno /run/mnt/kernel)"/loop/backing_file)
kernelFile=$(basename "$kernelPath")
kernelName=${kernelFile%%_*}
rev=${kernelFile#*_}
rev=${rev%%.*}

# Mount /lib/{firmware,modules} only if there is no drivers tree created by snapd
if [ ! -d /run/mnt/data/system-data/var/lib/snapd/kernel/"$kernelName"/"$rev" ]; then
cat <<'EOF' >>/sysroot/etc/fstab
/run/mnt/kernel/firmware /usr/lib/firmware none bind,x-initrd.mount 0 0
/run/mnt/kernel/modules /usr/lib/modules none bind,x-initrd.mount 0 0
EOF
fi
12 changes: 12 additions & 0 deletions factory/usr/lib/systemd/system-generators/kernel-snap-generator
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,18 @@ if ! grep -q "^ID=ubuntu$" "${OS_RELEASE}"; then
exit 0
fi

# Find out kernel name / revision
kernelPath=$(cat /sys/dev/block/"$(mountpoint --fs-devno "$KERNEL_MNT_POINT")"/loop/backing_file)
kernelFile=$(basename "$kernelPath")
kernelName=${kernelFile%%_*}
rev=${kernelFile#*_}
rev=${rev%%.*}

# Mount /lib/{firmware,modules} only if there is no drivers tree created by snapd
if [ -d /run/mnt/data/var/lib/snapd/kernel/"$kernelName"/"$rev" ]; then
exit 0
fi

for entry in firmware modules; do
what="${KERNEL_MNT_POINT}/${entry}"
where="${sysroot}/usr/lib/${entry}"
Expand Down
5 changes: 5 additions & 0 deletions tests/lib/prepare-utils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,11 @@ repack_and_sign_gadget() {
create_cloud_init_cdimage_config "${gadget_dir}/cloud.conf"
fi

# Show output in serial
cat > "${gadget_dir}/cmdline.extra" << 'EOF'
console=ttyS0 systemd.journald.forward_to_console=1 rd.systemd.journald.forward_to_console=1
EOF

sbattach --remove "$gadget_dir/shim.efi.signed"
sbsign --key "$snakeoil_dir/PkKek-1-snakeoil.key" --cert "$snakeoil_dir/PkKek-1-snakeoil.pem" --output "$gadget_dir/shim.efi.signed" "$gadget_dir/shim.efi.signed"

Expand Down
2 changes: 1 addition & 1 deletion tests/spread/build/build-initrd/task.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ prepare: |

# download pc-kernel and pc gadget
# FIXME: switch to 24 channel when available
snap download pc-kernel --channel=22/${SNAP_BRANCH} --basename=upstream-pc-kernel
snap download pc-kernel --channel=24/${SNAP_BRANCH} --basename=upstream-pc-kernel
snap download pc --channel=24/${SNAP_BRANCH} --basename=upstream-pc-gadget

execute: |
Expand Down
Loading