QubesOS/qubes-core-admin-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

appmenus: Add offline mode to qubes-receive-appmenus

Browse Source 
Will be useful during LiveUSB build - we can't start template at this
stage, but still need to somehow generate appmenus.
This commit is contained in:
Marek Marczykowski-Górecki 2015-08-02 14:43:17 +02:00
parent 5b4b4190a5
commit c85fc7a098
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
appmenus-scripts/qubes-receive-appmenus
View File

@ -20,6 +20,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# #
# #
import optparse
import subprocess import subprocess
import re import re
@ -35,6 +36,8 @@ from qubes.qubes import vm_files
import qubes.imgconverter import qubes.imgconverter
# fields required to be present (and verified) in retrieved desktop file # fields required to be present (and verified) in retrieved desktop file
from qubes import vmm
required_fields = ["Name", "Exec"] required_fields = ["Name", "Exec"]
# limits # limits
@ -238,6 +241,11 @@ def main():
default=False, default=False,
help="Force to start a new RPC call, " help="Force to start a new RPC call, "
"even if called from existing one") "even if called from existing one")
# Do not use any RPC call, expects data on stdin (in qubes.GetAppmenus
# format)
parser.add_option("--offline-mode", dest="offline_mode",
action="store_true", default=False,
help=optparse.SUPPRESS_HELP)
(options, args) = parser.parse_args() (options, args) = parser.parse_args()
if (len(args) != 1) and env_vmname is None: if (len(args) != 1) and env_vmname is None:
@ -257,6 +265,8 @@ def main():
print >> sys.stderr, "... or use --force-root to continue anyway." print >> sys.stderr, "... or use --force-root to continue anyway."
exit(1) exit(1)
if options.offline_mode:
vmm.offline_mode = True
qvm_collection = QubesVmCollection() qvm_collection = QubesVmCollection()
qvm_collection.lock_db_for_reading() qvm_collection.lock_db_for_reading()
qvm_collection.load() qvm_collection.load()
@ -275,12 +285,12 @@ def main():
"do it on template instead" "do it on template instead"
exit(1) exit(1)
if not vm.is_running(): if not options.offline_mode and not vm.is_running():
print >> sys.stderr, "ERROR: Appmenus can be retrieved only from " \ print >> sys.stderr, "ERROR: Appmenus can be retrieved only from " \
"running VM - start it first" "running VM - start it first"
exit(1) exit(1)
if env_vmname is None or options.force_rpc: if not options.offline_mode and env_vmname is None or options.force_rpc:
new_appmenus = get_appmenus(vm) new_appmenus = get_appmenus(vm)
else: else:
options.verbose = False options.verbose = False
@ -308,6 +318,9 @@ def main():
else: else:
print >> sys.stderr, "---> Creating {0}".format(appmenu_file) print >> sys.stderr, "---> Creating {0}".format(appmenu_file)
# TODO: icons support in offline mode
if options.offline_mode:
new_appmenus[appmenu_file].pop('Icon', None)
if 'Icon' in new_appmenus[appmenu_file]: if 'Icon' in new_appmenus[appmenu_file]:
# the following line is used for time comparison # the following line is used for time comparison
icondest = os.path.join(vm.appmenus_template_icons_dir, icondest = os.path.join(vm.appmenus_template_icons_dir,