summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile3
-rw-r--r--data/live-build-config/includes.chroot/etc/fuse.conf (renamed from data/includes.chroot/etc/fuse.conf)0
-rw-r--r--data/live-build-config/includes.chroot/opt/vyatta/etc/config.boot.default (renamed from data/includes.chroot/opt/vyatta/etc/config.boot.default)0
-rw-r--r--data/live-build-config/package-lists/vyos-base.list.chroot (renamed from data/package-lists/common/vyos-base.list.chroot)0
-rw-r--r--data/live-build-config/package-lists/vyos-utils.list.chroot (renamed from data/package-lists/common/vyos-utils.list.chroot)0
5 files changed, 1 insertions, 2 deletions
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
index a439ab82..a439ab82 100644
--- a/data/includes.chroot/etc/fuse.conf
+++ b/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
index f5ec2b5d..f5ec2b5d 100644
--- a/data/includes.chroot/opt/vyatta/etc/config.boot.default
+++ b/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
index 6e5c1122..6e5c1122 100644
--- a/data/package-lists/common/vyos-base.list.chroot
+++ b/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
index 3d1a3b2a..3d1a3b2a 100644
--- a/data/package-lists/common/vyos-utils.list.chroot
+++ b/data/live-build-config/package-lists/vyos-utils.list.chroot