Merge branch 'dev' of https://github.com/home-assistant/hassos into dev

Documentation/configuration.md

@@ -0,0 +1,29 @@
+# Configuration
+
+## Automatic
+
+You can format a USB stick with FAT32 and name it with `hassos-config`. The layout could be look like:
+```
+network/
+modules/
+known_hosts
+hassos-xy.rauc
+```
+
+- On `network` folder can hold any kind of NetworkManager connections files.
+- The folder `modules` is for modules-load configuration files.
+- `known_hosts` file activate debug SSH access of port `22222`.
+- For firmware updates you can but the `hassos-*.rauc` OTA update they should be install. 
+
+## Local
+
+### Bootargs
+
+You can edit or create a `cmdline.txt` into your boot partition. That will be read from our bootloader.
+
+### Kernel-Module
+
+The kernel module folder `/etc/modules-load.d` is persistent and you can add your config files there. See [Systemd modules load][systemd-modules].
+
+
+[systemd-modules]: https://www.freedesktop.org/software/systemd/man/modules-load.d.html

Documentation/configuration.mk

@@ -1,12 +0,0 @@
-# Configuration
-
-## Bootargs
-
-You can edit or create a `cmdline.txt` into your boot partition. That will be read from our bootloader.
-
-## Kernel-Module
-
-The kernel module folder `/etc/modules-load.d` is persistent and you can add your config files there. See [Systemd modules load][systemd-modules].
-
-
-[systemd-modules]: https://www.freedesktop.org/software/systemd/man/modules-load.d.html

README.md

@@ -15,14 +15,6 @@ Hass.io OS based on [buildroot](https://buildroot.org/). It's a hypervisor for D
 ## Schemas
 ![](misc/hassio-os-partition.png?raw=true)
 
-## Configuration
-
-Create a USB stick with a partition named "hassos-config". This partition can include follow files:
-
-- network-* (NetworkManager keyfiles)
-- known_hosts (SSH)
-- hassos*.ota (Firmware updates)
-
 # Customize
 
 Provide a file with the name `hassos.json` in your data partition and the following structure: