diff options
| author | Daniil Baturin <daniil@baturin.org> | 2016-01-24 13:34:15 -0500 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2016-01-24 13:34:15 -0500 |
| commit | 24a8a430779539d0be840b7ad8a3958ec02612a0 (patch) | |
| tree | 01eacd8cc0530772b66be76d58180de8619f6cf5 | |
| parent | 2f10d39a98eb4815e4b2d677e210febeed45b7ca (diff) | |
| download | vyos-build-24a8a430779539d0be840b7ad8a3958ec02612a0.tar.gz vyos-build-24a8a430779539d0be840b7ad8a3958ec02612a0.zip | |
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.
| -rw-r--r-- | Makefile | 3 | ||||
| -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
@@ -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 |