From 20ba0ce5f71c980f1d7348c88ec0280b3536ecbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?=
 =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= <mh@calculate.ru>
Date: Tue, 19 Oct 2010 18:48:35 +0400
Subject: [PATCH] Add templates for second applying for assembling system.

---
 assemble/prepare/etc/make.conf            | 4 ++--
 assemble/prepare/etc/resolv.conf          | 1 +
 assemble/prepare/tmp/.calculate_directory | 1 +
 assemble/setup/.calculate_directory       | 1 +
 assemble/setup/etc/etc-update.conf        | 4 ++++
 assemble/setup/etc/make.conf              | 6 ++++++
 6 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 assemble/prepare/etc/resolv.conf
 create mode 100644 assemble/prepare/tmp/.calculate_directory
 create mode 100644 assemble/setup/.calculate_directory
 create mode 100644 assemble/setup/etc/etc-update.conf
 create mode 100644 assemble/setup/etc/make.conf

diff --git a/assemble/prepare/etc/make.conf b/assemble/prepare/etc/make.conf
index 5eb4f1b..de50830 100644
--- a/assemble/prepare/etc/make.conf
+++ b/assemble/prepare/etc/make.conf
@@ -1,8 +1,8 @@
-# Calculate
+# Calculate comment=#
 ACCEPT_LICENSE="*"
 #?pkg(app-portage/layman)!=#
 source /var/lib/layman/make.conf
 #pkg#
-MAKEOPTS="#-os_install_makeopts-#"
+MAKEOPTS="#-os_assemble_makeopts-#"
 EMERGE_DEFAULT_OPTS="--jobs=4"
 
diff --git a/assemble/prepare/etc/resolv.conf b/assemble/prepare/etc/resolv.conf
new file mode 100644
index 0000000..b4232af
--- /dev/null
+++ b/assemble/prepare/etc/resolv.conf
@@ -0,0 +1 @@
+# Calculate link=../../../etc/resolv.conf mirror
diff --git a/assemble/prepare/tmp/.calculate_directory b/assemble/prepare/tmp/.calculate_directory
new file mode 100644
index 0000000..0b37922
--- /dev/null
+++ b/assemble/prepare/tmp/.calculate_directory
@@ -0,0 +1 @@
+# Calculate path=/var/calculate/tmp
diff --git a/assemble/setup/.calculate_directory b/assemble/setup/.calculate_directory
new file mode 100644
index 0000000..4beb45c
--- /dev/null
+++ b/assemble/setup/.calculate_directory
@@ -0,0 +1 @@
+# Calculate append=skip cl_assemble_setup_action==up
diff --git a/assemble/setup/etc/etc-update.conf b/assemble/setup/etc/etc-update.conf
new file mode 100644
index 0000000..6bffe0f
--- /dev/null
+++ b/assemble/setup/etc/etc-update.conf
@@ -0,0 +1,4 @@
+# Calculate format=procmail
+# arguments used whenever mv is called
+mv_opts=""
+
diff --git a/assemble/setup/etc/make.conf b/assemble/setup/etc/make.conf
new file mode 100644
index 0000000..1561c23
--- /dev/null
+++ b/assemble/setup/etc/make.conf
@@ -0,0 +1,6 @@
+# Calculate comment=#
+ACCEPT_LICENSE="*"
+source /var/lib/layman/make.conf
+MAKEOPTS="#-os_assemble_makeopts-#"
+EMERGE_DEFAULT_OPTS="--jobs=4"
+