From b65aa75876957201b0b43170cdbd6cf7696d273e Mon Sep 17 00:00:00 2001 From: Jeepler Date: Wed, 23 Sep 2015 18:41:20 +0200 Subject: [PATCH] basics and customization fenced blocks replaced with standard markdown --- basics/GettingStarted.md | 38 +++++++++++----------------- basics/UserFaq.md | 6 +---- customization/DispVMCustomization.md | 34 +++++++++++-------------- customization/XFCE.md | 12 ++------- 4 files changed, 33 insertions(+), 57 deletions(-) diff --git a/basics/GettingStarted.md b/basics/GettingStarted.md index aa9691cb..6042bb16 100644 --- a/basics/GettingStarted.md +++ b/basics/GettingStarted.md @@ -55,15 +55,11 @@ By default, each domain's menu contains only a few shortcuts. If you'd like to a To start apps from the console in dom0, type: -``` -qvm-run -a " [arguments]" -``` + qvm-run -a " [arguments]" e.g.: -``` -qvm-run -a untrusted firefox -``` + qvm-run -a untrusted firefox Adding, Removing, and Listing Domains ------------------------------------- @@ -96,27 +92,23 @@ To allow domains to enter full screen mode, one should edit the `/etc/qubes/guid E.g. to allow all domains to enter full screen mode, set `allow_fullscreen` flag to `true` in the `global` section: -``` -global: { - # default values - allow_fullscreen = false; - #allow_utf8_titles = false; - #secure_copy_sequence = "Ctrl-Shift-c"; - #secure_paste_sequence = "Ctrl-Shift-v"; - #windows_count_limit = 500; -}; -``` + global: { + # default values + allow_fullscreen = false; + #allow_utf8_titles = false; + #secure_copy_sequence = "Ctrl-Shift-c"; + #secure_paste_sequence = "Ctrl-Shift-v"; + #windows_count_limit = 500; + }; To allow only select AppVMs to enter full screen mode, create a per-VM section, and set `allow_fullscreen` flag there to `true`: -``` -VM: { - work: { - allow_fullscreen = true; - }; + VM: { + work: { + allow_fullscreen = true; + }; -}; -``` + }; In order for the changes to take effect, restart the AppVM(s). diff --git a/basics/UserFaq.md b/basics/UserFaq.md index aaadb3c6..f7eb5655 100644 --- a/basics/UserFaq.md +++ b/basics/UserFaq.md @@ -192,7 +192,7 @@ Enable "debug mode" in the AppVM's settings, either by checking the box labelled ### I created a usbVM and assigned usb controllers to it. Now the usbVM wont boot. -This is probably because one of the controllers does not support reset. In Qubes R2 any such errors were ignored but in Qubes R3.0 they are not. +This is probably because one of the controllers does not support reset. In Qubes R2 any such errors were ignored but in Qubes R3.0 they are not. A device that does not support reset is not safe and generally should not be assigned to a VM. Most likely the offending controller is a USB3.0 device. You can remove this controller from the usbVM, and see if this allows the VM to boot. @@ -219,11 +219,7 @@ or 1. Go to the sysfs (`/sys/bus/pci`), find the right device, detach it from the pciback driver and attach back to the original driver. Replace `` with your device, for example `00:1c.2`: - ``` echo 0000: > /sys/bus/pci/drivers/pciback/unbind MODALIAS=`cat /sys/bus/pci/devices/0000:/modalias` MOD=`modprobe -R $MODALIAS | head -n 1` echo > /sys/bus/pci/drivers/$MOD/bind - ``` - - diff --git a/customization/DispVMCustomization.md b/customization/DispVMCustomization.md index 98114fb8..90eeae49 100644 --- a/customization/DispVMCustomization.md +++ b/customization/DispVMCustomization.md @@ -14,21 +14,20 @@ You may want to use a non-default template as a basis for Disposable VM. One exa In order to regenerate the Disposable VM "snapshot" (called 'savefile' on Qubes) one can use the following command in Dom0: -``` -[joanna@dom0 ~]$ qvm-create-default-dvm -``` + [joanna@dom0 ~]$ qvm-create-default-dvm + This would create a new Disposable VM savefile based on the custom template. Now, whenever one opens a file (from any AppVM) in a Disposable VM, a Disposable VM based on this template will be used. One can easily verify if the new Disposable VM template is indeed based on a custom template (in the example below the template called "f17-yellow" was used as a basis for the Disposable VM): -``` -[joanna@dom0 ~]$ ll /var/lib/qubes/dvmdata/ -total 0 -lrwxrwxrwx 1 joanna joanna 45 Mar 11 13:59 default_dvm.conf -> /var/lib/qubes/appvms/f17-yellow-dvm/dvm.conf -lrwxrwxrwx 1 joanna joanna 49 Mar 11 13:59 default_savefile -> /var/lib/qubes/appvms/f17-yellow-dvm/dvm-savefile -lrwxrwxrwx 1 joanna joanna 47 Mar 11 13:59 savefile_root -> /var/lib/qubes/vm-templates/f17-yellow/root.img -``` + + [joanna@dom0 ~]$ ll /var/lib/qubes/dvmdata/ + total 0 + lrwxrwxrwx 1 joanna joanna 45 Mar 11 13:59 default_dvm.conf -> /var/lib/qubes/appvms/f17-yellow-dvm/dvm.conf + lrwxrwxrwx 1 joanna joanna 49 Mar 11 13:59 default_savefile -> /var/lib/qubes/appvms/f17-yellow-dvm/dvm-savefile + lrwxrwxrwx 1 joanna joanna 47 Mar 11 13:59 savefile_root -> /var/lib/qubes/vm-templates/f17-yellow/root.img + Customization of Disposable VM @@ -38,9 +37,8 @@ It is possible to change the settings of each new Disposable VM (DispVM). This c 1. Start a terminal in the `fedora-20-x64-dvm` TemplateVM by running the following command in a dom0 terminal. (By default, this TemplateVM is not shown in Qubes VM Manager. However, it can be shown by selecting "Show/Hide internal VMs.") - ``` - [user@dom0 ~]$ qvm-run -a fedora-20-x64-dvm gnome-terminal - ``` + + [user@dom0 ~]$ qvm-run -a fedora-20-x64-dvm gnome-terminal 2. Change the VM's settings and/or applications, as desired. Note that currently Qubes supports exactly one DispVM template, so any changes you make here will affect all DispVMs. Some examples of changes you may want to make include: - Changing Firefox's default startup settings and homepage. @@ -49,15 +47,13 @@ It is possible to change the settings of each new Disposable VM (DispVM). This c 3. Create an empty `/home/user/.qubes-dispvm-customized` file: - ``` - [user@fedora-20-x64-dvm ~]$ touch /home/user/.qubes-dispvm-customized - ``` + + [user@fedora-20-x64-dvm ~]$ touch /home/user/.qubes-dispvm-customized 4. Shutdown the VM (either by `poweroff` from VM terminal, or `qvm-shutdown` from dom0 terminal). 5. Regenerate the DispVM template: - ``` - [user@dom0 ~]$ qvm-create-default-dvm --default-template --default-script - ``` + [user@dom0 ~]$ qvm-create-default-dvm --default-template --default-script + **Note:** All of the above requires at least qubes-core-vm \>= 2.1.2 installed in template. diff --git a/customization/XFCE.md b/customization/XFCE.md index b966b71e..203a4b35 100644 --- a/customization/XFCE.md +++ b/customization/XFCE.md @@ -18,15 +18,11 @@ Requirements (as of 10/24/2012): Installation: -``` -qubes-dom0-update --enablerepo=qubes-dom0-unstable @XFCE -``` + qubes-dom0-update --enablerepo=qubes-dom0-unstable @XFCE Then you need to create /etc/sysconfig/desktop to stay with KDM, as GDM still starts invalid Xorg startup script: -``` -DISPLAYMANAGER=KDE -``` + DISPLAYMANAGER=KDE Reboot the system. At system startup, select "Xfce session" in login screen (menu on the right bottom corner of the screen). @@ -39,7 +35,6 @@ Things needs/recommended to be done: - create own favorites menu (currently standard XFCE menu isn't modified to use per-VM subsections, which makes it very inconvenient): 1. create \~/.config/menus/favorites.menu, example content: - ``` @@ -60,8 +55,5 @@ Things needs/recommended to be done: untrusted-firefox.desktop - ``` 2. add it to the panel: right click on panel, "add new items", select "XFCE menu", choose custom menu file - just created one - -