From 24a8a430779539d0be840b7ad8a3958ec02612a0 Mon Sep 17 00:00:00 2001
From: Daniil Baturin <daniil@baturin.org>
Date: Sun, 24 Jan 2016 13:34:15 -0500
Subject: [PATCH] Keep all common live-build config data in
 data/live-build-config If more granular data modification is needed, it can
 be stored in other data/ subdirs.

---
 Makefile                                                       | 3 +--
 data/{ => live-build-config}/includes.chroot/etc/fuse.conf     | 0
 .../includes.chroot/opt/vyatta/etc/config.boot.default         | 0
 .../package-lists}/vyos-base.list.chroot                       | 0
 .../package-lists}/vyos-utils.list.chroot                      | 0
 5 files changed, 1 insertion(+), 2 deletions(-)
 rename data/{ => live-build-config}/includes.chroot/etc/fuse.conf (100%)
 rename data/{ => live-build-config}/includes.chroot/opt/vyatta/etc/config.boot.default (100%)
 rename data/{package-lists/common => live-build-config/package-lists}/vyos-base.list.chroot (100%)
 rename data/{package-lists/common => live-build-config/package-lists}/vyos-utils.list.chroot (100%)

diff --git a/Makefile b/Makefile
index 244229d2..0c6d7b5a 100644
--- a/Makefile
+++ b/Makefile
@@ -13,8 +13,7 @@ prepare:
 	@scripts/check-config
 
 	@scripts/live-build-config
-	cp -r data/includes.chroot/* build/config/includes.chroot/
-	cp -r data/package-lists/common/* build/config/package-lists/
+	cp -r data/live-build-config/* build/config/
 
 .PHONY: iso
 .ONESHELL:
diff --git a/data/includes.chroot/etc/fuse.conf b/data/live-build-config/includes.chroot/etc/fuse.conf
similarity index 100%
rename from data/includes.chroot/etc/fuse.conf
rename to data/live-build-config/includes.chroot/etc/fuse.conf
diff --git a/data/includes.chroot/opt/vyatta/etc/config.boot.default b/data/live-build-config/includes.chroot/opt/vyatta/etc/config.boot.default
similarity index 100%
rename from data/includes.chroot/opt/vyatta/etc/config.boot.default
rename to data/live-build-config/includes.chroot/opt/vyatta/etc/config.boot.default
diff --git a/data/package-lists/common/vyos-base.list.chroot b/data/live-build-config/package-lists/vyos-base.list.chroot
similarity index 100%
rename from data/package-lists/common/vyos-base.list.chroot
rename to data/live-build-config/package-lists/vyos-base.list.chroot
diff --git a/data/package-lists/common/vyos-utils.list.chroot b/data/live-build-config/package-lists/vyos-utils.list.chroot
similarity index 100%
rename from data/package-lists/common/vyos-utils.list.chroot
rename to data/live-build-config/package-lists/vyos-utils.list.chroot