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

dom0: fallback to zenity when kdialog not available

Browse Source 
This can be the case on Xfce.
This commit is contained in:
Marek Marczykowski 2013-02-12 01:41:06 +01:00
parent 134dfa6d46
commit 51d0b3dba3
3 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dom0/restore/qfile-daemon-dvm
View File

@ -46,7 +46,10 @@ class QfileDaemonDvm:
qmemman_client.close() qmemman_client.close()
errmsg = 'Not enough memory to create DVM. ' errmsg = 'Not enough memory to create DVM. '
errmsg +='Terminate some appVM and retry.' 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 return None
self.tray_notify("Starting new DispVM...") self.tray_notify("Starting new DispVM...")
@ -74,7 +77,10 @@ class QfileDaemonDvm:
'-l', str(label.index)]) '-l', str(label.index)])
qmemman_client.close() qmemman_client.close()
if retcode != 0: 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() qvm_collection.unlock_db()
return None return None
f = open('/var/run/qubes/dispVM_xid', 'r'); f = open('/var/run/qubes/dispVM_xid', 'r');

28
dom0/restore/qubes_update_dispvm_savefile_with_progress.sh
View File

@ -1,19 +1,29 @@
#!/bin/sh #!/bin/sh
ref=`kdialog --title="Updating default DispVM savefile" \ line1="<b>Please wait (up to 120s) while the DispVM savefile is being updated.</b>"
--progressbar \ line2="<i><small>This only happens when you have updated the template.</small></i>"
line3="<i><small>Next time will be much faster.</small></i>"
if type kdialog &> /dev/null; then
ref=`kdialog --title="Updating default DispVM savefile" \
--progressbar \
"<center> "<center>
<font> <font>
<b>Please wait (up to 120s) while the DispVM savefile is being updated.</b> $line1<br>
<br> $line2<br>
<i><small> $line3
This only happens when you have updated the template.<br>
Next time will be much faster.
</small></i>
</font> </font>
</center>" 0`; </center>" 0`;
trap "qdbus $ref close" EXIT trap "qdbus $ref close" EXIT
else
pipe=/tmp/qvm-create-default-dvm-$$.progress
mkfifo $pipe
zenity --progress --pulsate --auto-close --text "$line1\n$line2\n$line3" < $pipe &
exec 5>$pipe
echo 0 >&5
trap "echo 100 >&5" EXIT
fi
#qdbus $ref showCancelButton true; #qdbus $ref showCancelButton true;

8
qrexec/qrexec_daemon.c
View File

@ -94,10 +94,16 @@ int ask_on_connect_timeout(int xid, int timeout)
{ {
char text[1024]; char text[1024];
int ret; int ret;
struct stat buf;
ret=stat("/usr/bin/kdialog", &buf);
#define KDIALOG_CMD "kdialog --title 'Qrexec daemon' --warningyesno "
#define ZENITY_CMD "zenity --title 'Qrexec daemon' --question --text "
snprintf(text, sizeof(text), snprintf(text, sizeof(text),
"kdialog --title 'Qrexec daemon' --warningyesno " ret==0 ? KDIALOG_CMD : ZENITY_CMD
"'Timeout while trying connecting to qrexec agent (Xen domain ID: %d). Do you want to wait next %d seconds?'", "'Timeout while trying connecting to qrexec agent (Xen domain ID: %d). Do you want to wait next %d seconds?'",
xid, timeout); xid, timeout);
#undef KDIALOG_CMD
#undef ZENITY_CMD
ret = system(text); ret = system(text);
ret = WEXITSTATUS(ret); ret = WEXITSTATUS(ret);
// fprintf(stderr, "ret=%d\n", ret); // fprintf(stderr, "ret=%d\n", ret);