diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2017-03-14 17:56:07 +0100 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2017-03-14 17:59:52 +0100 |
| commit | 106e01120b70de146cd0a174547f28fa85f432f9 (patch) | |
| tree | 09dc835508ea91425556e2fead92bbac77163285 /main/lxc/alpine-default-repos.patch | |
| parent | 40b4d47218c385db9d903b880d27a72043372860 (diff) | |
| download | aports-106e01120b70de146cd0a174547f28fa85f432f9.tar.bz2 aports-106e01120b70de146cd0a174547f28fa85f432f9.tar.xz | |
main/lxc: backport upstream patches for alpine template
Diffstat (limited to 'main/lxc/alpine-default-repos.patch')
| -rw-r--r-- | main/lxc/alpine-default-repos.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/main/lxc/alpine-default-repos.patch b/main/lxc/alpine-default-repos.patch new file mode 100644 index 0000000000..a1f03ab3a8 --- /dev/null +++ b/main/lxc/alpine-default-repos.patch @@ -0,0 +1,37 @@ +From 288142218ae6cc24bf084fdd5768ad2c83086fb1 Mon Sep 17 00:00:00 2001 +From: Jakub Jirutka <jakub@jirutka.cz> +Date: Tue, 14 Mar 2017 17:28:47 +0100 +Subject: [PATCH 1/2] lxc-alpine: add community repository to default + repositories + +Signed-off-by: Jakub Jirutka <jakub@jirutka.cz> +Upstream-Issue: https://github.com/lxc/lxc/pull/1461 +--- + templates/lxc-alpine.in | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/templates/lxc-alpine.in b/templates/lxc-alpine.in +index 06616b3..fd281f8 100644 +--- a/templates/lxc-alpine.in ++++ b/templates/lxc-alpine.in +@@ -236,7 +236,6 @@ install() { + local branch="$3" + local extra_packages="$4" + local apk_cache="$LXC_CACHE_DIR/apk/$arch" +- local repo_url="$MIRROR_URL/$branch/main" + + if [ "$FLUSH_CACHE" = 'yes' ] && [ -d "$apk_cache" ]; then + einfo "Cleaning cached APK packages for $arch" +@@ -249,7 +248,10 @@ install() { + + mkdir -p etc/apk + ln -s "$apk_cache" etc/apk/cache +- echo "$repo_url" > etc/apk/repositories ++ ++ local repo; for repo in main community; do ++ echo "$MIRROR_URL/$branch/$repo" >> etc/apk/repositories ++ done + + install_packages "$arch" "alpine-base $extra_packages" + make_dev_nodes + |