summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDirk von Suchodoletz2008-10-15 16:49:42 +0200
committerDirk von Suchodoletz2008-10-15 16:49:42 +0200
commitf468860beac426efa8158829819a72024c7130b4 (patch)
tree63ed2b0210668baada2b5223e03365bebd5535f3
parent * load plugin variables after running plugins (diff)
downloadcore-f468860beac426efa8158829819a72024c7130b4.tar.gz
core-f468860beac426efa8158829819a72024c7130b4.tar.xz
core-f468860beac426efa8158829819a72024c7130b4.zip
How to annoy admins :) This fix should prevent kdm from creating
its own config (we do this!!) ... git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2319 95ad53e4-c205-0410-b2fa-d234c58c8868
-rw-r--r--installer/OpenSLX/OSExport/Distro/Suse.pm1
-rw-r--r--os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm2
2 files changed, 3 insertions, 0 deletions
diff --git a/installer/OpenSLX/OSExport/Distro/Suse.pm b/installer/OpenSLX/OSExport/Distro/Suse.pm
index 4db29e69..788cf080 100644
--- a/installer/OpenSLX/OSExport/Distro/Suse.pm
+++ b/installer/OpenSLX/OSExport/Distro/Suse.pm
@@ -81,6 +81,7 @@ sub initDistroInfo
- /tmp/*
- /sys/*
- /proc/*
+ - /opt/kde3/share/apps/kdm/read_sysconfig.sh
- /opt/kde3/share/autostart/suseplugger.desktop
- /opt/kde3/share/autostart/susewatcher.desktop
- /opt/kde3/share/autostart/runupdater.desktop
diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm
index dff3e65a..cddc7b53 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm
@@ -87,6 +87,8 @@ sub setupKDMScript
mkpath("/var/adm/kdm");
# maybe backup kdmrc.sysconfig sometimes
unlink("/var/adm/kdm/kdmrc.sysconfig");
+ # this file gets overwritten if this script is present
+ unlink("/opt/kde3/share/apps/kdm/read_sysconfig.sh");
symlink("/etc/opt/kdm/kdmrc", "/var/adm/kdm/kdmrc.sysconfig");
my $script = $self->SUPER::setupKDMScript($repoPath);