Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 src/daemon/rpm-ostreed.service.in
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ ProtectHome=true
# application containers.
InaccessiblePaths=-/var/lib/containers
NotifyAccess=main
# Significantly bump this timeout from the default because
# we do a lot of stuff on daemon startup.
TimeoutStartSec=5m
@SYSTEMD_ENVIRON@
ExecStart=@bindir@/rpm-ostree start-daemon
ExecReload=@bindir@/rpm-ostree reload
3 changes: 3 additions & 0 deletions tests/kolainst/nondestructive/misc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ echo "ok empty pkg arrays, and commit meta correct in status json"
# All tests which require a booted system, but are nondestructive
rpm-ostree testutils integration-read-only

systemctl show -p TimeoutStartUSec rpm-ostreed.service > out.txt
assert_file_has_content out.txt 'TimeoutStartUSec=5m'

# Ensure we return an error when passing a wrong option.
rpm-ostree --help | awk '/^$/ {in_commands=0} {if(in_commands==1){print $0}} /^Builtin Commands:/ {in_commands=1}' > commands.txt
while read cmd; do
Expand Down