Commit graph

69 commits

Author SHA1 Message Date
Eric Keller
61ac850ba0 fix integer comparison 2015-12-21 12:58:50 +01:00
Michael Adam
63005dffeb Merge pull request #4 from erickeller/force_link
force symbolic link to /sbin/modprobe
2015-12-21 12:43:55 +01:00
Eric Keller
6f33140974 force symbolic link to /sbin/modprobe 2015-12-21 12:30:46 +01:00
Michael Adam
93d29d107c Merge pull request #1 from erickeller/fix_typo_log
fix redirection typo to ${LOG}
2015-12-21 07:42:07 +01:00
Eric Keller
24c3d73a53 fix redirection typo to ${LOG}
This commit fixes the redirection of std error to the ${LOG} file.
It was starting all lxc command in background, resulting in unpredictable failures.
2015-12-15 17:41:59 +01:00
Michael Adam
df5f7ba2f6 Merge remote-tracking branch 'origin/master' 2015-12-07 15:00:37 +01:00
Fabio Rehm
a8bac11f2e Merge pull request #41 from obnoxxx/pr-readme
Mention maintained fork by oboxxx in README.
2015-12-07 10:36:37 -02:00
Michael Adam
5cd378a99e Update README with newly supported distros/versions. 2015-12-07 10:44:06 +01:00
Michael Adam
1735eb5958 README: mention obnoxxx' fork as maintained.
Signed-off-by: Michael Adam <obnox@samba.org>
2015-12-07 10:44:06 +01:00
Michael Adam
45557e412d fedora: add support for fedora 23
Signed-off-by: Michael Adam <obnox@samba.org>
2015-12-07 10:44:06 +01:00
Michael Adam
29dc6ed60b fedora: add support for fedora 22
Signed-off-by: Michael Adam <obnox@samba.org>
2015-12-07 10:44:06 +01:00
Michael Adam
c8c0a53835 fedora: add support for rawhide.
This assumes that the lxc-fedora template knows how
to deal with "rawhide".
2015-12-07 10:44:06 +01:00
Michael Adam
4303dc0c3f ubuntu: Add support for vivid 2015-12-07 10:44:06 +01:00
Michael Adam
381fafc041 improve systemd preparations: remove /dev/kmsg inside the container
This is to cope with containers that have been created
not systemd-aware.
2015-12-07 10:44:06 +01:00
Michael Adam
76cbb0fc89 debian: fix jessie lxc config to support systemd
The lxc-debian template aready does this, but apparently
the download template does not. We need to adapt the config
for installation as well as provide a version-specific config
for packaging the box.
2015-12-07 10:44:06 +01:00
Michael Adam
022112d019 Support having version-specific lxc-config as conf/${DISTRIBUTION}-${RELEASE}
if present, this is used, otherwise conf/${DISTRIBUTION} as before.
2015-12-07 10:44:06 +01:00
Michael Adam
e84c681e38 fedora: add option MASK_TMP to prevent overmounting /tmp with tmpfs
this is important for use with vagrant-cachier
2015-12-07 10:44:06 +01:00
Michael Adam
6e382c156c fedora: support fedora 21.
The download template doesn't have f21 (yet).
So use fedora template for lxc-create.

