Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'qubesos/pr/76'

Browse Source 
* qubesos/pr/76:
  Fix language issues and usability issue
This commit is contained in:
Marek Marczykowski-Górecki 2017-12-13 19:48:24 +01:00
commit 84374bbdec
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
init/setup-rw.sh
View File

@ -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

4
qubes-rpc/qubes.StartApp
View File

@ -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