mirror of https://github.com/zulip/zulip.git
Revert "Make sure Vagrant works with SELinux enabled"
This reverts commit 5ad831fdf0
(part
of #2395).
This block is five years old and predates multiple Ubuntu upgrades and
our switch from LXC to Docker; now it reportedly breaks provisioning
on SELinux systems instead of fixing it.
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
parent
1432067959
commit
c5cfce73cb
|
@ -158,12 +158,6 @@ sudo dpkg --purge landscape-client landscape-common ubuntu-release-upgrader-core
|
||||||
sudo dpkg-divert --add --rename /etc/default/motd-news
|
sudo dpkg-divert --add --rename /etc/default/motd-news
|
||||||
sudo sh -c 'echo ENABLED=0 > /etc/default/motd-news'
|
sudo sh -c 'echo ENABLED=0 > /etc/default/motd-news'
|
||||||
|
|
||||||
# If the host is running SELinux remount the /sys/fs/selinux directory as read only,
|
|
||||||
# needed for apt-get to work.
|
|
||||||
if [ -d "/sys/fs/selinux" ]; then
|
|
||||||
sudo mount -o remount,ro /sys/fs/selinux
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Set default locale, this prevents errors if the user has another locale set.
|
# Set default locale, this prevents errors if the user has another locale set.
|
||||||
if ! grep -q 'LC_ALL=en_US.UTF-8' /etc/default/locale; then
|
if ! grep -q 'LC_ALL=en_US.UTF-8' /etc/default/locale; then
|
||||||
echo "LC_ALL=en_US.UTF-8" | sudo tee -a /etc/default/locale
|
echo "LC_ALL=en_US.UTF-8" | sudo tee -a /etc/default/locale
|
||||||
|
|
Loading…
Reference in New Issue