Skip to content

Hardening podcvd-setup to be working properly on various situation #3209

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

Merged
0405ysj merged 2 commits into from
Sep 22, 2026
+6 −4
Merged

Hardening podcvd-setup to be working properly on various situation #3209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e674d2
Add passt and uidmap as dependencies of cuttlefish-podcvd
0405ysj Sep 21, 2026
400a1cb
Check character devices exist before modprobe in podcvd
0405ysj Sep 21, 2026
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: 2 additions & 0 deletions container/debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ Depends: acl,
crun,
libnss3-tools,
mkcert,
passt,
podman (>= 4.4),
uidmap,
yq,
Pre-Depends: ${misc:Pre-Depends}
Description: Cuttlefish Android Virtual Device companion package
Expand Down
4 changes: 2 additions & 2 deletions container/debian/cuttlefish-podcvd.cuttlefish-podcvd.init
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ start() {
echo 1 > /proc/sys/net/ipv4/ip_forward
echo 1 > /proc/sys/net/ipv6/conf/all/forwarding

modprobe vhost_net || true
modprobe vhost_vsock || true
[ -c /dev/vhost-net ] && [ -e /sys/class/misc/vhost-net ] || modprobe vhost_net
[ -c /dev/vhost-vsock ] && [ -e /sys/class/misc/vhost-vsock ] || modprobe vhost_vsock

ip link add "${podcvd_ifname}" type dummy
ip link set "${podcvd_ifname}" up
Expand Down
4 changes: 2 additions & 2 deletions container/debian/podcvd-setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ KERNEL=="vhost-vsock", RUN+="/usr/bin/setfacl -m u:$username:rw /dev/%k"
EOF

# Ensure vhost_net and vhost_vsock exists
modprobe vhost_net
modprobe vhost_vsock
[ -c /dev/vhost-net ] && [ -e /sys/class/misc/vhost-net ] || modprobe vhost_net
[ -c /dev/vhost-vsock ] && [ -e /sys/class/misc/vhost-vsock ] || modprobe vhost_vsock

udevadm control --reload-rules
udevadm trigger --action=change /dev/kvm
Expand Down
Loading