minor fixes

2 files changed, 67 insertions, 1 deletions

diff --git a/initramfs/distro-specs/ubuntu/functions-default b/initramfs/distro-specs/ubuntu/functions-default
index bfd01524..41af807e 100644
--- a/initramfs/distro-specs/ubuntu/functions-default
+++ b/initramfs/distro-specs/ubuntu/functions-default
@@ -97,7 +97,7 @@ elif [ -e /mnt/etc/init.d/${script} -a -n "$1" -a -n "$2" ] ; then
     [ "$DEBUGLEVEL" == 5 ] && echo "Linked $script"
   done
 else
-  error echo "Target $(pwd)../${script} does not exist. Skipping links."
+  error "Target $(pwd)../${script} does not exist. Skipping links." nonfatal
 fi
 }
 
diff --git a/os-plugins/plugins/profile/OpenSLX/Distro/Ubuntu_10.pm b/os-plugins/plugins/profile/OpenSLX/Distro/Ubuntu_10.pm
new file mode 100644
index 00000000..3b288e97
--- /dev/null
+++ b/os-plugins/plugins/profile/OpenSLX/Distro/Ubuntu_10.pm
@@ -0,0 +1,66 @@
+# Copyright (c) 2009 - OpenSLX GmbH
+#
+# This program is free software distributed under the GPL version 2.
+# See http://openslx.org/COPYING
+#
+# If you have any feedback please consult http://openslx.org/feedback and
+# send your suggestions, praise, or complaints to feedback@openslx.org
+#
+# General information about OpenSLX can be found at http://openslx.org/
+# -----------------------------------------------------------------------------
+# profile/OpenSLX/Distro/Ubuntu.pm
+#    - provides Debian-specific overrides of the Distro API for the profile 
+#      plugin.
+# -----------------------------------------------------------------------------
+package profile::OpenSLX::Distro::Ubuntu_10;
+
+use strict;
+use warnings;
+
+use base qw(profile::OpenSLX::Distro::Base);
+
+use OpenSLX::Basics;
+use OpenSLX::Utils;
+
+################################################################################
+### interface methods
+################################################################################
+
+sub _getKdeHomeMap
+{
+    my $self        = shift;
+    
+    return;
+}
+
+sub getProfileDPAth
+{
+    my $self        = shift;
+    
+    
+    return "/etc/profile.d/slx-kdehome.sh";
+}
+
+sub getKdeHome
+{
+    my $self        = shift;
+
+    return ".openslx/ubuntu-lucid.kde";
+}
+
+sub getGconfPathConfig
+{
+    my $self        = shift;
+    
+    return "/etc/gconf/2/path";
+}
+
+
+sub getGconfHome
+{
+    my $self        = shift;
+    
+    return ".openslx.ubuntu-lucid.gconf";
+}
+
+1;