diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-29 16:25:16 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-29 16:25:16 +0000 |
commit | 05396fc59ee97ace1186077ffedf075ca33149bc (patch) | |
tree | 431fcf68a19b2c7de7d71759a71af34273254502 /share/doc | |
parent | Releasing progress-linux version 20221223-6~progress7.99u1. (diff) | |
download | open-infrastructure-compute-tools-05396fc59ee97ace1186077ffedf075ca33149bc.tar.xz open-infrastructure-compute-tools-05396fc59ee97ace1186077ffedf075ca33149bc.zip |
Merging upstream version 20240829.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'share/doc')
-rw-r--r-- | share/doc/examples/bookworm.cfg | 9 | ||||
-rwxr-xr-x | share/doc/examples/container-images.sh | 2 | ||||
-rw-r--r-- | share/doc/host-setup.txt | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/share/doc/examples/bookworm.cfg b/share/doc/examples/bookworm.cfg index 1f878f4..a618928 100644 --- a/share/doc/examples/bookworm.cfg +++ b/share/doc/examples/bookworm.cfg @@ -33,3 +33,12 @@ compute-tools container/root-password string debian compute-tools container/network1/bridge string bridge0 #compute-tools container/network-mac string + +#compute-tools container/archive1/repository string deb https://example.org/debian stable main +#compute-tools container/archive1/list string example +#compute-tools container/archive1/comment string This is the sources.list entry for the example repository +#compute-tools container/archive1/source boolean false +#compute-tools container/archive1/key string https://example.org/debian/key.txt +#compute-tools container/archive1/preferences-package string * +#compute-tools container/archive1/preferences-pin string release o=example, n=stable +#compute-tools container/archive1/preferences-pin-priority string 999 diff --git a/share/doc/examples/container-images.sh b/share/doc/examples/container-images.sh index b711048..50463bb 100755 --- a/share/doc/examples/container-images.sh +++ b/share/doc/examples/container-images.sh @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2014-2022 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/share/doc/host-setup.txt b/share/doc/host-setup.txt index 083e1aa..bf2963f 100644 --- a/share/doc/host-setup.txt +++ b/share/doc/host-setup.txt @@ -131,7 +131,7 @@ Kind=vlan Id=100 EOF -cat > /etc/systemd/network/vlan-100.netdev << EOF +cat > /etc/systemd/network/vlan-100.network << EOF [Match] Name=vlan-100 |