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

Documentation fixes #1276

Merged
merged 3 commits into from
Oct 2, 2024
Merged

Documentation fixes #1276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ef1c28
doc/network/resolved: Fix systemd unit
stgraber Oct 2, 2024
7f00f40
internal/instance: Fix doc for boot.host_shutdown_action
stgraber Oct 2, 2024
d68fd5d
doc: Update metadata
stgraber Oct 2, 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
4 changes: 3 additions & 1 deletion doc/config_options.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,8 +436,10 @@ The instance with the highest value is started first.
:defaultdesc: "stop"
:liveupdate: "yes"
:shortdesc: "What action to take on the instance when the host is shut down"
:type: "integer"
:type: "string"
Action to take on host shut down

Valid values are: `stop`, `force-stop` or `stateful-stop`
```

```{config:option} boot.host_shutdown_timeout instance-boot
Expand Down
2 changes: 1 addition & 1 deletion doc/howto/network_bridge_resolved.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ After=sys-subsystem-net-devices-<network_bridge>.device
[Service]
Type=oneshot
ExecStart=/usr/bin/resolvectl dns <network_bridge> <dns_address>
ExecStart=/usr/bin/resolvectl domain <network_bridge> <dns_domain>
ExecStart=/usr/bin/resolvectl domain <network_bridge> ~<dns_domain>
ExecStopPost=/usr/bin/resolvectl revert <network_bridge>
RemainAfterExit=yes

Expand Down
4 changes: 3 additions & 1 deletion internal/instance/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,10 @@ var InstanceConfigKeysAny = map[string]func(value string) error{

// gendoc:generate(entity=instance, group=boot, key=boot.host_shutdown_action)
// Action to take on host shut down
//
// Valid values are: `stop`, `force-stop` or `stateful-stop`
// ---
// type: integer
// type: string
// defaultdesc: stop
// liveupdate: yes
// shortdesc: What action to take on the instance when the host is shut down
Expand Down
4 changes: 2 additions & 2 deletions internal/server/metadata/configuration.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,9 +491,9 @@
"boot.host_shutdown_action": {
"defaultdesc": "stop",
"liveupdate": "yes",
"longdesc": "Action to take on host shut down",
"longdesc": "Action to take on host shut down\n\nValid values are: `stop`, `force-stop` or `stateful-stop`",
"shortdesc": "What action to take on the instance when the host is shut down",
"type": "integer"
"type": "string"
}
},
{
Expand Down
Loading