diff --git a/config/aarch64/acid.toml b/config/aarch64/acid.toml index 239b524e179c4cd6843a617f635f764c93836db3..5a51fa2d4cbe95705cb358499b00abfe6525d83e 100644 --- a/config/aarch64/acid.toml +++ b/config/aarch64/acid.toml @@ -1,5 +1,7 @@ # Configuration for using acid +include = ["../base.toml"] + # General settings [general] # Filesystem size in MiB @@ -52,30 +54,3 @@ acid tls acid thread shutdown """ - -[[files]] -path = "/usr/bin" -data = "../bin" -symlink = true - -[[files]] -path = "/usr/include" -data = "../include" -symlink = true - -[[files]] -path = "/usr/lib" -data = "../lib" -symlink = true - -[[files]] -path = "/usr/share" -data = "../share" -symlink = true - -[[files]] -path = "/tmp" -data = "" -directory= true -# 0o1777 -mode = 1023 diff --git a/config/aarch64/demo.toml b/config/aarch64/demo.toml index 538c467a32f99326b1d15fd5bcb358642e494de1..25e67d3b22ff6f2a89061ac4315c0854d9907e41 100644 --- a/config/aarch64/demo.toml +++ b/config/aarch64/demo.toml @@ -1,5 +1,7 @@ # Default demo configuration +include = ["../base.toml"] + # General settings [general] # Filesystem size in MiB @@ -141,50 +143,3 @@ path = "/etc/hostname" data = """ redox """ - -[[files]] -path = "/usr/bin" -data = "../bin" -symlink = true - -[[files]] -path = "/usr/include" -data = "../include" -symlink = true - -[[files]] -path = "/usr/lib" -data = "../lib" -symlink = true - -[[files]] -path = "/usr/share" -data = "../share" -symlink = true - -[[files]] -path = "/tmp" -data = "" -directory= true -# 0o1777 -mode = 1023 - -[[files]] -path = "/dev/null" -data = "null:" -symlink = true - -[[files]] -path = "/dev/random" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/urandom" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/zero" -data = "zero:" -symlink = true diff --git a/config/aarch64/desktop-minimal.toml b/config/aarch64/desktop-minimal.toml index d45faf1a5809735521ea6b7eab9bb0b2e67b6770..122255b44183d0be934c67e68cdb1685144c24cb 100644 --- a/config/aarch64/desktop-minimal.toml +++ b/config/aarch64/desktop-minimal.toml @@ -1,5 +1,7 @@ # Default desktop configuration +include = ["../base.toml"] + # General settings [general] # Filesystem size in MiB @@ -80,50 +82,3 @@ path = "/etc/hostname" data = """ redox """ - -[[files]] -path = "/usr/bin" -data = "../bin" -symlink = true - -[[files]] -path = "/usr/include" -data = "../include" -symlink = true - -[[files]] -path = "/usr/lib" -data = "../lib" -symlink = true - -[[files]] -path = "/usr/share" -data = "../share" -symlink = true - -[[files]] -path = "/tmp" -data = "" -directory= true -# 0o1777 -mode = 1023 - -[[files]] -path = "/dev/null" -data = "null:" -symlink = true - -[[files]] -path = "/dev/random" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/urandom" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/zero" -data = "zero:" -symlink = true diff --git a/config/aarch64/desktop.toml b/config/aarch64/desktop.toml index 2f43eac282f50c61bad3b5457a21d79d5993beb3..1ca4502f7c45dd4f85dd7ca6d19367deb9516683 100644 --- a/config/aarch64/desktop.toml +++ b/config/aarch64/desktop.toml @@ -1,5 +1,7 @@ # Default desktop configuration +include = ["../base.toml"] + # General settings [general] # Filesystem size in MiB @@ -141,50 +143,3 @@ path = "/etc/hostname" data = """ redox """ - -[[files]] -path = "/usr/bin" -data = "../bin" -symlink = true - -[[files]] -path = "/usr/include" -data = "../include" -symlink = true - -[[files]] -path = "/usr/lib" -data = "../lib" -symlink = true - -[[files]] -path = "/usr/share" -data = "../share" -symlink = true - -[[files]] -path = "/tmp" -data = "" -directory= true -# 0o1777 -mode = 1023 - -[[files]] -path = "/dev/null" -data = "null:" -symlink = true - -[[files]] -path = "/dev/random" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/urandom" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/zero" -data = "zero:" -symlink = true diff --git a/config/aarch64/dev.toml b/config/aarch64/dev.toml index 017a7d1f6fc9b2dc2c0be81fb3b0a991486f4647..008481bcdbf677b5cf4a5d0cd7ce14f14917f162 100644 --- a/config/aarch64/dev.toml +++ b/config/aarch64/dev.toml @@ -1,5 +1,7 @@ # Configuration for development, includes cargo and rustc +include = ["../base.toml"] + # General settings [general] # Filesystem size in MiB @@ -162,50 +164,3 @@ path = "/etc/hostname" data = """ redox """ - -[[files]] -path = "/usr/bin" -data = "../bin" -symlink = true - -[[files]] -path = "/usr/include" -data = "../include" -symlink = true - -[[files]] -path = "/usr/lib" -data = "../lib" -symlink = true - -[[files]] -path = "/usr/share" -data = "../share" -symlink = true - -[[files]] -path = "/tmp" -data = "" -directory= true -# 0o1777 -mode = 1023 - -[[files]] -path = "/dev/null" -data = "null:" -symlink = true - -[[files]] -path = "/dev/random" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/urandom" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/zero" -data = "zero:" -symlink = true diff --git a/config/aarch64/jeremy.toml b/config/aarch64/jeremy.toml index abddeb70d15729aa9a2653b641d6e73277984800..f9189d9fab4ab24cd9c9818a2765cff4122b6112 100644 --- a/config/aarch64/jeremy.toml +++ b/config/aarch64/jeremy.toml @@ -1,5 +1,7 @@ # Default desktop configuration +include = ["../base.toml"] + # General settings [general] # Filesystem size in MiB @@ -137,50 +139,3 @@ path = "/etc/hostname" data = """ redox """ - -[[files]] -path = "/usr/bin" -data = "../bin" -symlink = true - -[[files]] -path = "/usr/include" -data = "../include" -symlink = true - -[[files]] -path = "/usr/lib" -data = "../lib" -symlink = true - -[[files]] -path = "/usr/share" -data = "../share" -symlink = true - -[[files]] -path = "/tmp" -data = "" -directory= true -# 0o1777 -mode = 1023 - -[[files]] -path = "/dev/null" -data = "null:" -symlink = true - -[[files]] -path = "/dev/random" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/urandom" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/zero" -data = "zero:" -symlink = true diff --git a/config/aarch64/raspi3bp/server-minimal.toml b/config/aarch64/raspi3bp/server-minimal.toml index 9d41547c43b32093efb88ea7c3811024fe5116fb..7920a51d755565395661999b501b4bcfa4e95a20 100644 --- a/config/aarch64/raspi3bp/server-minimal.toml +++ b/config/aarch64/raspi3bp/server-minimal.toml @@ -1,5 +1,7 @@ # Minimal configuration +include = ["../base.toml"] + # General settings [general] # Filesystem size in MiB @@ -68,50 +70,3 @@ path = "/etc/hostname" data = """ redox """ - -[[files]] -path = "/usr/bin" -data = "../bin" -symlink = true - -[[files]] -path = "/usr/include" -data = "../include" -symlink = true - -[[files]] -path = "/usr/lib" -data = "../lib" -symlink = true - -[[files]] -path = "/usr/share" -data = "../share" -symlink = true - -[[files]] -path = "/tmp" -data = "" -directory= true -# 0o1777 -mode = 1023 - -[[files]] -path = "/dev/null" -data = "null:" -symlink = true - -[[files]] -path = "/dev/random" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/urandom" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/zero" -data = "zero:" -symlink = true diff --git a/config/aarch64/resist.toml b/config/aarch64/resist.toml index d15e04b658bdcda3fd343d53fcd4a5b7d07cee62..44a35eeabd9c3fb4f91e39dbccdfc728841df837 100644 --- a/config/aarch64/resist.toml +++ b/config/aarch64/resist.toml @@ -1,5 +1,7 @@ # Configuration for using resist +include = ["../base.toml"] + # General settings [general] # Filesystem size in MiB @@ -122,50 +124,3 @@ path = "/etc/hostname" data = """ redox """ - -[[files]] -path = "/usr/bin" -data = "../bin" -symlink = true - -[[files]] -path = "/usr/include" -data = "../include" -symlink = true - -[[files]] -path = "/usr/lib" -data = "../lib" -symlink = true - -[[files]] -path = "/usr/share" -data = "../share" -symlink = true - -[[files]] -path = "/tmp" -data = "" -directory= true -# 0o1777 -mode = 1023 - -[[files]] -path = "/dev/null" -data = "null:" -symlink = true - -[[files]] -path = "/dev/random" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/urandom" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/zero" -data = "zero:" -symlink = true diff --git a/config/aarch64/server-minimal.toml b/config/aarch64/server-minimal.toml index f0f5ef6beef92504ed8b8692231e6e67e37c25fe..ff1442119ca224f364691854c8f6827e19c1d0f5 100644 --- a/config/aarch64/server-minimal.toml +++ b/config/aarch64/server-minimal.toml @@ -1,5 +1,7 @@ # Minimal configuration +include = ["../base.toml"] + # General settings [general] # Filesystem size in MiB @@ -67,50 +69,3 @@ path = "/etc/hostname" data = """ redox """ - -[[files]] -path = "/usr/bin" -data = "../bin" -symlink = true - -[[files]] -path = "/usr/include" -data = "../include" -symlink = true - -[[files]] -path = "/usr/lib" -data = "../lib" -symlink = true - -[[files]] -path = "/usr/share" -data = "../share" -symlink = true - -[[files]] -path = "/tmp" -data = "" -directory= true -# 0o1777 -mode = 1023 - -[[files]] -path = "/dev/null" -data = "null:" -symlink = true - -[[files]] -path = "/dev/random" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/urandom" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/zero" -data = "zero:" -symlink = true diff --git a/config/aarch64/server.toml b/config/aarch64/server.toml index 9af0ba1b8e57ed974c8f525bf821cb292aaa673b..790d1a7c472e62948ce3ddc1bc6bce57a38ac553 100644 --- a/config/aarch64/server.toml +++ b/config/aarch64/server.toml @@ -1,5 +1,7 @@ # Default server configuration +include = ["../base.toml"] + # General settings [general] # Filesystem size in MiB @@ -132,50 +134,3 @@ path = "/etc/hostname" data = """ redox """ - -[[files]] -path = "/usr/bin" -data = "../bin" -symlink = true - -[[files]] -path = "/usr/include" -data = "../include" -symlink = true - -[[files]] -path = "/usr/lib" -data = "../lib" -symlink = true - -[[files]] -path = "/usr/share" -data = "../share" -symlink = true - -[[files]] -path = "/tmp" -data = "" -directory= true -# 0o1777 -mode = 1023 - -[[files]] -path = "/dev/null" -data = "null:" -symlink = true - -[[files]] -path = "/dev/random" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/urandom" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/zero" -data = "zero:" -symlink = true diff --git a/config/base.toml b/config/base.toml new file mode 100644 index 0000000000000000000000000000000000000000..8b6bffbd1c5fef30263cc8fdd9ca60090662dd05 --- /dev/null +++ b/config/base.toml @@ -0,0 +1,56 @@ +# Base configuration: This configuration is meant to be included by +# other configurations rather than use directly. It is the greatest +# common divisor of all other configurations and misses several +# parts necessary to create a bootable system. + +# General settings +[general] +# Do not prompt if settings are not defined +prompt = false + +[[files]] +path = "/usr/bin" +data = "../bin" +symlink = true + +[[files]] +path = "/usr/include" +data = "../include" +symlink = true + +[[files]] +path = "/usr/lib" +data = "../lib" +symlink = true + +[[files]] +path = "/usr/share" +data = "../share" +symlink = true + +[[files]] +path = "/tmp" +data = "" +directory = true +# 0o1777 +mode = 1023 + +[[files]] +path = "/dev/null" +data = "null:" +symlink = true + +[[files]] +path = "/dev/random" +data = "rand:" +symlink = true + +[[files]] +path = "/dev/urandom" +data = "rand:" +symlink = true + +[[files]] +path = "/dev/zero" +data = "zero:" +symlink = true diff --git a/config/i686/acid.toml b/config/i686/acid.toml index 239b524e179c4cd6843a617f635f764c93836db3..5a51fa2d4cbe95705cb358499b00abfe6525d83e 100644 --- a/config/i686/acid.toml +++ b/config/i686/acid.toml @@ -1,5 +1,7 @@ # Configuration for using acid +include = ["../base.toml"] + # General settings [general] # Filesystem size in MiB @@ -52,30 +54,3 @@ acid tls acid thread shutdown """ - -[[files]] -path = "/usr/bin" -data = "../bin" -symlink = true - -[[files]] -path = "/usr/include" -data = "../include" -symlink = true - -[[files]] -path = "/usr/lib" -data = "../lib" -symlink = true - -[[files]] -path = "/usr/share" -data = "../share" -symlink = true - -[[files]] -path = "/tmp" -data = "" -directory= true -# 0o1777 -mode = 1023 diff --git a/config/i686/demo.toml b/config/i686/demo.toml index c8cdf5752b72fae93f3e1a45a44fedb71fa91f25..39f989256f9c8a8ed734e6531168e5fe217e8f09 100644 --- a/config/i686/demo.toml +++ b/config/i686/demo.toml @@ -22,6 +22,8 @@ # # ############################################################################## +include = ["../base.toml"] + # General settings [general] # Filesystem size in MiB @@ -177,53 +179,6 @@ data = """ redox """ -[[files]] -path = "/usr/bin" -data = "../bin" -symlink = true - -[[files]] -path = "/usr/include" -data = "../include" -symlink = true - -[[files]] -path = "/usr/lib" -data = "../lib" -symlink = true - -[[files]] -path = "/usr/share" -data = "../share" -symlink = true - -[[files]] -path = "/tmp" -data = "" -directory= true -# 0o1777 -mode = 1023 - -[[files]] -path = "/dev/null" -data = "null:" -symlink = true - -[[files]] -path = "/dev/random" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/urandom" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/zero" -data = "zero:" -symlink = true - [[files]] path = "/home/user/Welcome.txt" data = """ diff --git a/config/i686/desktop-minimal.toml b/config/i686/desktop-minimal.toml index d45faf1a5809735521ea6b7eab9bb0b2e67b6770..122255b44183d0be934c67e68cdb1685144c24cb 100644 --- a/config/i686/desktop-minimal.toml +++ b/config/i686/desktop-minimal.toml @@ -1,5 +1,7 @@ # Default desktop configuration +include = ["../base.toml"] + # General settings [general] # Filesystem size in MiB @@ -80,50 +82,3 @@ path = "/etc/hostname" data = """ redox """ - -[[files]] -path = "/usr/bin" -data = "../bin" -symlink = true - -[[files]] -path = "/usr/include" -data = "../include" -symlink = true - -[[files]] -path = "/usr/lib" -data = "../lib" -symlink = true - -[[files]] -path = "/usr/share" -data = "../share" -symlink = true - -[[files]] -path = "/tmp" -data = "" -directory= true -# 0o1777 -mode = 1023 - -[[files]] -path = "/dev/null" -data = "null:" -symlink = true - -[[files]] -path = "/dev/random" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/urandom" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/zero" -data = "zero:" -symlink = true diff --git a/config/i686/desktop.toml b/config/i686/desktop.toml index 66aeeb0dc43c4242af96fb948faa6073f7baa9cf..a1a4bcb78180ee0af64979a470b7c89cfbeed8ff 100644 --- a/config/i686/desktop.toml +++ b/config/i686/desktop.toml @@ -1,5 +1,7 @@ # Default desktop configuration +include = ["../base.toml"] + # General settings [general] # Filesystem size in MiB @@ -142,50 +144,3 @@ path = "/etc/hostname" data = """ redox """ - -[[files]] -path = "/usr/bin" -data = "../bin" -symlink = true - -[[files]] -path = "/usr/include" -data = "../include" -symlink = true - -[[files]] -path = "/usr/lib" -data = "../lib" -symlink = true - -[[files]] -path = "/usr/share" -data = "../share" -symlink = true - -[[files]] -path = "/tmp" -data = "" -directory= true -# 0o1777 -mode = 1023 - -[[files]] -path = "/dev/null" -data = "null:" -symlink = true - -[[files]] -path = "/dev/random" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/urandom" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/zero" -data = "zero:" -symlink = true diff --git a/config/i686/dev.toml b/config/i686/dev.toml index 017a7d1f6fc9b2dc2c0be81fb3b0a991486f4647..008481bcdbf677b5cf4a5d0cd7ce14f14917f162 100644 --- a/config/i686/dev.toml +++ b/config/i686/dev.toml @@ -1,5 +1,7 @@ # Configuration for development, includes cargo and rustc +include = ["../base.toml"] + # General settings [general] # Filesystem size in MiB @@ -162,50 +164,3 @@ path = "/etc/hostname" data = """ redox """ - -[[files]] -path = "/usr/bin" -data = "../bin" -symlink = true - -[[files]] -path = "/usr/include" -data = "../include" -symlink = true - -[[files]] -path = "/usr/lib" -data = "../lib" -symlink = true - -[[files]] -path = "/usr/share" -data = "../share" -symlink = true - -[[files]] -path = "/tmp" -data = "" -directory= true -# 0o1777 -mode = 1023 - -[[files]] -path = "/dev/null" -data = "null:" -symlink = true - -[[files]] -path = "/dev/random" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/urandom" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/zero" -data = "zero:" -symlink = true diff --git a/config/i686/jeremy.toml b/config/i686/jeremy.toml index d4a33df550a06379bbbd195f9123ac5679e72d3d..f43db12413d1d1c3bad1f87a02fd9570f7a74d6e 100644 --- a/config/i686/jeremy.toml +++ b/config/i686/jeremy.toml @@ -1,5 +1,7 @@ # Jeremy's configuration +include = ["../base.toml"] + # General settings [general] # Filesystem size in MiB @@ -170,53 +172,6 @@ data = """ redox """ -[[files]] -path = "/usr/bin" -data = "../bin" -symlink = true - -[[files]] -path = "/usr/include" -data = "../include" -symlink = true - -[[files]] -path = "/usr/lib" -data = "../lib" -symlink = true - -[[files]] -path = "/usr/share" -data = "../share" -symlink = true - -[[files]] -path = "/tmp" -data = "" -directory= true -# 0o1777 -mode = 1023 - -[[files]] -path = "/dev/null" -data = "null:" -symlink = true - -[[files]] -path = "/dev/random" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/urandom" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/zero" -data = "zero:" -symlink = true - [[files]] path = "/home/user/Welcome.txt" data = """ diff --git a/config/i686/resist.toml b/config/i686/resist.toml index d15e04b658bdcda3fd343d53fcd4a5b7d07cee62..44a35eeabd9c3fb4f91e39dbccdfc728841df837 100644 --- a/config/i686/resist.toml +++ b/config/i686/resist.toml @@ -1,5 +1,7 @@ # Configuration for using resist +include = ["../base.toml"] + # General settings [general] # Filesystem size in MiB @@ -122,50 +124,3 @@ path = "/etc/hostname" data = """ redox """ - -[[files]] -path = "/usr/bin" -data = "../bin" -symlink = true - -[[files]] -path = "/usr/include" -data = "../include" -symlink = true - -[[files]] -path = "/usr/lib" -data = "../lib" -symlink = true - -[[files]] -path = "/usr/share" -data = "../share" -symlink = true - -[[files]] -path = "/tmp" -data = "" -directory= true -# 0o1777 -mode = 1023 - -[[files]] -path = "/dev/null" -data = "null:" -symlink = true - -[[files]] -path = "/dev/random" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/urandom" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/zero" -data = "zero:" -symlink = true diff --git a/config/i686/server-minimal.toml b/config/i686/server-minimal.toml index f0f5ef6beef92504ed8b8692231e6e67e37c25fe..ff1442119ca224f364691854c8f6827e19c1d0f5 100644 --- a/config/i686/server-minimal.toml +++ b/config/i686/server-minimal.toml @@ -1,5 +1,7 @@ # Minimal configuration +include = ["../base.toml"] + # General settings [general] # Filesystem size in MiB @@ -67,50 +69,3 @@ path = "/etc/hostname" data = """ redox """ - -[[files]] -path = "/usr/bin" -data = "../bin" -symlink = true - -[[files]] -path = "/usr/include" -data = "../include" -symlink = true - -[[files]] -path = "/usr/lib" -data = "../lib" -symlink = true - -[[files]] -path = "/usr/share" -data = "../share" -symlink = true - -[[files]] -path = "/tmp" -data = "" -directory= true -# 0o1777 -mode = 1023 - -[[files]] -path = "/dev/null" -data = "null:" -symlink = true - -[[files]] -path = "/dev/random" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/urandom" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/zero" -data = "zero:" -symlink = true diff --git a/config/i686/server.toml b/config/i686/server.toml index 842652bf627f76e7ce2d321470468739a9ff9758..47b3cca682c55de01b3436d0970193e8c201beac 100644 --- a/config/i686/server.toml +++ b/config/i686/server.toml @@ -1,5 +1,7 @@ # Default server configuration +include = ["../base.toml"] + # General settings [general] # Filesystem size in MiB @@ -128,50 +130,3 @@ path = "/etc/hostname" data = """ redox """ - -[[files]] -path = "/usr/bin" -data = "../bin" -symlink = true - -[[files]] -path = "/usr/include" -data = "../include" -symlink = true - -[[files]] -path = "/usr/lib" -data = "../lib" -symlink = true - -[[files]] -path = "/usr/share" -data = "../share" -symlink = true - -[[files]] -path = "/tmp" -data = "" -directory= true -# 0o1777 -mode = 1023 - -[[files]] -path = "/dev/null" -data = "null:" -symlink = true - -[[files]] -path = "/dev/random" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/urandom" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/zero" -data = "zero:" -symlink = true diff --git a/config/x86_64/acid.toml b/config/x86_64/acid.toml index 239b524e179c4cd6843a617f635f764c93836db3..5a51fa2d4cbe95705cb358499b00abfe6525d83e 100644 --- a/config/x86_64/acid.toml +++ b/config/x86_64/acid.toml @@ -1,5 +1,7 @@ # Configuration for using acid +include = ["../base.toml"] + # General settings [general] # Filesystem size in MiB @@ -52,30 +54,3 @@ acid tls acid thread shutdown """ - -[[files]] -path = "/usr/bin" -data = "../bin" -symlink = true - -[[files]] -path = "/usr/include" -data = "../include" -symlink = true - -[[files]] -path = "/usr/lib" -data = "../lib" -symlink = true - -[[files]] -path = "/usr/share" -data = "../share" -symlink = true - -[[files]] -path = "/tmp" -data = "" -directory= true -# 0o1777 -mode = 1023 diff --git a/config/x86_64/demo.toml b/config/x86_64/demo.toml index 19841dcf5d4cf6ccd56efbacc1062d5ecf2593fe..c7a5bd02a6b32e73768e85d312dc2ca69d18f360 100644 --- a/config/x86_64/demo.toml +++ b/config/x86_64/demo.toml @@ -22,6 +22,8 @@ # # ############################################################################## +include = ["../base.toml"] + # General settings [general] # Filesystem size in MiB @@ -198,53 +200,6 @@ data = """ redox """ -[[files]] -path = "/usr/bin" -data = "../bin" -symlink = true - -[[files]] -path = "/usr/include" -data = "../include" -symlink = true - -[[files]] -path = "/usr/lib" -data = "../lib" -symlink = true - -[[files]] -path = "/usr/share" -data = "../share" -symlink = true - -[[files]] -path = "/tmp" -data = "" -directory= true -# 0o1777 -mode = 1023 - -[[files]] -path = "/dev/null" -data = "null:" -symlink = true - -[[files]] -path = "/dev/random" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/urandom" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/zero" -data = "zero:" -symlink = true - [[files]] path = "/home/user/Welcome.txt" data = """ diff --git a/config/x86_64/desktop-contain.toml b/config/x86_64/desktop-contain.toml index 080166756a2af51e482ba15b6234b7180ea43462..d8112a169f0e00a63030fd66c296a2958a9f64af 100644 --- a/config/x86_64/desktop-contain.toml +++ b/config/x86_64/desktop-contain.toml @@ -1,5 +1,7 @@ # Default desktop configuration +include = ["../base.toml"] + # General settings [general] # Filesystem size in MiB @@ -143,53 +145,6 @@ data = """ redox """ -[[files]] -path = "/usr/bin" -data = "../bin" -symlink = true - -[[files]] -path = "/usr/include" -data = "../include" -symlink = true - -[[files]] -path = "/usr/lib" -data = "../lib" -symlink = true - -[[files]] -path = "/usr/share" -data = "../share" -symlink = true - -[[files]] -path = "/tmp" -data = "" -directory= true -# 0o1777 -mode = 1023 - -[[files]] -path = "/dev/null" -data = "null:" -symlink = true - -[[files]] -path = "/dev/random" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/urandom" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/zero" -data = "zero:" -symlink = true - [[files]] path = "/etc/contain.toml" data = """ diff --git a/config/x86_64/desktop-minimal.toml b/config/x86_64/desktop-minimal.toml index d45faf1a5809735521ea6b7eab9bb0b2e67b6770..122255b44183d0be934c67e68cdb1685144c24cb 100644 --- a/config/x86_64/desktop-minimal.toml +++ b/config/x86_64/desktop-minimal.toml @@ -1,5 +1,7 @@ # Default desktop configuration +include = ["../base.toml"] + # General settings [general] # Filesystem size in MiB @@ -80,50 +82,3 @@ path = "/etc/hostname" data = """ redox """ - -[[files]] -path = "/usr/bin" -data = "../bin" -symlink = true - -[[files]] -path = "/usr/include" -data = "../include" -symlink = true - -[[files]] -path = "/usr/lib" -data = "../lib" -symlink = true - -[[files]] -path = "/usr/share" -data = "../share" -symlink = true - -[[files]] -path = "/tmp" -data = "" -directory= true -# 0o1777 -mode = 1023 - -[[files]] -path = "/dev/null" -data = "null:" -symlink = true - -[[files]] -path = "/dev/random" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/urandom" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/zero" -data = "zero:" -symlink = true diff --git a/config/x86_64/desktop.toml b/config/x86_64/desktop.toml index 66aeeb0dc43c4242af96fb948faa6073f7baa9cf..a1a4bcb78180ee0af64979a470b7c89cfbeed8ff 100644 --- a/config/x86_64/desktop.toml +++ b/config/x86_64/desktop.toml @@ -1,5 +1,7 @@ # Default desktop configuration +include = ["../base.toml"] + # General settings [general] # Filesystem size in MiB @@ -142,50 +144,3 @@ path = "/etc/hostname" data = """ redox """ - -[[files]] -path = "/usr/bin" -data = "../bin" -symlink = true - -[[files]] -path = "/usr/include" -data = "../include" -symlink = true - -[[files]] -path = "/usr/lib" -data = "../lib" -symlink = true - -[[files]] -path = "/usr/share" -data = "../share" -symlink = true - -[[files]] -path = "/tmp" -data = "" -directory= true -# 0o1777 -mode = 1023 - -[[files]] -path = "/dev/null" -data = "null:" -symlink = true - -[[files]] -path = "/dev/random" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/urandom" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/zero" -data = "zero:" -symlink = true diff --git a/config/x86_64/dev.toml b/config/x86_64/dev.toml index 017a7d1f6fc9b2dc2c0be81fb3b0a991486f4647..008481bcdbf677b5cf4a5d0cd7ce14f14917f162 100644 --- a/config/x86_64/dev.toml +++ b/config/x86_64/dev.toml @@ -1,5 +1,7 @@ # Configuration for development, includes cargo and rustc +include = ["../base.toml"] + # General settings [general] # Filesystem size in MiB @@ -162,50 +164,3 @@ path = "/etc/hostname" data = """ redox """ - -[[files]] -path = "/usr/bin" -data = "../bin" -symlink = true - -[[files]] -path = "/usr/include" -data = "../include" -symlink = true - -[[files]] -path = "/usr/lib" -data = "../lib" -symlink = true - -[[files]] -path = "/usr/share" -data = "../share" -symlink = true - -[[files]] -path = "/tmp" -data = "" -directory= true -# 0o1777 -mode = 1023 - -[[files]] -path = "/dev/null" -data = "null:" -symlink = true - -[[files]] -path = "/dev/random" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/urandom" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/zero" -data = "zero:" -symlink = true diff --git a/config/x86_64/jeremy.toml b/config/x86_64/jeremy.toml index b4c22f3008f4de7c841efa23abac0f06068ce775..1c0199b8123be0cb891bf66825c1f04604e5bbfe 100644 --- a/config/x86_64/jeremy.toml +++ b/config/x86_64/jeremy.toml @@ -1,5 +1,7 @@ # Jeremy's configuration +include = ["../base.toml"] + # General settings [general] # Filesystem size in MiB @@ -242,50 +244,3 @@ path = "/etc/hostname" data = """ redox """ - -[[files]] -path = "/usr/bin" -data = "../bin" -symlink = true - -[[files]] -path = "/usr/include" -data = "../include" -symlink = true - -[[files]] -path = "/usr/lib" -data = "../lib" -symlink = true - -[[files]] -path = "/usr/share" -data = "../share" -symlink = true - -[[files]] -path = "/tmp" -data = "" -directory= true -# 0o1777 -mode = 1023 - -[[files]] -path = "/dev/null" -data = "null:" -symlink = true - -[[files]] -path = "/dev/random" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/urandom" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/zero" -data = "zero:" -symlink = true diff --git a/config/x86_64/resist.toml b/config/x86_64/resist.toml index d15e04b658bdcda3fd343d53fcd4a5b7d07cee62..44a35eeabd9c3fb4f91e39dbccdfc728841df837 100644 --- a/config/x86_64/resist.toml +++ b/config/x86_64/resist.toml @@ -1,5 +1,7 @@ # Configuration for using resist +include = ["../base.toml"] + # General settings [general] # Filesystem size in MiB @@ -122,50 +124,3 @@ path = "/etc/hostname" data = """ redox """ - -[[files]] -path = "/usr/bin" -data = "../bin" -symlink = true - -[[files]] -path = "/usr/include" -data = "../include" -symlink = true - -[[files]] -path = "/usr/lib" -data = "../lib" -symlink = true - -[[files]] -path = "/usr/share" -data = "../share" -symlink = true - -[[files]] -path = "/tmp" -data = "" -directory= true -# 0o1777 -mode = 1023 - -[[files]] -path = "/dev/null" -data = "null:" -symlink = true - -[[files]] -path = "/dev/random" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/urandom" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/zero" -data = "zero:" -symlink = true diff --git a/config/x86_64/server-minimal.toml b/config/x86_64/server-minimal.toml index f0f5ef6beef92504ed8b8692231e6e67e37c25fe..ff1442119ca224f364691854c8f6827e19c1d0f5 100644 --- a/config/x86_64/server-minimal.toml +++ b/config/x86_64/server-minimal.toml @@ -1,5 +1,7 @@ # Minimal configuration +include = ["../base.toml"] + # General settings [general] # Filesystem size in MiB @@ -67,50 +69,3 @@ path = "/etc/hostname" data = """ redox """ - -[[files]] -path = "/usr/bin" -data = "../bin" -symlink = true - -[[files]] -path = "/usr/include" -data = "../include" -symlink = true - -[[files]] -path = "/usr/lib" -data = "../lib" -symlink = true - -[[files]] -path = "/usr/share" -data = "../share" -symlink = true - -[[files]] -path = "/tmp" -data = "" -directory= true -# 0o1777 -mode = 1023 - -[[files]] -path = "/dev/null" -data = "null:" -symlink = true - -[[files]] -path = "/dev/random" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/urandom" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/zero" -data = "zero:" -symlink = true diff --git a/config/x86_64/server.toml b/config/x86_64/server.toml index 842652bf627f76e7ce2d321470468739a9ff9758..47b3cca682c55de01b3436d0970193e8c201beac 100644 --- a/config/x86_64/server.toml +++ b/config/x86_64/server.toml @@ -1,5 +1,7 @@ # Default server configuration +include = ["../base.toml"] + # General settings [general] # Filesystem size in MiB @@ -128,50 +130,3 @@ path = "/etc/hostname" data = """ redox """ - -[[files]] -path = "/usr/bin" -data = "../bin" -symlink = true - -[[files]] -path = "/usr/include" -data = "../include" -symlink = true - -[[files]] -path = "/usr/lib" -data = "../lib" -symlink = true - -[[files]] -path = "/usr/share" -data = "../share" -symlink = true - -[[files]] -path = "/tmp" -data = "" -directory= true -# 0o1777 -mode = 1023 - -[[files]] -path = "/dev/null" -data = "null:" -symlink = true - -[[files]] -path = "/dev/random" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/urandom" -data = "rand:" -symlink = true - -[[files]] -path = "/dev/zero" -data = "zero:" -symlink = true