QubesOS/qubes-linux-template-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/template-builder

Browse Source
This commit is contained in:
Joanna Rutkowska 2012-01-15 13:02:43 +01:00
commit db0b9058c6
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
templates.spec
View File

@ -101,9 +101,9 @@ qvm-template-commit %{template_name}
if [ "$1" = 0 ] ; then if [ "$1" = 0 ] ; then
# no more packages left # no more packages left
# First remove DispVM template (even if not exists...) # First remove DispVM template (even if not exists...)
qvm-remove -q %{template_name}-dvm qvm-remove --force-root -q %{template_name}-dvm
if ! qvm-remove -q --just-db %{template_name}; then if ! qvm-remove --force-root -q --just-db %{template_name}; then
exit 1 exit 1
fi fi

16
vm_conf_files/dispvm-prerun.sh
View File

@ -1,19 +1,27 @@
#!/bin/sh #!/bin/sh
apps="evince okular openoffice gwenview firefox" apps="evince /usr/libexec/evinced soffice firefox"
cat /etc/dispvm-dotfiles.tbz | tar -xjf- --overwrite -C /home/user --owner user 2>&1 >/tmp/dispvm-dotfiles-errors.log cat /etc/dispvm-dotfiles.tbz | tar -xjf- --overwrite -C /home/user --owner user 2>&1 >/tmp/dispvm-dotfiles-errors.log
for app in $apps ; do for app in $apps ; do
echo "Launching: $app..." echo "Launching: $app..."
$app >/tmp/dispvm_prerun_errors.log 2>&1 & $app >>/tmp/dispvm_prerun_errors.log 2>&1 &
done done
echo "Sleeping..." echo "Sleeping..."
sleep 60 PREV_IO=0
while true; do
IO=`vmstat -D | awk '/read|write/ {IOs+=$1} END {print IOs}'`
if [ $IO -lt $[ $PREV_IO + 50 ] ]; then
break;
fi
PREV_IO=$IO
sleep 1
done
ps ax > /tmp/dispvm-prerun-proclist.log ps ax > /tmp/dispvm-prerun-proclist.log
cat /etc/dispvm-dotfiles.tbz | tar -xjf- --overwrite -C /home/user --owner user 2>&1 >/tmp/dispvm-dotfiles-errors.log cat /etc/dispvm-dotfiles.tbz | tar -xjf- --overwrite -C /home/user --owner user 2>&1 >>/tmp/dispvm-dotfiles-errors.log
echo done. echo done.