From d0e95fa1219236b013311a7d2df7585340be7142 Mon Sep 17 00:00:00 2001
From: Regna <ki@bakka.su>
Date: Mon, 25 Apr 2016 15:09:11 +0300
Subject: [PATCH] /etc/portage/env/ has been added.

---
 sls/gentoo/portage.sls | 8 ++++++++
 sls/xen/init.sls       | 9 ++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/sls/gentoo/portage.sls b/sls/gentoo/portage.sls
index b49504a..d8b417e 100644
--- a/sls/gentoo/portage.sls
+++ b/sls/gentoo/portage.sls
@@ -73,3 +73,11 @@ emerge-changed-use:
     - mode: 755
     - user: root
     - group: root
+
+/etc/portage/env/:
+  file.directory:
+    - create: True
+    - mode: 755
+    - user: root
+    - group: root
+
diff --git a/sls/xen/init.sls b/sls/xen/init.sls
index ba3b2ce..c544c54 100644
--- a/sls/xen/init.sls
+++ b/sls/xen/init.sls
@@ -1,4 +1,7 @@
 # -*- mode: yaml -*-
+include:
+  - gentoo.portage
+
 {% set xen_provided = salt['grains.get']('xen_provided', False) %}
 {% set efi = salt['grains.get']('efi', False) %}
 /etc/portage/env/xen-install-mask:
@@ -8,6 +11,8 @@
     - mode: 644
     - contents: |
         INSTALL_MASK='/boot/xen.gz /boot/xen-4.gz /boot/xen-4.6.gz'
+    - require:
+      - file: /etc/portage/env/
 
 xen:
   portage_config.flags:
@@ -15,6 +20,8 @@ xen:
     - use: [{{ 'efi' if efi else '-efi' }}]
     - env:
       - xen-install-mask
+    - require:
+      - file: /etc/portage/env/xen-install-mask
   pkg.installed:
     - pkgs:
       {% if not xen_provided %}
@@ -24,8 +31,8 @@ xen:
       - app-emulation/qemu: "[xen,numa,nfs,xfs]"
       - dev-libs/libnl
     - require:
-      - file: unmask-hvm
       - portage_config: xen
+      - file: unmask-hvm
       {% if xen_provided %}
       - file: xen-provided
       {% endif %}