summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDirk von Suchodoletz2011-06-04 14:22:23 +0200
committerDirk von Suchodoletz2011-06-04 14:22:23 +0200
commit87c12762ffac608b863296c9ff71affadcf6a4dd (patch)
tree586d4f23216cf25235276eeae5bbb45eb908bab8 /src
parentHaldaemon is to be started by script (dbus/system-services/*.service does not... (diff)
downloadcore-87c12762ffac608b863296c9ff71affadcf6a4dd.tar.gz
core-87c12762ffac608b863296c9ff71affadcf6a4dd.tar.xz
core-87c12762ffac608b863296c9ff71affadcf6a4dd.zip
Remove unneeded autostart services for SuSE ...
Diffstat (limited to 'src')
-rw-r--r--src/installer/OpenSLX/OSExport/Distro/Suse.pm3
-rw-r--r--src/os-plugins/plugins/virtualbox/files/run-virt.include4
2 files changed, 4 insertions, 3 deletions
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