diff options
| author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2014-01-26 09:27:22 +0200 |
|---|---|---|
| committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2014-01-26 09:27:22 +0200 |
| commit | fce7c18a3d8dd3661ba1a5fe456ed01f380d4928 (patch) | |
| tree | 5c36d22a8fd3816fd0363ca99383391d3606e3ca /main/lxc | |
| parent | 87dbd11393ca6f898bc7e1bff0ceb7496c5e1c29 (diff) | |
main/lxc: lxc-alpine: copy /etc/TZ to container if present
Diffstat (limited to 'main/lxc')
| -rw-r--r-- | main/lxc/0001-lxc-alpine-copy-etc-TZ-to-container-if-present.patch | 29 | ||||
| -rw-r--r-- | main/lxc/APKBUILD | 6 |
2 files changed, 34 insertions, 1 deletions
diff --git a/main/lxc/0001-lxc-alpine-copy-etc-TZ-to-container-if-present.patch b/main/lxc/0001-lxc-alpine-copy-etc-TZ-to-container-if-present.patch new file mode 100644 index 00000000000..5ea417db5c0 --- /dev/null +++ b/main/lxc/0001-lxc-alpine-copy-etc-TZ-to-container-if-present.patch @@ -0,0 +1,29 @@ +From e4a08b5ec1798c6c2fcf129018f666148aeedf8b Mon Sep 17 00:00:00 2001 +From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> +Date: Sat, 25 Jan 2014 22:58:58 +0200 +Subject: [PATCH] lxc-alpine: copy /etc/TZ to container if present + +Signed-off-by: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> +--- + templates/lxc-alpine.in | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/templates/lxc-alpine.in b/templates/lxc-alpine.in +index ac328a4..50a6a71 100644 +--- a/templates/lxc-alpine.in ++++ b/templates/lxc-alpine.in +@@ -109,6 +109,11 @@ tty4:12345:respawn:/sbin/getty 38400 tty4 + ::ctrlaltdel:/sbin/reboot + ::shutdown:/sbin/rc shutdown + EOF ++ # set up timezone ++ if [ -f /etc/TZ ]; then ++ cp /etc/TZ "$rootfs/etc/TZ" ++ fi ++ + # set up nameserver + grep nameserver /etc/resolv.conf > "$rootfs/etc/resolv.conf" + +-- +1.8.3.1 + diff --git a/main/lxc/APKBUILD b/main/lxc/APKBUILD index 6ebcc6565e4..37158056369 100644 --- a/main/lxc/APKBUILD +++ b/main/lxc/APKBUILD @@ -3,7 +3,7 @@ pkgname=lxc pkgver=0.9.0 _mypkgver=${pkgver/_rc/-rc} -pkgrel=6 +pkgrel=7 pkgdesc="linux containers - tools" url="http://lxc.sourceforge.net/" arch="all" @@ -25,6 +25,7 @@ source="http://linuxcontainers.org/downloads/lxc-$_mypkgver.tar.gz 0001-lxc-alpine-enable-4-consoles-by-default.patch 0001-lxc-alpine-enable-loopback-interface-by-default.patch 0001-lxc-alpine-run-bootmisc-and-syslog-at-boot-runlevel.patch + 0001-lxc-alpine-copy-etc-TZ-to-container-if-present.patch lxc-fix-headers.patch lxc.initd @@ -74,6 +75,7 @@ ee3339a1c5d388b65b24bdea924387a8 0001-lxc-alpine-allow-dev-full.patch c12ea194274b6c8d3b05bd43ed70c61d 0001-lxc-alpine-enable-4-consoles-by-default.patch 999a89373f5e2c61d1369526de7e5850 0001-lxc-alpine-enable-loopback-interface-by-default.patch 75979789ec45ef865895f5ce5721dd3e 0001-lxc-alpine-run-bootmisc-and-syslog-at-boot-runlevel.patch +6c188f8dd2ba18e895eed2dec79fcab9 0001-lxc-alpine-copy-etc-TZ-to-container-if-present.patch 24e7ae51da3c8c483d5228b821cc7244 lxc-fix-headers.patch 9f780f761dcaec3ce40d083c6df044d4 lxc.initd" sha256sums="1e1767eae6cc5fbf892c0e193d25da420ba19f2db203716c38f7cdea3b654120 lxc-0.9.0.tar.gz @@ -87,6 +89,7 @@ df193c4cf08e171c23b0b472750b7b1e0e7a66971c03201a0523e4039909f33b alpine-templat 264cbc4efe6983050b3043fb4df031c4d9b93d35eb3c02463bddf530f8701880 0001-lxc-alpine-enable-4-consoles-by-default.patch eb5043672ef81cd5b20f25dc847bfad7e9e14b42a794856c3a8c8c1e4e408dfc 0001-lxc-alpine-enable-loopback-interface-by-default.patch 51bd2fc5f166499c8996d1b89f324168b0c1bbb6b2b79260591d442120098a34 0001-lxc-alpine-run-bootmisc-and-syslog-at-boot-runlevel.patch +92d7f479d8d466e03f187076a1187112a116f3a37426ba6d1dfd87ed7999c4c8 0001-lxc-alpine-copy-etc-TZ-to-container-if-present.patch 82d584e30b1963bd638b5a640b2788d8ac3757b480f61fd2ab55a09b9a6f4ccd lxc-fix-headers.patch 8bdb64ecf100b648396456f6765230aab8649665bfcf320baede529ce6c5484d lxc.initd" sha512sums="a96133660ca6ea45dc4b8d167267120328577339e933ff9510f03e9d368ca5db77031dc1e7e4529b3e506f63f79c2ce3f8f72571a7dfdbeb2a8799777782a606 lxc-0.9.0.tar.gz @@ -100,5 +103,6 @@ dd686d8ce9cd73807b744163e6b20e41eca17f3ee618cef66f19488cb2527b56d38c04231d25177d 372490dc5a459778e97b75691ed48b2c070c0a9b16f08c7f5ef3a791ded64fe5f23ca1e145314fea355664a2b055eb572546dd0793560137baae0898184c9e19 0001-lxc-alpine-enable-4-consoles-by-default.patch 47d31ed9d0cdde58b0ee97b3f179db270534b73fe8c77fe72fdef1483a545e608a533d41e8b4041474493016cd445fe02751663ad0cbc7fc9af241b344454dea 0001-lxc-alpine-enable-loopback-interface-by-default.patch 75130578c4103586b973c6e9586833acfa89de8021f4dd320385905c4f9d3d1bf7a1e8d3cfe8704a3add00d41d19c30a371bce232a863e9c837a148e9066a0d6 0001-lxc-alpine-run-bootmisc-and-syslog-at-boot-runlevel.patch +7c5e6656565ed0ec51449baab4d310520cc43805428515d6541d4c4e03cc2f44b6762b3239983ee06596dcdec68d395250f944aabe92afc91ba2432f4847555b 0001-lxc-alpine-copy-etc-TZ-to-container-if-present.patch 2c4138e57021714d66bd4d30cfedd768965a0ec11776363b83db7d4efa8c06901c42ee1ad13dff68fd8e3e6a1c34034c529c1f8995d9d3a57a318bc7023fbc05 lxc-fix-headers.patch e3aa39c60db6ba73cbe3fcb27170dd83a03a0a175d8a28513f242a81eef5cb0e90b78dc63fc8da5c7160e60bc780111679fd6d0e401a0d6626e574c328c5afb0 lxc.initd" |