From 466f6278529f4a2d2e24c0bc5689fc75f4b52b06 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Sun, 15 Apr 2018 20:24:19 -0400
Subject: [PATCH] Fix gentoo

It didn't work from within vagrant. Now it does.
---
 common/prepare-vagrant-user.sh | 26 ++++++++------------------
 conf/gentoo                    |  5 +++++
 gentoo/install-packages.sh     |  6 ++++--
 mk-gentoo.sh                   |  6 +++---
 4 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/common/prepare-vagrant-user.sh b/common/prepare-vagrant-user.sh
index 2a82eba..b41c14a 100755
--- a/common/prepare-vagrant-user.sh
+++ b/common/prepare-vagrant-user.sh
@@ -22,27 +22,17 @@ elif [ ${DISTRIBUTION} = 'centos' -o ${DISTRIBUTION} = 'fedora' ]; then
 else
   echo 'Creating vagrant user...'
   useradd --create-home -s /bin/bash vagrant
-  adduser vagrant sudo || useradd vagrant
   echo -n 'vagrant:vagrant' | chpasswd
 fi
 
 # Configure SSH access
-if [ -d /home/vagrant/.ssh ]; then
-  echo 'Skipping vagrant SSH credentials configuration'
-else
-  echo 'SSH key has not been set'
-  mkdir -p /home/vagrant/.ssh
-  echo $VAGRANT_KEY > /home/vagrant/.ssh/authorized_keys
-  chown -R vagrant: /home/vagrant/.ssh
-  echo 'SSH credentials configured for the vagrant user.'
-fi
+mkdir -p /home/vagrant/.ssh
+echo $VAGRANT_KEY > /home/vagrant/.ssh/authorized_keys
+chown -R vagrant /home/vagrant/.ssh
+chmod +x /home/vagrant/.ssh
+echo 'SSH credentials configured for the vagrant user.'
 
 # Enable passwordless sudo for the vagrant user
-if [ -f /etc/sudoers.d/vagrant ]; then
-  echo 'Skipping sudoers file creation.'
-else
-  echo 'Sudoers file was not found'
-  echo "vagrant ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/vagrant
-  chmod 0440 /etc/sudoers.d/vagrant
-  echo 'Sudoers file created.'
-fi
+echo "vagrant ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/vagrant
+chmod 0440 /etc/sudoers.d/vagrant
+echo 'Sudoers file created.'
diff --git a/conf/gentoo b/conf/gentoo
index e69de29..f57e8cc 100644
--- a/conf/gentoo
+++ b/conf/gentoo
@@ -0,0 +1,5 @@
+lxc.mount.auto = cgroup:mixed proc:mixed sys:mixed
+
+# Default console settings
+lxc.tty = 4
+lxc.pts = 1024
diff --git a/gentoo/install-packages.sh b/gentoo/install-packages.sh
index 33bed85..4a3d058 100755
--- a/gentoo/install-packages.sh
+++ b/gentoo/install-packages.sh
@@ -5,7 +5,7 @@ source /etc/profile
 
 echo 'Installing packages and upgrading'
 
-PACKAGES=(vim net-misc/curl wget man-db openssh bash-completion ca-certificates sudo)
+PACKAGES=(net-misc/curl wget man-db openssh ca-certificates sudo)
 
 echo "Installing additional packages: ${ADDPACKAGES}"
 PACKAGES+=" ${ADDPACKAGES}"
@@ -32,8 +32,10 @@ if [[ $SALT = 1 ]]; then
 fi
 
 # trying to set capabilities on an unprivileged container fails.
-echo "net-misc/iputils -filecaps" > /etc/portage/package.use/vagrant_overrides
+echo "*/* -filecaps" > /etc/portage/package.use/vagrant_overrides
 
 emerge --sync
 emerge --noreplace ${PACKAGES[*]}
 emerge -uND @world
+
+rc-config add sshd default
diff --git a/mk-gentoo.sh b/mk-gentoo.sh
index 4bf1704..9692b32 100755
--- a/mk-gentoo.sh
+++ b/mk-gentoo.sh
@@ -30,9 +30,9 @@ SECS=15
 log "Sleeping for $SECS seconds..."
 sleep $SECS
 
-#utils.lxc.runscript gentoo/install-packages.sh
-#utils.lxc.runscript common/prepare-vagrant-user.sh
-#utils.lxc.runscript gentoo/clean.sh
+utils.lxc.runscript gentoo/install-packages.sh
+utils.lxc.runscript common/prepare-vagrant-user.sh
+utils.lxc.runscript gentoo/clean.sh
 utils.lxc.stop
 
 ./common/package.sh