Merge pull request #773 from archlinux/torxed-fix-examples

Updated examples - fixes #772

3 files changed, 60 insertions, 19 deletions

diff --git a/examples/config-sample.json b/examples/config-sample.json
index 55bdf04b..18644860 100644
--- a/examples/config-sample.json
+++ b/examples/config-sample.json
@@ -1,35 +1,29 @@
 {
-    "!root-password": "<root_password>",
     "audio": null,
     "bootloader": "systemd-bootctl",
-    "filesystem": "btrfs",
-    "harddrive": {
-        "path": "/dev/sda"
-    },
-    "hostname": "box",
+    "harddrives": [
+        "/dev/loop0"
+    ],
+    "hostname": "",
     "kernels": [
         "linux"
     ],
-    "keyboard-language": "us",
+    "keyboard-layout": "us",
     "mirror-region": {
         "Worldwide": {
             "https://mirror.rackspace.com/archlinux/$repo/os/$arch": true
         }
     },
     "nic": {
-        "NetworkManager": true
+        "NetworkManager": true,
+        "nic": "Use NetworkManager (necessary to configure internet graphically in GNOME and KDE)"
     },
+    "ntp": true,
     "packages": [],
     "profile": null,
-    "superusers": {
-        "<username>": {
-            "!password": "<password>"
-        }
-    },
-    "timezone": "UTC",
-    "users": {
-        "<username>": {
-            "!password": "<password>"
-        }
-    }
+    "script": "guided",
+    "swap": true,
+    "sys-encoding": "utf-8",
+    "sys-language": "en_US",
+    "timezone": "UTC"
 }
\ No newline at end of file
diff --git a/examples/creds-sample.json b/examples/creds-sample.json
new file mode 100644
index 00000000..16aeb8cc
--- /dev/null
+++ b/examples/creds-sample.json
@@ -0,0 +1,9 @@
+{
+	"!root-password": "<root password>",
+	"!users": {
+		"username": {"!password": "<user password>"}
+	},
+	"!superusers": {
+		"admin": {"!password": "<admin password>"}
+	}
+}
\ No newline at end of file
diff --git a/examples/disk_layouts-sample.json b/examples/disk_layouts-sample.json
new file mode 100644
index 00000000..ca10415c
--- /dev/null
+++ b/examples/disk_layouts-sample.json
@@ -0,0 +1,38 @@
+{
+    "/dev/loop0": {
+        "partitions": [
+            {
+                "boot": true,
+                "encrypted": false,
+                "filesystem": {
+                    "format": "fat32"
+                },
+                "format": true,
+                "mountpoint": "/boot",
+                "size": "513MB",
+                "start": "5MB",
+                "type": "primary"
+            },
+            {
+                "btrfs": {
+                    "subvolumes": {
+                        "@.snapshots": "/.snapshots",
+                        "@home": "/home",
+                        "@log": "/var/log",
+                        "@pkgs": "/var/cache/pacman/pkg"
+                    }
+                },
+                "encrypted": true,
+                "filesystem": {
+                    "format": "btrfs"
+                },
+                "format": true,
+                "mountpoint": "/",
+                "size": "100%",
+                "start": "518MB",
+                "type": "primary"
+            }
+        ],
+        "wipe": true
+    }
+}
\ No newline at end of file