diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-11 12:09:26 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-11 12:09:26 +0100 |
| commit | 73b88e17dda6eb6546e0fdcefeb3251f806d88d3 (patch) | |
| tree | 4ec0603851ec82737ccbc387fe1db1bb63a572fa /nixos/doc | |
| parent | 539e94030c226562433e5ff96299dffb0641427a (diff) | |
| parent | cf27abf534930ecb1657c4a4e7466ed15c4a2076 (diff) | |
| download | nixlib-73b88e17dda6eb6546e0fdcefeb3251f806d88d3.tar nixlib-73b88e17dda6eb6546e0fdcefeb3251f806d88d3.tar.gz nixlib-73b88e17dda6eb6546e0fdcefeb3251f806d88d3.tar.bz2 nixlib-73b88e17dda6eb6546e0fdcefeb3251f806d88d3.tar.lz nixlib-73b88e17dda6eb6546e0fdcefeb3251f806d88d3.tar.xz nixlib-73b88e17dda6eb6546e0fdcefeb3251f806d88d3.tar.zst nixlib-73b88e17dda6eb6546e0fdcefeb3251f806d88d3.zip | |
Merge staging-next into staging
Diffstat (limited to 'nixos/doc')
| -rw-r--r-- | nixos/doc/manual/installation/installing-virtualbox-guest.xml | 5 | ||||
| -rw-r--r-- | nixos/doc/manual/man-nixos-rebuild.xml | 14 |
2 files changed, 19 insertions, 0 deletions
diff --git a/nixos/doc/manual/installation/installing-virtualbox-guest.xml b/nixos/doc/manual/installation/installing-virtualbox-guest.xml index 5c86eacfbf45..0ba909fa953f 100644 --- a/nixos/doc/manual/installation/installing-virtualbox-guest.xml +++ b/nixos/doc/manual/installation/installing-virtualbox-guest.xml @@ -49,6 +49,11 @@ </listitem> <listitem> <para> + Click on Settings / Display / Screen and select VBoxVGA as Graphics Controller + </para> + </listitem> + <listitem> + <para> Save the settings, start the virtual machine, and continue installation like normal </para> diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml index c697b7ee0472..495dbc8859b1 100644 --- a/nixos/doc/manual/man-nixos-rebuild.xml +++ b/nixos/doc/manual/man-nixos-rebuild.xml @@ -494,6 +494,20 @@ </para> </listitem> </varlistentry> + + <varlistentry> + <term> + <option>--use-remote-sudo</option> + </term> + <listitem> + <para> + When set, nixos-rebuild prefixes remote commands that run on + the <option>--build-host</option> and <option>--target-host</option> + systems with <command>sudo</command>. Setting this option allows + deploying as a non-root user. + </para> + </listitem> + </varlistentry> </variablelist> <para> |