1
0
mirror of https://github.com/lxc/lxc-templates.git synced 2024-12-23 06:50:13 +00:00
Commit Graph

92 Commits

Author SHA1 Message Date
Kevin Locke
a37d6d40f6 lxc-debian: fix getopt parsing of --mirror
When the --keyring option was added, the `,` between `mirror:` and
`keyring:` was omitted in the long option string passed to `getopt`.
This causes `--mirror` to be parsed as `--mirror:keyring`, matching
`*) break ;;` and prematurely terminating option parsing.  To avoid
this, add the missing `,`.  Also order `keyring:` before `mirror:` to
preserve lexical ordering of long options.

Fixes: eebcd76feb ("lxc-debian: allow using a custom keyring")
Signed-off-by: Kevin Locke <kevin@kevinlocke.name>
2023-03-22 15:45:26 -06:00
Stéphane Graber
fbb2a909db
Merge pull request #51 from fedya/master
adjust openmandriva.in template to the modern times
2022-10-19 00:18:15 -04:00
Alexander Stefanov
ca4c393869 adjust alex name 2022-10-18 15:15:08 +02:00
Alexander Stefanov
222ab5cd0a adjust openmandriva template to the modern cooker distro 2022-10-18 15:14:42 +02:00
Stéphane Graber
cfbb67e74e
Merge pull request #50 from elboulangero/kali-maintenance
Kali maintenance
2022-10-18 00:33:12 -04:00
Arnaud Rebillout
0862ddf36d lxc-kali: Reduce diff with Debian
These bits were missing for no reason.

Signed-off-by: Arnaud Rebillout <arnaudr@kali.org>
2022-10-18 10:31:36 +07:00
Arnaud Rebillout
70ae901bdd lxc-kali: Fix incorrect use of basename instead of dirname
cf. ae96852bbb

Signed-off-by: Arnaud Rebillout <arnaudr@kali.org>
2022-10-18 10:31:36 +07:00
Arnaud Rebillout
da7b8e8bf3 lxc-kali: Update usage message for Kali
--release was not documented, --security-mirror is not supported.

Signed-off-by: Arnaud Rebillout <arnaudr@kali.org>
2022-10-18 10:31:32 +07:00
Stéphane Graber
97df54a56b
Merge pull request #47 from NiklausHofer/master
templates/lxc-gentoo.in: Propperly handle aarch64.
2022-07-02 00:26:43 -04:00
Niklaus 'vimja' Hofer
1792b8c0f3 templates/lxc-gentoo.in: Propperly handle aarch64.
Gentoo uses arm64 in the download path. See

  http://distfiles.gentoo.org/releases/arm64/autobuilds/
2022-07-01 23:48:30 +02:00
Stéphane Graber
ee5ca88668
Merge pull request #46 from 4oo4/master
Fix alpine lxc build
2022-06-08 00:38:53 -04:00
4oo4
2163a7e4e0
Update alpine keys URI - fix package verification
Alpine started using https://git.alpinelinux.org/aports/plain/main/alpine-keys/ to publish their apk keys as of 3.15, so using the old URI will give errors about signature verification since a required key is missing

Remove old key

Fix #43 - let lxc config create character devices

Creating lxc containers will error out when trying to create character devices with "file exists". This does not appear to be necessary for most of them since they get created when you actually start the container.

Signed-off-by: 4oo4 <4oo4@users.noreply.github.com>
2022-06-08 04:25:14 +00:00
Stéphane Graber
4765da8ef2
Merge pull request #44 from terceiro/debian-ports
lxc-debian: support debian-ports architectures
2022-04-10 12:29:19 -04:00
Antonio Terceiro
56a2d30c41 lxc-debian: avoid installing unauthenticated packages
--force-yes is deprecated, and is a shortcut for
--allow-unauthenticated, --allow-downgrades, --allow-remove-essential,
--allow-change-held-packages. --allow-unauthenticated is the only
likely to be needed here, so instead of allowing unauthenticated
packages, copy any custom keyring used inside the rootfs so any packages
we need to install are properly authenticated. The common case is
debian-ports-archive-keyring.

Signed-off-by: Antonio Terceiro <terceiro@debian.org>
2022-04-10 06:39:07 -03:00
Antonio Terceiro
4b041f1d18 configure.ac: generate lxc-* as executable
This allows them to be executed directly, and symlinked from
/usr/share/lxc/templates/ to the build directory for easier testing with
a system-installed lxc.