Signed-off-by: Michael Adam <obnox@samba.org>
2015-12-07 10:44:06 +01:00
Michael Adam
d3705133a9 fedora: don't drop the sys_nice capability to support running ctdb 2015-12-07 10:44:06 +01:00
Michael Adam
6bfbe0e8d7 Add support to set up fedora boxes.
Currently only f20 and f19 are provided by the lxc-download template,
not f21.
2015-12-07 10:44:06 +01:00
Michael Adam
08d43ba233 Fix indentation in Makefile. 2015-12-07 10:44:06 +01:00
Michael Adam
d4d45b83be centos: install openssh-server
without it, "vagrant up" fails.
2015-12-07 10:44:06 +01:00
Michael Adam
10f4e31251 centos: install the EPEL repository and bash-completion if EPEL=1 2015-12-07 10:44:06 +01:00
Michael Adam
ea5bcc5080 centos: nfs-common does not exist and I don't want to install nfs server 2015-12-07 10:44:06 +01:00
Michael Adam
1b3da2b910 centos: bash-completion does not exist in plain centos 2015-12-07 10:44:06 +01:00
Michael Adam
ea1f9efb26 centos: package python-software-properties does not exist here
And I don't know a package to provide the same classes.
2015-12-07 10:44:06 +01:00
Michael Adam
3b7802e29f centos: on centos, the package is "man", not "man-db". 2015-12-07 10:44:06 +01:00
Michael Adam
cdbae4317d centos: sleep for 20 instead of 10 seconds...
Somehow bringing up the network takes longer on my fedora host.
Possibly related to some integration / registration with systemd.
2015-12-07 10:44:06 +01:00
Michael Adam
0e382b9a3d Support building Ubuntu 14.10 (utopic) boxes. 2015-12-07 10:44:06 +01:00
Michael Adam
930c62a302 debian: On my fedora host, I need more seconds for my network to have come up.
This might to be due to some registration with systemd.
2015-12-07 10:44:06 +01:00
Fabio Rehm
1aee834070 Merge pull request #30 from scmcoord/docker-on-centos-7
Allow centos 7 image to run docker.
2015-12-06 19:44:32 -02:00
Fabio Rehm
490f5ed93e Merge pull request #34 from rezonanc/bindfs_fix
Create fuse device to use bindfs
2015-12-06 19:42:57 -02:00
Fabio Rehm
58131e1493 Merge pull request #31 from fanyeren/patch-1
Update utils.sh
2015-12-06 19:37:55 -02:00
Fabio Rehm
d3746b2d8a Merge pull request #37 from glenux/master
Added missing openssh server package. Needed by vagrant up & vagrant ssh.
2015-12-06 19:33:59 -02:00
Fabio Rehm
4d0f38fa1f Merge pull request #38 from glenux/feature/fix-lxc-systemd-incompatibilities
Prevent systemd-journald from burning 100% of CPU.
2015-12-06 19:33:21 -02:00
Fabio Rehm
08d76a8ce6 Merge pull request #39 from glenux/feature/add-vagrantcloud-link-to-debian-jessie
Add link to Debian Jessie box in README file.
2015-12-06 19:32:24 -02:00
Fabio Rehm
06532f6aa1 Update README.md 2015-12-06 19:30:31 -02:00
92f07885c9 Add link to Debian Jessie box in README file. 2015-07-14 17:24:53 +02:00
0a5f5efdd8 Prevent systemd-journald from burning 100% of CPU. 2015-07-14 17:19:22 +02:00
a1e8149ad6 Prevent systemd-journald from burning 100% of CPU. 2015-07-14 17:12:21 +02:00
1d0535a420 Add missing openssh server package. Needed by vagrant up & vagrant ssh. 2015-07-14 15:51:48 +02:00
Fabio Rehm
f22a5c21d8 Fix CentOS 6 box references
Closes GH-33
2015-05-08 19:37:44 -03:00
Edvinas Aleksejonokas
82d2f2c278 Create fuse device to use bindfs
BindFS requires fuse access in order to proceed with the mount. To get
fuse access bindfs needs '/dev/fuse' to exist.
When BindFS is used through vagrant and vagrant-bindfs plugin it tries
to use modprobe to load fuse module, but this is impossible because
loading of kernel modules is not possible inside lxc. Be aware that
fuse kernel module must be loaded on the host machine.
2015-04-16 12:52:46 +03:00
有张纸
b0cb4fe798 Update utils.sh
fix "syntax error near unexpected token `>'"
2015-03-06 15:45:04 +08:00
Per Johansson
afeb95136c Allow centos 7 image to run docker. 2015-03-02 08:29:59 -05:00
Fabio Rehm
dae3cd5031 Merge pull request #20 from tuminoid/patch-1
Remove extraneous install argument from yum
2014-12-01 14:53:47 -02:00
Tuomo Tanskanen
2d5abdfc2d Remove extraneous install argument from yum
Yum has an extra "install" in the command line in "install-extras.sh". It is intepreted as a package name, but luckily just ignored.
2014-11-04 14:30:03 +02:00
Fabio Rehm
5a65b189d8 Mention CentOS 6 on readme 2014-09-24 12:51:10 -03:00
Fabio Rehm
4546b8e9db Update centos packages before installing new ones 2014-09-24 12:40:53 -03:00
Fabio Rehm
a814d9424a CentOS scripts 2014-09-24 12:16:20 -03:00