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: 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/includes.chroot/etc/fuse.conf                 |  1 -
 .../opt/vyatta/etc/config.boot.default             | 39 ----------------------
 .../includes.chroot/etc/fuse.conf                  |  1 +
 .../opt/vyatta/etc/config.boot.default             | 39 ++++++++++++++++++++++
 .../package-lists/vyos-base.list.chroot            |  3 ++
 .../package-lists/vyos-utils.list.chroot           | 10 ++++++
 data/package-lists/common/vyos-base.list.chroot    |  3 --
 data/package-lists/common/vyos-utils.list.chroot   | 10 ------
 9 files changed, 54 insertions(+), 55 deletions(-)
 delete mode 100644 data/includes.chroot/etc/fuse.conf
 delete mode 100644 data/includes.chroot/opt/vyatta/etc/config.boot.default
 create mode 100644 data/live-build-config/includes.chroot/etc/fuse.conf
 create mode 100644 data/live-build-config/includes.chroot/opt/vyatta/etc/config.boot.default
 create mode 100644 data/live-build-config/package-lists/vyos-base.list.chroot
 create mode 100644 data/live-build-config/package-lists/vyos-utils.list.chroot
 delete mode 100644 data/package-lists/common/vyos-base.list.chroot
 delete mode 100644 data/package-lists/common/vyos-utils.list.chroot

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/includes.chroot/etc/fuse.conf
deleted file mode 100644
index a439ab82..00000000
--- a/data/includes.chroot/etc/fuse.conf
+++ /dev/null
@@ -1 +0,0 @@
-user_allow_other
diff --git a/data/includes.chroot/opt/vyatta/etc/config.boot.default b/data/includes.chroot/opt/vyatta/etc/config.boot.default
deleted file mode 100644
index f5ec2b5d..00000000
--- a/data/includes.chroot/opt/vyatta/etc/config.boot.default
+++ /dev/null
@@ -1,39 +0,0 @@
-system {
-    login {
-        user vyos {
-            authentication {
-                encrypted-password $6$QxPS.uk6mfo$9QBSo8u1FkH16gMyAVhus6fU3LOzvLR9Z9.82m3tiHFAxTtIkhaZSWssSgzt4v4dGAL8rhVQxTg0oAG9/q11h/
-                plaintext-password ""
-            }
-            level admin
-        }
-    }
-    syslog {
-        global {
-            facility all {
-                level notice
-            }
-            facility protocols {
-                level debug
-            }
-        }
-    }
-    ntp {
-        server "0.pool.ntp.org"
-        server "1.pool.ntp.org"
-        server "2.pool.ntp.org"
-    }
-    console {
-        device ttyS0 {
-            speed 9600
-        }
-    }
-    config-management {
-        commit-revisions 100
-    }
-}
-
-interfaces {
-    loopback lo {
-    }
-}
diff --git a/data/live-build-config/includes.chroot/etc/fuse.conf b/data/live-build-config/includes.chroot/etc/fuse.conf
new file mode 100644
index 00000000..a439ab82
--- /dev/null
+++ b/data/live-build-config/includes.chroot/etc/fuse.conf
@@ -0,0 +1 @@
+user_allow_other
diff --git a/data/live-build-config/includes.chroot/opt/vyatta/etc/config.boot.default b/data/live-build-config/includes.chroot/opt/vyatta/etc/config.boot.default
new file mode 100644
index 00000000..f5ec2b5d
--- /dev/null
+++ b/data/live-build-config/includes.chroot/opt/vyatta/etc/config.boot.default
@@ -0,0 +1,39 @@
+system {
+    login {
+        user vyos {
+            authentication {
+                encrypted-password $6$QxPS.uk6mfo$9QBSo8u1FkH16gMyAVhus6fU3LOzvLR9Z9.82m3tiHFAxTtIkhaZSWssSgzt4v4dGAL8rhVQxTg0oAG9/q11h/
+                plaintext-password ""
+            }
+            level admin
+        }
+    }
+    syslog {
+        global {
+            facility all {
+                level notice
+            }
+            facility protocols {
+                level debug
+            }
+        }
+    }
+    ntp {
+        server "0.pool.ntp.org"
+        server "1.pool.ntp.org"
+        server "2.pool.ntp.org"
+    }
+    console {
+        device ttyS0 {
+            speed 9600
+        }
+    }
+    config-management {
+        commit-revisions 100
+    }
+}
+
+interfaces {
+    loopback lo {
+    }
+}
diff --git a/data/live-build-config/package-lists/vyos-base.list.chroot b/data/live-build-config/package-lists/vyos-base.list.chroot
new file mode 100644
index 00000000..6e5c1122
--- /dev/null
+++ b/data/live-build-config/package-lists/vyos-base.list.chroot
@@ -0,0 +1,3 @@
+debconf
+gpgv
+gnupg
diff --git a/data/live-build-config/package-lists/vyos-utils.list.chroot b/data/live-build-config/package-lists/vyos-utils.list.chroot
new file mode 100644
index 00000000..3d1a3b2a
--- /dev/null
+++ b/data/live-build-config/package-lists/vyos-utils.list.chroot
@@ -0,0 +1,10 @@
+nmap
+dnsutils
+sipcalc
+mtr-tiny
+whois
+netcat
+netcat6
+socat
+telnet
+tcpdump
diff --git a/data/package-lists/common/vyos-base.list.chroot b/data/package-lists/common/vyos-base.list.chroot
deleted file mode 100644
index 6e5c1122..00000000
--- a/data/package-lists/common/vyos-base.list.chroot
+++ /dev/null
@@ -1,3 +0,0 @@
-debconf
-gpgv
-gnupg
diff --git a/data/package-lists/common/vyos-utils.list.chroot b/data/package-lists/common/vyos-utils.list.chroot
deleted file mode 100644
index 3d1a3b2a..00000000
--- a/data/package-lists/common/vyos-utils.list.chroot
+++ /dev/null
@@ -1,10 +0,0 @@
-nmap
-dnsutils
-sipcalc
-mtr-tiny
-whois
-netcat
-netcat6
-socat
-telnet
-tcpdump
-- 
cgit v1.2.3