Signed-off-by: Antonio Terceiro <terceiro@debian.org>
2022-04-10 06:31:35 -03:00
Antonio Terceiro
5479240fbd lxc-debian: support unnoficial architectures out of the box
When trying to create containers for unnoficial Debian architectures,
use different defaults for mirror and keyring, install
debian-ports-archive-keyring, and default release to unstable. This way
one can create containers for unnoficial architectures without having to
pass several extra parameters.

Signed-off-by: Antonio Terceiro <terceiro@debian.org>
2022-04-10 06:31:35 -03:00
Antonio Terceiro
eebcd76feb lxc-debian: allow using a custom keyring
This makes it possible to create containers for unofficial
architectures such as the ones on ports.debian.org, by specifying a
custom mirror and its associated keyring.

Signed-off-by: Antonio Terceiro <terceiro@debian.org>
2022-04-10 06:31:32 -03:00
Stéphane Graber
8974b96a78
Merge pull request #42 from mbruzek/mbruzek_debian_security_distro_fix
Changed security distribution to ${release}-security.
2021-08-21 01:51:54 -04:00
Matthew Bruzek
4908a5e5fe Changed security distribution to ${release}-security.
Signed-off-by: Matthew Bruzek <mbruzek@gmail.com>
2021-08-20 23:25:40 -05:00
Christian Brauner
f17d9d03c6
Merge pull request #41 from tenforward/plamo_pkgtools8_fix
plamo: more fixes configuration process related to pkgtools8
2021-08-18 11:26:09 +02:00
KATOH Yasufumi
d9f1b169bc plamo: more fixes configuration process related to pkgtools8
The previous patch had incomplete support for pkgtools8.

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
2021-08-18 14:00:32 +09:00
Christian Brauner
8df214978b
Merge pull request #40 from tenforward/plamo_pkgtools8_fix
plamo: Fix configuration process related to pkgtools8
2021-08-17 14:05:42 +02:00
KATOH Yasufumi
da05bc38a6 plamo: Fix configuration process related to pkgtools8
Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
2021-08-17 20:19:29 +09:00
Christian Brauner
80ba0cbd87
Merge pull request #38 from tenforward/plamo_pkgtools8
plamo: Support new pkgtools8
2021-08-13 11:38:58 +02:00
KATOH Yasufumi
285eda0c49 plamo: Support new pkgtools8
pkgtool, that is package manager for plamo, has been updated. The
package name is changed to pkgtools8, and change installation process
to match pkgtools8.

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
2021-08-12 23:10:52 +09:00
Christian Brauner
32bc638e5e
Merge pull request #36 from TanyaEleventhGoddess/master
Changed devuan gpg key remote location
2020-09-06 22:24:11 +02:00
Tanya Degurechaff
8af77c1136 Changed devuan gpg key remote location
Signed-off-by: Tanya <34323200+TanyaEleventhGoddess@users.noreply.github.com>
2020-09-06 20:15:47 +02:00
Stéphane Graber
0aab971c60
Merge pull request #35 from tenforward/plamo
plamo: fix for current Plamo 7.x
2020-09-05 12:23:09 -04:00
KATOH Yasufumi
551f56b5d5 plamo: fix for current Plamo 7.x
* glibc is now initialized when a container is first started
* pkgtools7 is not initialized when a container is first started
* initpkg is not execute in lxc-plamo

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
2020-09-05 15:28:31 +09:00
Christian Brauner
a4b2383cd5
Merge pull request #34 from tenforward/plamo
plamo: Support current pkgtools
2020-09-03 11:03:48 +02:00
KATOH Yasufumi
4c11070332 plamo: Support current pkgtools
Our package manager "pkgtools" is updated, and renamed "pkgtools7".

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
2020-09-03 18:00:04 +09:00
Stéphane Graber
f841a6f7f1
Merge pull request #33 from TanyaEleventhGoddess/master
Fix indentation and correct issues with suite mismatch
2020-07-14 23:17:21 -04:00
Tanya Degurechaff
8678d4f836 Avoid failures if a mirror on https is selected
Signed-off-by: Tanya Degurechaff <34323200+TanyaEleventhGoddess@users.noreply.github.com>
2020-07-13 18:31:53 +02:00
Tanya Degurechaff
862a6098f0 Handle suite mismatch, don't download packages if update failed
Signed-off-by: Tanya Degurechaff <34323200+TanyaEleventhGoddess@users.noreply.github.com>
2020-07-13 18:29:08 +02:00
Tanya Degurechaff
92d4e109f1 Reformatting tabs and spaces in a coherent way
Signed-off-by: Tanya Degurechaff <34323200+TanyaEleventhGoddess@users.noreply.github.com>
2020-07-13 18:29:08 +02:00
Stéphane Graber
076cd7413d
Merge pull request #31 from TanyaEleventhGoddess/current
Improvements and bugfixes to templates/lxc-devuan.in and templates/lxc-kali.in
2020-07-07 08:36:43 -04:00
Stéphane Graber
997a85ae75
Merge pull request #32 from TanyaEleventhGoddess/devuan
Devuan LXC template
2020-07-07 08:34:58 -04:00
Tanya Degurechaff
118c8f4699 Handle languages that are only UTF-8 encoded
Co-authored-by: Pierre-Elliott Bécue <peb@debian.org>
Signed-off-by: Tanya Degurechaff <34323200+TanyaEleventhGoddess@users.noreply.github.com>
2020-07-07 09:52:41 +02:00
Tanya Degurechaff
f91a618e02 Avoid warning 'stdin not a tty' in some cases
Signed-off-by: Tanya Degurechaff <34323200+TanyaEleventhGoddess@users.noreply.github.com>
2020-07-07 09:52:41 +02:00
Tanya Degurechaff
c1552e32f2 Fix indentation
Signed-off-by: Tanya Degurechaff <34323200+TanyaEleventhGoddess@users.noreply.github.com>
2020-07-07 09:52:41 +02:00
Tanya Degurechaff
8911d8ff4b Fix timezone configuration
Signed-off-by: Tanya Degurechaff <34323200+TanyaEleventhGoddess@users.noreply.github.com>
2020-07-07 09:52:41 +02:00
Tanya Degurechaff
afa18e5a30 Force hostname inclusion in /etc/hosts
Signed-off-by: Tanya Degurechaff <34323200+TanyaEleventhGoddess@users.noreply.github.com>
2020-07-07 09:52:41 +02:00
Tanya Degurechaff
59e707a5ca Quotation marks makes you think it's a string
Signed-off-by: Tanya Degurechaff <34323200+TanyaEleventhGoddess@users.noreply.github.com>
2020-07-07 09:52:41 +02:00
Tanya Degurechaff
fc18b362d8 Added DOWNLOAD_KEYRING in usage
Signed-off-by: Tanya Degurechaff <34323200+TanyaEleventhGoddess@users.noreply.github.com>
2020-07-07 09:52:41 +02:00
Tanya Degurechaff
bd16f6b10c Added proper copyrights to fixes authors
Signed-off-by: Tanya Degurechaff <34323200+TanyaEleventhGoddess@users.noreply.github.com>
2020-07-07 09:52:41 +02:00
Tanya Degurechaff
52fa9b7360 Improved apt gpg management
Signed-off-by: Tanya Degurechaff <34323200+TanyaEleventhGoddess@users.noreply.github.com>
2020-07-07 09:52:41 +02:00
Tanya Degurechaff
10dc3b41f9 Added devuan and kali references to makefiles and fixed lxc-kali.in permissions
Signed-off-by: Tanya Degurechaff <34323200+TanyaEleventhGoddess@users.noreply.github.com>
2020-07-07 09:45:08 +02:00
Tanya Degurechaff
05a7be54fb Improved Devuan template
Signed-off-by: Tanya Degurechaff <34323200+TanyaEleventhGoddess@users.noreply.github.com>
2020-07-07 09:45:08 +02:00
Tanya Degurechaff
d43cb69eec Added basic devuan template
Signed-off-by: Tanya Degurechaff <34323200+TanyaEleventhGoddess@users.noreply.github.com>
2020-07-07 09:45:08 +02:00
Tanya Degurechaff
35b8225da6 Add common & userns Devuan LXC configs
Signed-off-by: Tanya Degurechaff <34323200+TanyaEleventhGoddess@users.noreply.github.com>
2020-07-07 09:45:08 +02:00