diff options
| author | Michael Janczyk | 2009-07-03 19:32:08 +0200 |
|---|---|---|
| committer | Michael Janczyk | 2009-07-03 19:32:08 +0200 |
| commit | 496fff2672d89f8539352d514aeec84638b3b213 (patch) | |
| tree | 210580c431f19befcfcaba0173d2ae710bfabcec | |
| parent | no need for different syslinux dirs, now everything inside syslinux (diff) | |
| download | core-496fff2672d89f8539352d514aeec84638b3b213.tar.gz core-496fff2672d89f8539352d514aeec84638b3b213.tar.xz core-496fff2672d89f8539352d514aeec84638b3b213.zip | |
suppress error from #463 cp: cannot stat /mnt/opt/openslx/lib/plugins/desktop/themes/gdm/...
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2991 95ad53e4-c205-0410-b2fa-d234c58c8868
| -rw-r--r-- | lib/OpenSLX/Basics.pm | 2 | ||||
| -rw-r--r-- | os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lib/OpenSLX/Basics.pm b/lib/OpenSLX/Basics.pm index c14046eb..676e1b46 100644 --- a/lib/OpenSLX/Basics.pm +++ b/lib/OpenSLX/Basics.pm @@ -107,11 +107,11 @@ I<slxsettings>-script, so please look there if you'd like to know more. 'mirrors-to-try-count' => '20', 'mirrors-to-use-count' => '5', 'ossetup-max-try-count' => '5', - 'syslinux-theme' => 'openslx', 'pxe-passwd' => 'secret', 'pxe-timeout' => '100', 'pxe-title' => 'Welcome to OpenSLX', 'pxe-totaltimeout' => '600', + 'syslinux-theme' => 'openslx', ); chomp($openslxConfig{'locale-charmap'}); diff --git a/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm b/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm index dc53f3a1..a948d222 100644 --- a/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm +++ b/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm @@ -664,11 +664,15 @@ sub _setupSupportedThemes vlog(1, "installing theme '$theme'..."); my $gdmThemeTargetPath = "$self->{pluginRepositoryPath}/themes/gdm"; mkpath($gdmThemeTargetPath); - slxsystem("cp -a $gdmThemeDir $gdmThemeTargetPath/$theme") == 0 + slxsystem( + "cp -a $gdmThemeDir $gdmThemeTargetPath/$theme 2>/dev/null" + ) == 0 or die _tr('unable to copy GDM-theme %s (%s)', $theme, $!); my $kdmThemeTargetPath = "$self->{pluginRepositoryPath}/themes/kdm"; mkpath($kdmThemeTargetPath); - slxsystem("cp -a $kdmThemeDir $kdmThemeTargetPath/$theme") == 0 + slxsystem( + "cp -a $kdmThemeDir $kdmThemeTargetPath/$theme 2>/dev/null" + ) == 0 or die _tr('unable to copy KDM-theme %s (%s)', $theme, $!); next THEME; } |