diff --git a/cleanup_image b/cleanup_image index 1e94070..861401f 100755 --- a/cleanup_image +++ b/cleanup_image @@ -22,7 +22,7 @@ yum -c $PWD/yum.conf clean packages --installroot=$INSTALLDIR # Make sure that rpm database has right format (for rpm version in template, not host) echo "--> Rebuilding rpm database..." -chroot `pwd`/mnt /bin/rpm --rebuilddb +chroot `pwd`/mnt /bin/rpm --rebuilddb 2> /dev/null echo "--> Compacting image file..." dd if=/dev/zero of=mnt/fillme bs=1M 2> /dev/null || true diff --git a/dispvm-dotfiles.tbz b/dispvm-dotfiles.tbz deleted file mode 100644 index 152d157..0000000 Binary files a/dispvm-dotfiles.tbz and /dev/null differ diff --git a/qubeize_image b/qubeize_image index 4bbe1a9..4af5cb7 100755 --- a/qubeize_image +++ b/qubeize_image @@ -64,9 +64,6 @@ fi echo "--> Installing 3rd party apps" ./add_3rd_party_software.sh -echo "--> Copying DispVM dotfiles dir..." -cp dispvm-dotfiles.tbz mnt/etc/ - echo "--> Linking /home to /rw/home..." mv mnt/home mnt/home.orig ln -sf /rw/home mnt/home diff --git a/templates.spec b/templates.spec index 393a8e4..6b64414 100644 --- a/templates.spec +++ b/templates.spec @@ -43,8 +43,6 @@ touch $RPM_BUILD_ROOT/%{dest_dir}/volatile.img # we will create the real file in cp clean_images/clean-volatile.img.tar $RPM_BUILD_ROOT/%{dest_dir}/clean-volatile.img.tar -cp vm_conf_files/dispvm-prerun.sh $RPM_BUILD_ROOT/%{dest_dir}/ - mkdir -p $RPM_BUILD_ROOT/%{dest_dir}/apps.templates mkdir -p $RPM_BUILD_ROOT/%{dest_dir}/apps cp -r qubeized_images/%{template_name}-apps.templates/* $RPM_BUILD_ROOT/%{dest_dir}/apps.templates @@ -128,7 +126,6 @@ rm -rf $RPM_BUILD_ROOT %{dest_dir}/clean-volatile.img.tar %ghost %{dest_dir}/volatile.img %ghost %{dest_dir}/private.img -%{dest_dir}/dispvm-prerun.sh %attr (775,root,qubes) %dir %{dest_dir}/apps %attr (775,root,qubes) %dir %{dest_dir}/apps.templates %attr (664,root,qubes) %{dest_dir}/apps.templates/* diff --git a/vm_conf_files/dispvm-prerun.sh b/vm_conf_files/dispvm-prerun.sh deleted file mode 100755 index c0453f2..0000000 --- a/vm_conf_files/dispvm-prerun.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -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 - -for app in $apps ; do - echo "Launching: $app..." - $app >>/tmp/dispvm_prerun_errors.log 2>&1 & -done - -echo "Sleeping..." -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 - -cat /etc/dispvm-dotfiles.tbz | tar -xjf- --overwrite -C /home/user --owner user 2>&1 >>/tmp/dispvm-dotfiles-errors.log - -echo done.