diff --git a/init/setup-rw.sh b/init/setup-rw.sh index 9d8c5b9..19283d7 100755 --- a/init/setup-rw.sh +++ b/init/setup-rw.sh @@ -25,33 +25,31 @@ if mountpoint -q /rw ; then # This script will be executed at every VM startup, you can place your own # custom commands here. This include overriding some configuration in /etc, # starting services etc. -# -# You need to make this script executable to have it enabled. # Example for overriding the whole CUPS configuration: # rm -rf /etc/cups # ln -s /rw/config/cups /etc/cups # systemctl --no-block restart cups EOF + chmod 755 /rw/config/rc.local touch /rw/config/qubes-firewall-user-script cat > /rw/config/qubes-firewall-user-script <<EOF #!/bin/sh -# This script is called in ProxyVM after firewall every update (configuration +# This script is called in AppVMs after every firewall update (configuration # change, starting some VM etc). This is good place to write own custom -# firewall rules, in addition to autogenerated one. Remember that in most cases -# you'll need to insert the rules at the beginning (iptables -I) to have it +# firewall rules, in addition to autogenerated ones. Remember that in most cases +# you'll need to insert the rules at the beginning (iptables -I) for it to be # efective. -# -# You need to make this script executable to have it enabled. EOF + chmod 755 /rw/config/qubes-firewall-user-script touch /rw/config/suspend-module-blacklist cat > /rw/config/suspend-module-blacklist <<EOF -# You can list here modules you want to be unloaded before going to sleep. This +# You can list modules here that you want to be unloaded before going to sleep. This # file is used only if the VM has any PCI device assigned. Modules will be -# automatically loaded after resume. +# automatically re-loaded after resume. EOF fi diff --git a/qubes-rpc/qubes.StartApp b/qubes-rpc/qubes.StartApp index 92896fd..761b038 100755 --- a/qubes-rpc/qubes.StartApp +++ b/qubes-rpc/qubes.StartApp @@ -1,11 +1,11 @@ #!/bin/sh if [ -z "$1" ]; then - echo "This service require an argument" >&2 + echo "This service requires an argument" >&2 exit 1 fi -# make sure it have .desktop suffix, and only one of it +# make sure it has .desktop suffix, and only one of it app_basename="${1%.desktop}.desktop" # Based on XDG Base Directory Specification, Version 0.7