From 87c12762ffac608b863296c9ff71affadcf6a4dd Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Sat, 4 Jun 2011 14:22:23 +0200
Subject: Remove unneeded autostart services for SuSE ...

---
 src/installer/OpenSLX/OSExport/Distro/Suse.pm            | 3 ++-
 src/os-plugins/plugins/virtualbox/files/run-virt.include | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/installer/OpenSLX/OSExport/Distro/Suse.pm b/src/installer/OpenSLX/OSExport/Distro/Suse.pm
index 9e62e6e5..0b0fb6dd 100644
--- a/src/installer/OpenSLX/OSExport/Distro/Suse.pm
+++ b/src/installer/OpenSLX/OSExport/Distro/Suse.pm
@@ -88,7 +88,7 @@ sub initDistroInfo
         - */autostart/runupdater.desktop
         - */autostart/profile_chooser-autostart.desktop
         - */autostart/opensuseupdater.desktop
-        - */autostart/knetworkmanager-autostart.desktop
+        - */autostart/*networkmanager-autostart.desktop
         - */autostart/kerry.autostart.desktop
         - */autostart/kinternet.desktop
         - */autostart/SUSEgreeter.desktop
@@ -96,6 +96,7 @@ sub initDistroInfo
         - */autostart/beagle*.desktop
         - */autostart/gpk-update-icon*.desktop
         - */autostart/kupdateapplet.desktop
+        - */autostart/nepomukserver.desktop
         - */config/SuSE/default/kupdateapplet.*
         - */config/SuSE/default/*.live
         - */config/SuSE/default/*beagle*
diff --git a/src/os-plugins/plugins/virtualbox/files/run-virt.include b/src/os-plugins/plugins/virtualbox/files/run-virt.include
index ebf58eba..085648cb 100644
--- a/src/os-plugins/plugins/virtualbox/files/run-virt.include
+++ b/src/os-plugins/plugins/virtualbox/files/run-virt.include
@@ -36,11 +36,11 @@ PLUGINDIRVIRTUALBOX="${OPENSLX_DEFAULT_DIR}/plugin-repo/${self}"
 TMPDIR=/tmp/virt/${self}
 mkdir -m 1777 ${TMPDIR} 2>/dev/null
 # dir for configs
-confdir="/tmp/${self}/${USER}/${VM_ID}"
+confdir="/tmp/virt/${self}/${USER}/${VM_ID}"
 # use alternate configuration directory instead of $HOME/.VirtualBox
 export VBOX_USER_HOME=${confdir}
 # define dirs and files which can be removed after exit, be carefull!
-RMDIRS="${snapshotdir} ${confdir} /tmp/.vbox-${USER}-ipc"
+RMDIRS="${snapshotdir} ${confdir} /tmp/virt/.vbox-${USER}-ipc"
 rm -rf ${RMDIRS} 2>/dev/null
 machfolder="${confdir}/Machines"
 # use vm_shortname for dir and config names since vm_name can be very long
-- 
cgit v1.2.3-55-g7522