diff --git a/dom0/restore/qfile-daemon-dvm b/dom0/restore/qfile-daemon-dvm index 973a1681..fcc05956 100755 --- a/dom0/restore/qfile-daemon-dvm +++ b/dom0/restore/qfile-daemon-dvm @@ -46,7 +46,10 @@ class QfileDaemonDvm: qmemman_client.close() errmsg = 'Not enough memory to create DVM. ' errmsg +='Terminate some appVM and retry.' - subprocess.call(['/usr/bin/kdialog', '--sorry', errmsg]) + if os.path.exists('/usr/bin/kdialog'): + subprocess.call(['/usr/bin/kdialog', '--sorry', errmsg]) + else: + subprocess.call(['/usr/bin/zenity', '--warning', errmsg]) return None self.tray_notify("Starting new DispVM...") @@ -74,7 +77,10 @@ class QfileDaemonDvm: '-l', str(label.index)]) qmemman_client.close() if retcode != 0: - subprocess.call(['/usr/bin/kdialog', '--sorry', 'DisposableVM creation failed, see qubes_restore.log']) + if os.path.exists('/usr/bin/kdialog'): + subprocess.call(['/usr/bin/kdialog', '--sorry', 'DisposableVM creation failed, see qubes_restore.log']) + else: + subprocess.call(['/usr/bin/zenity', '--warning', 'DisposableVM creation failed, see qubes_restore.log']) qvm_collection.unlock_db() return None f = open('/var/run/qubes/dispVM_xid', 'r'); diff --git a/dom0/restore/qubes_update_dispvm_savefile_with_progress.sh b/dom0/restore/qubes_update_dispvm_savefile_with_progress.sh index 9410478b..f6df5437 100755 --- a/dom0/restore/qubes_update_dispvm_savefile_with_progress.sh +++ b/dom0/restore/qubes_update_dispvm_savefile_with_progress.sh @@ -1,19 +1,29 @@ #!/bin/sh -ref=`kdialog --title="Updating default DispVM savefile" \ ---progressbar \ +line1="Please wait (up to 120s) while the DispVM savefile is being updated." +line2="This only happens when you have updated the template." +line3="Next time will be much faster." + +if type kdialog &> /dev/null; then + ref=`kdialog --title="Updating default DispVM savefile" \ + --progressbar \ "