From d56b2381de65a712aacebbf1bbaa72240c3f296d Mon Sep 17 00:00:00 2001 From: null pointer exception <57326449+deathgrippin@users.noreply.github.com> Date: Sat, 16 May 2020 00:11:17 +0000 Subject: [PATCH 1/2] Add code blocks --- user/advanced-configuration/config-files.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/user/advanced-configuration/config-files.md b/user/advanced-configuration/config-files.md index aea1f614..61fa4aa2 100644 --- a/user/advanced-configuration/config-files.md +++ b/user/advanced-configuration/config-files.md @@ -15,12 +15,12 @@ Configuration Files Qubes-specific VM config files ------------------------------ -These files are placed in /rw, which survives a VM restart. +These files are placed in `/rw`, which survives a VM restart. That way, they can be used to customize a single VM instead of all VMs based on the same template. The scripts here all run as root. - `/rw/config/rc.local` - script runs at VM startup. - Good place to change some service settings, replace config files with its copy stored in /rw/config, etc. + Good place to change some service settings, replace config files with its copy stored in `/rw/config`, etc. Example usage: ~~~ @@ -72,7 +72,7 @@ The scripts here all run as root. will be executed with arguments `online vif12.0 vif 10.137.0.100` when starting `work`. Please note that in case of HVM, the script will be called twice - once with vif_type `vif`, then with vif_type `vif_ioemu` (and different interface names). As long as the ioemu interface exists, it should be preferred (up to the hook script). When VM decide to use PV interface (vif_type `vif`), the ioemu one will be unplugged. -Note that scripts need to be executable (chmod +x) to be used. +Note that scripts need to be executable (`chmod +x`) to be used. Also, take a look at [bind-dirs](/doc/bind-dirs) for instructions on how to easily modify arbitrary system files in an AppVM and have those changes persist. @@ -80,7 +80,7 @@ Also, take a look at [bind-dirs](/doc/bind-dirs) for instructions on how to easi GUI and audio configuration in dom0 ----------------------------------- -The GUI configuration file `/etc/qubes/guid.conf` in one of a few not managed by qubes-prefs or the Qubes Manager tool. +The GUI configuration file `/etc/qubes/guid.conf` in one of a few not managed by `qubes-prefs` or the Qubes Manager tool. Sample config (included in default installation): ~~~ From 66ef502f6df339cde34a38fd3e0f443464a4a36a Mon Sep 17 00:00:00 2001 From: null pointer exception <57326449+deathgrippin@users.noreply.github.com> Date: Sat, 16 May 2020 00:16:34 +0000 Subject: [PATCH 2/2] Clean up some wording --- user/advanced-configuration/config-files.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/user/advanced-configuration/config-files.md b/user/advanced-configuration/config-files.md index 61fa4aa2..501618aa 100644 --- a/user/advanced-configuration/config-files.md +++ b/user/advanced-configuration/config-files.md @@ -37,7 +37,7 @@ The scripts here all run as root. - `/rw/config/qubes-ip-change-hook` - script runs in NetVM after every external IP change and on "hardware" link status change. - In ProxyVMs (or AppVMs with `qubes-firewall` service enabled), scripts placed in the following directories will be executed in the listed order followed by `qubes-firewall-user-script` after each firewall update. - Good place to write own custom firewall rules. + Good place to write custom firewall rules. ~~~ /etc/qubes/qubes-firewall.d @@ -49,7 +49,7 @@ The scripts here all run as root. The file is used only in a VM with PCI devices attached. Intended for use with problematic device drivers. -- In NetVMs/ProxyVMs, scripts placed in `/rw/config/network-hooks.d` will be ran when configuring Qubes interfaces. For each script, the `command`, `vif`, `vif_type` and `ip` is passed as arguments (see `/etc/xen/scripts/vif-route-qubes`). For example, consider an PV AppVM `work` with IP `10.137.0.100` and `sys-firewall` as NetVM. Assuming it's Xen domain id is arbitrary `12` then, the following script located at `/rw/config/network-hooks.d/hook-100.sh` in `sys-firewall`: +- In NetVMs/ProxyVMs, scripts placed in `/rw/config/network-hooks.d` will be ran when configuring Qubes interfaces. For each script, the `command`, `vif`, `vif_type` and `ip` is passed as arguments (see `/etc/xen/scripts/vif-route-qubes`). For example, consider a PV AppVM `work` with IP `10.137.0.100` and `sys-firewall` as NetVM. Assuming it's Xen domain id is arbitrary `12` then, the following script located at `/rw/config/network-hooks.d/hook-100.sh` in `sys-firewall`: ~~~ #!/bin/bash @@ -70,7 +70,7 @@ The scripts here all run as root. fi ~~~ - will be executed with arguments `online vif12.0 vif 10.137.0.100` when starting `work`. Please note that in case of HVM, the script will be called twice - once with vif_type `vif`, then with vif_type `vif_ioemu` (and different interface names). As long as the ioemu interface exists, it should be preferred (up to the hook script). When VM decide to use PV interface (vif_type `vif`), the ioemu one will be unplugged. + will be executed with arguments `online vif12.0 vif 10.137.0.100` when starting `work`. Please note that in case of an HVM, the script will be called twice - once with vif_type `vif`, then with vif_type `vif_ioemu` (and different interface names). As long as the ioemu interface exists, it should be preferred (up to the hook script). When the VM decides to use a PV interface (vif_type `vif`), the ioemu one will be unplugged. Note that scripts need to be executable (`chmod +x`) to be used. @@ -140,7 +140,7 @@ Currently supported settings: - `tint+whitehack` - same as tint, but change white pixels (0xffffff) to almost-white (0xfefefe) -- `log level` - log level defines the log options log can take. log level can - have a value of 0(only errors), 1(some basic messages), 2(debug). +- `log level` - defines the log options logs can take. It can + have a value of 0 (only errors), 1 (some basic messages), and 2 (debug). - `startup_timeout` - The timeout for startup.