Added missing plugin files for RHEL, Scientific Linux and CentOS Linux.

Removed deprecated SciLin files.
postinit.local from the InitRamFS will be executed, if fetching of the tgz file fails.

17 files changed, 239 insertions, 211 deletions

diff --git a/src/boot-env/OpenSLX/MakeInitRamFS/Distro/Scilin.pm b/src/boot-env/OpenSLX/MakeInitRamFS/Distro/Scilin.pm
deleted file mode 100644
index f2372f8f..00000000
--- a/src/boot-env/OpenSLX/MakeInitRamFS/Distro/Scilin.pm
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright (c) 2009..2010 - 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/
-# -----------------------------------------------------------------------------
-# MakeInitRamFS::Distro::Scilin.pm
-#    - provides Scientific Linux specific overrides of the 
-#      MakeInitRamFS::Distro API.
-# -----------------------------------------------------------------------------
-package OpenSLX::MakeInitRamFS::Distro::Scilin;
-
-use strict;
-use warnings;
-
-use base qw(OpenSLX::MakeInitRamFS::Distro::Base);
-
-use OpenSLX::Basics;
-
-################################################################################
-### implementation
-################################################################################
-sub new
-{
-    my $class = shift;
-    my $self = {
-        'base-name' => 'scilin',
-    };
-    return bless $self, $class;
-}
-
-sub applyChanges
-{
-    my $self   = shift;
-    my $engine = shift;
-    # filter modules which are part of the main kernel already
-    $engine->_addFilteredKernelModules( qw( af_packet hid hid-bright usbhid unix vesafb fbcon ));
-
-    return;
-}
-
-sub determineMatchingHwinfoVersion
-{
-    my $self          = shift;
-    my $distroVersion = shift;
-
-    my %versionMap = (
-        '4.7' => '13.11',
-        '5.3' => '15.3',
-        '5.4' => '15.21',
-        '5.5' => '16.0',
-    );
-    return $versionMap{$distroVersion}
-        || $self->SUPER::determineMatchingHwinfoVersion($distroVersion);
-}
-
-1;
diff --git a/src/initramfs/scripts/init b/src/initramfs/scripts/init
index d1d7945b..59cfea8a 100755
--- a/src/initramfs/scripts/init
+++ b/src/initramfs/scripts/init
@@ -1039,12 +1039,21 @@ runinithook '85-have-initial-boot'
 # post init for some distro specific stuff to run
 postinit
 # general postinit.local configurable by the admin via openslx/config/<system>
-[ -f /initramfs/postinit.local ] && {
-  [ $DEBUGLEVEL -gt 0 ] && \
-    echo -n "Running script /bin/postinit.local ... "
+if [ -f /initramfs/postinit.local ]
+  then
+  [ $DEBUGLEVEL -gt 0 ] \
+    && echo -n "Running script /initramfs/postinit.local ... "
   chmod u+x /initramfs/postinit.local
   /initramfs/postinit.local
-  [ $DEBUGLEVEL -gt 0 ] && echo "ok"; }
+  [ $DEBUGLEVEL -gt 0 ] && echo "ok"
+elif [ -f /bin/postinit.local ] 
+  then
+  [ $DEBUGLEVEL -gt 0 ] \
+    && echo -n "Running script /bin/postinit.local ... "
+  chmod u+x /bin/postinit.local
+  /bin/postinit.local
+  [ $DEBUGLEVEL -gt 0 ] && echo "ok"
+fi
 
 # start a debug shell in higher debug levels
 [ $DEBUGLEVEL -gt 2 -a $DEBUGLEVEL != 8 ] \
diff --git a/src/installer/OpenSLX/OSExport/Distro/SciLin.pm b/src/installer/OpenSLX/OSExport/Distro/SciLin.pm
deleted file mode 100644
index 272b5cef..00000000
--- a/src/installer/OpenSLX/OSExport/Distro/SciLin.pm
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright (c) 2006, 2007 - 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/
-# -----------------------------------------------------------------------------
-# OSExport/Distro/SciLin.pm
-#    - provides SciLin-specific overrides of the OSExport Distro API.
-# -----------------------------------------------------------------------------
-package OpenSLX::OSExport::Distro::SciLin;
-
-use strict;
-use warnings;
-
-use base qw(OpenSLX::OSExport::Distro::Base);
-
-use OpenSLX::Basics;
-
-################################################################################
-### implementation
-################################################################################
-sub new
-{
-    my $class = shift;
-    my $self = {
-        'base-name' => 'scilin',
-    };
-    return bless $self, $class;
-}
-
-sub initDistroInfo
-{
-    my $self = shift;
-
-    $self->{'export-filter'} = "
-        - /var/tmp/*
-        - /var/spool/*
-        - /var/run/*
-        - /var/mail
-        - /var/log/*
-        - /var/lock/*
-        - /var/lib/xdm
-        - /var/lib/vm*
-        - /var/lib/suspend*
-        - /var/lib/smart
-        - /var/lib/gdm/*
-        - /var/lib/dhcp*
-        - /var/lib/bluetooth/
-        - /var/cache/yum
-        - /var/cache/man/*
-        - /var/cache/zypp/*
-        + /usr/lib/python*/*/*.o
-        + /usr/lib/perl5/*/*/*/*.o
-        + /usr/lib/gcc/*/*/*.o
-        + /usr/lib/*.o
-        + /usr/X11R6/lib/modules/drivers/*.o
-        + /usr/X11R6/lib/modules/drivers/linux/*.o
-        - /usr/bin/BackGround
-        - /tmp/*
-        - /sys/*
-        - /proc/*
-        - /opt/kde3/share/apps/kdm/read_sysconfig.sh
-        - /opt/kde3/share/autostart/runupdater.desktop
-        - /opt/kde3/share/autostart/profile_chooser-autostart.desktop
-        - /opt/kde3/share/autostart/kinternet.desktop
-        - /usr/share/gnome/autostart/gpk-update-icon*.desktop
-        - /mnt/*
-        - /media/*
-        + /media
-        + /lib/modules/*/misc/vmblock.o
-        + /lib/modules/*/misc/vmnet.o
-        + /lib/modules/*/misc/vmmon.o
-        - /etc/*rpmnew
-        - /etc/*rpmorig
-        - /etc/*pptp*
-        - /etc/*ppp*
-        - /etc/dhcp*
-        - /etc/cron.*/*
-		- /etc/netplug*
-        - /etc/sysconfig/network*
-        - /etc/X11/xkb
-		- /boot/initrd*
-        - /boot/grub
-        - *.rpmsave
-        - *.rpmnew
-    ";
-    return;
-}
-
-1;
diff --git a/src/installer/OpenSLX/OSSetup/Engine.pm b/src/installer/OpenSLX/OSSetup/Engine.pm
index 159a23a7..07d9c749 100644
--- a/src/installer/OpenSLX/OSSetup/Engine.pm
+++ b/src/installer/OpenSLX/OSSetup/Engine.pm
@@ -75,10 +75,6 @@ use vars qw(%supportedDistros);
     'suse-11.4_x86_64'  => 'clone,update,shell',
     'suse-12.1'         => 'clone,install,update,shell',
     'suse-12.1_x86_64'  => 'clone,update,shell',
-    'scilin-4.7'        => 'clone,update,shell',
-    'scilin-5.3'        => 'clone,update,shell',
-    'scilin-5.4_x86_64' => 'clone,update,shell',
-    'scilin-5.5_x86_64' => 'clone,update,shell',
     'ubuntu-8.04'       => 'clone,install,update,shell',
     'ubuntu-8.04_amd64' => 'clone,update,shell',
     'ubuntu-8.10'       => 'clone,install,update,shell',
diff --git a/src/os-plugins/plugins/desktop/OpenSLX/Distro/Centos.pm b/src/os-plugins/plugins/desktop/OpenSLX/Distro/Centos.pm
new file mode 100644
index 00000000..8f726037
--- /dev/null
+++ b/src/os-plugins/plugins/desktop/OpenSLX/Distro/Centos.pm
@@ -0,0 +1,31 @@
+# Copyright (c) 2006..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/

+# -----------------------------------------------------------------------------

+# desktop/OpenSLX/Distro/Centos.pm

+#    - provides Centos Linux specific overrides of the Distro API for the

+#      desktop plugin.

+# -----------------------------------------------------------------------------

+package desktop::OpenSLX::Distro::Centos;

+

+use strict;

+use warnings;

+

+use base qw(desktop::OpenSLX::Distro::Rhel);

+

+use File::Path;

+

+use OpenSLX::Basics;

+use OpenSLX::Utils;

+

+################################################################################

+### interface methods

+################################################################################

+

+1;

diff --git a/src/os-plugins/plugins/desktop/OpenSLX/Distro/Scilin.pm b/src/os-plugins/plugins/desktop/OpenSLX/Distro/Rhel.pm
index 1dc0482c..9a04afc4 100644
--- a/src/os-plugins/plugins/desktop/OpenSLX/Distro/Scilin.pm
+++ b/src/os-plugins/plugins/desktop/OpenSLX/Distro/Rhel.pm
@@ -8,11 +8,11 @@
 #

 # General information about OpenSLX can be found at http://openslx.org/

 # -----------------------------------------------------------------------------

-# desktop/OpenSLX/Distro/Scilin.pm

-#    - provides Scilin-specific overrides of the Distro API for the desktop

+# desktop/OpenSLX/Distro/Rhel.pm

+#    - provides RHEL specific overrides of the Distro API for the desktop

 #      plugin.

 # -----------------------------------------------------------------------------

-package desktop::OpenSLX::Distro::Scilin;

+package desktop::OpenSLX::Distro::Rhel;

 

 use strict;

 use warnings;

diff --git a/src/os-plugins/plugins/desktop/OpenSLX/Distro/Scientific.pm b/src/os-plugins/plugins/desktop/OpenSLX/Distro/Scientific.pm
new file mode 100644
index 00000000..9f2eedbc
--- /dev/null
+++ b/src/os-plugins/plugins/desktop/OpenSLX/Distro/Scientific.pm
@@ -0,0 +1,31 @@
+# Copyright (c) 2006..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/

+# -----------------------------------------------------------------------------

+# desktop/OpenSLX/Distro/Scientific.pm

+#    - provides Scientific Linux specific overrides of the Distro API for the

+#      desktop plugin.

+# -----------------------------------------------------------------------------

+package desktop::OpenSLX::Distro::Scientific;

+

+use strict;

+use warnings;

+

+use base qw(desktop::OpenSLX::Distro::Rhel);

+

+use File::Path;

+

+use OpenSLX::Basics;

+use OpenSLX::Utils;

+

+################################################################################

+### interface methods

+################################################################################

+

+1;

diff --git a/src/installer/OpenSLX/OSSetup/Distro/Scilin.pm b/src/os-plugins/plugins/infoscreen/OpenSLX/Distro/Centos.pm
index e1ce5fc3..2f0ad7cd 100644
--- a/src/installer/OpenSLX/OSSetup/Distro/Scilin.pm
+++ b/src/os-plugins/plugins/infoscreen/OpenSLX/Distro/Centos.pm
@@ -8,41 +8,22 @@
 #
 # General information about OpenSLX can be found at http://openslx.org/
 # -----------------------------------------------------------------------------
-# OSSetup/Distro/Scilin.pm
-#    - provides Scientific Linux specific overrides of the OSSetup Distro API.
+# infoscreen/OpenSLX/Distro/Centos.pm
+#    - provides Centos Linux specific overrides of the Distro API for the
+#      infoscreen plugin.
 # -----------------------------------------------------------------------------
-package OpenSLX::OSSetup::Distro::Scilin;
+package infoscreen::OpenSLX::Distro::Centos;
 
 use strict;
 use warnings;
 
-use base qw(OpenSLX::OSSetup::Distro::Base);
+use base qw(infoscreen::OpenSLX::Distro::Rhel);
 
 use OpenSLX::Basics;
+use OpenSLX::Utils;
 
 ################################################################################
 ### interface methods
 ################################################################################
-sub new
-{
-    my $class = shift;
-    my $self = {};
-    return bless $self, $class;
-}
-
-sub initialize
-{
-    my $self = shift;
-    my $engine = shift;
-
-    $self->SUPER::initialize($engine);
-    $self->{'packager-type'}       = 'rpm';
-    $self->{'meta-packager-type'}  = $ENV{SLX_META_PACKAGER} || 'yum';
-    $self->{'stage1c-faked-files'} = [
-        '/etc/fstab',
-        '/etc/mtab',
-    ];
-    return;
-}
 
 1;
diff --git a/src/os-plugins/plugins/infoscreen/OpenSLX/Distro/Scilin.pm b/src/os-plugins/plugins/infoscreen/OpenSLX/Distro/Rhel.pm
index e89d6d88..a5988166 100644
--- a/src/os-plugins/plugins/infoscreen/OpenSLX/Distro/Scilin.pm
+++ b/src/os-plugins/plugins/infoscreen/OpenSLX/Distro/Rhel.pm
@@ -8,11 +8,11 @@
 #
 # General information about OpenSLX can be found at http://openslx.org/
 # -----------------------------------------------------------------------------
-# infoscreen/OpenSLX/Distro/Scilin.pm
-#    - provides Scilin-specific overrides of the Distro API for the infoscreen 
+# infoscreen/OpenSLX/Distro/Rhel.pm
+#    - provides RHEL specific overrides of the Distro API for the infoscreen 
 #      plugin.
 # -----------------------------------------------------------------------------
-package infoscreen::OpenSLX::Distro::Scilin;
+package infoscreen::OpenSLX::Distro::Rhel;
 
 use strict;
 use warnings;
@@ -26,7 +26,4 @@ use OpenSLX::Utils;
 ### interface methods
 ################################################################################
 
-
-
-
 1;
diff --git a/src/os-plugins/plugins/infoscreen/OpenSLX/Distro/Scientific.pm b/src/os-plugins/plugins/infoscreen/OpenSLX/Distro/Scientific.pm
new file mode 100644
index 00000000..5f791132
--- /dev/null
+++ b/src/os-plugins/plugins/infoscreen/OpenSLX/Distro/Scientific.pm
@@ -0,0 +1,29 @@
+# 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/
+# -----------------------------------------------------------------------------
+# infoscreen/OpenSLX/Distro/Scientific.pm
+#    - provides Scientific Linux specific overrides of the Distro API for the
+#      infoscreen plugin.
+# -----------------------------------------------------------------------------
+package infoscreen::OpenSLX::Distro::Scientific;
+
+use strict;
+use warnings;
+
+use base qw(infoscreen::OpenSLX::Distro::Rhel);
+
+use OpenSLX::Basics;
+use OpenSLX::Utils;
+
+################################################################################
+### interface methods
+################################################################################
+
+1;
diff --git a/src/os-plugins/plugins/kiosk/OpenSLX/Distro/Centos.pm b/src/os-plugins/plugins/kiosk/OpenSLX/Distro/Centos.pm
new file mode 100644
index 00000000..68877fd7
--- /dev/null
+++ b/src/os-plugins/plugins/kiosk/OpenSLX/Distro/Centos.pm
@@ -0,0 +1,29 @@
+# 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/
+# -----------------------------------------------------------------------------
+# kiosk/OpenSLX/Distro/Centos.pm
+#    - provides Centos Linux specific overrides of the Distro API for the
+#      kiosk plugin.
+# -----------------------------------------------------------------------------
+package kiosk::OpenSLX::Distro::Centos;
+
+use strict;
+use warnings;
+
+use base qw(kiosk::OpenSLX::Distro::Rhel);
+
+use OpenSLX::Basics;
+use OpenSLX::Utils;
+
+################################################################################
+### interface methods
+################################################################################
+
+1;
diff --git a/src/os-plugins/plugins/kiosk/OpenSLX/Distro/Scilin.pm b/src/os-plugins/plugins/kiosk/OpenSLX/Distro/Rhel.pm
index 7423a3b8..6c0f9c9f 100644
--- a/src/os-plugins/plugins/kiosk/OpenSLX/Distro/Scilin.pm
+++ b/src/os-plugins/plugins/kiosk/OpenSLX/Distro/Rhel.pm
@@ -8,11 +8,10 @@
 #
 # General information about OpenSLX can be found at http://openslx.org/
 # -----------------------------------------------------------------------------
-# kiosk/OpenSLX/Distro/Scilin.pm
-#    - provides Scilin-specific overrides of the Distro API for the kiosk 
-#      plugin.
+# kiosk/OpenSLX/Distro/Rhel.pm
+#    - provides RHEL specific overrides of the Distro API for the kiosk plugin.
 # -----------------------------------------------------------------------------
-package kiosk::OpenSLX::Distro::Scilin;
+package kiosk::OpenSLX::Distro::Rhel;
 
 use strict;
 use warnings;
@@ -26,7 +25,4 @@ use OpenSLX::Utils;
 ### interface methods
 ################################################################################
 
-
-
-
 1;
diff --git a/src/os-plugins/plugins/kiosk/OpenSLX/Distro/Scientific.pm b/src/os-plugins/plugins/kiosk/OpenSLX/Distro/Scientific.pm
new file mode 100644
index 00000000..4e664c76
--- /dev/null
+++ b/src/os-plugins/plugins/kiosk/OpenSLX/Distro/Scientific.pm
@@ -0,0 +1,29 @@
+# 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/
+# -----------------------------------------------------------------------------
+# kiosk/OpenSLX/Distro/Scientific.pm
+#    - provides Scientific Linux specific overrides of the Distro API for the
+#      kiosk plugin.
+# -----------------------------------------------------------------------------
+package kiosk::OpenSLX::Distro::Scientific;
+
+use strict;
+use warnings;
+
+use base qw(kiosk::OpenSLX::Distro::Rhel);
+
+use OpenSLX::Basics;
+use OpenSLX::Utils;
+
+################################################################################
+### interface methods
+################################################################################
+
+1;
diff --git a/src/os-plugins/plugins/profile/OpenSLX/Distro/Centos.pm b/src/os-plugins/plugins/profile/OpenSLX/Distro/Centos.pm
new file mode 100644
index 00000000..99d12703
--- /dev/null
+++ b/src/os-plugins/plugins/profile/OpenSLX/Distro/Centos.pm
@@ -0,0 +1,29 @@
+# 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/Centos.pm
+#    - provides Centos Linux specific overrides of the Distro API for the
+#      profile plugin.
+# -----------------------------------------------------------------------------
+package profile::OpenSLX::Distro::Centos;
+
+use strict;
+use warnings;
+
+use base qw(profile::OpenSLX::Distro::Rhel);
+
+use OpenSLX::Basics;
+use OpenSLX::Utils;
+
+################################################################################
+### interface methods
+################################################################################
+
+1;
diff --git a/src/os-plugins/plugins/profile/OpenSLX/Distro/Scilin.pm b/src/os-plugins/plugins/profile/OpenSLX/Distro/Rhel.pm
index de66f02a..92d599d8 100644
--- a/src/os-plugins/plugins/profile/OpenSLX/Distro/Scilin.pm
+++ b/src/os-plugins/plugins/profile/OpenSLX/Distro/Rhel.pm
@@ -8,11 +8,11 @@
 #
 # General information about OpenSLX can be found at http://openslx.org/
 # -----------------------------------------------------------------------------
-# profile/OpenSLX/Distro/Scilin.pm
-#    - provides Scilin-specific overrides of the Distro API for the profile 
+# profile/OpenSLX/Distro/Rhel.pm
+#    - provides RHEL specific overrides of the Distro API for the profile 
 #      plugin.
 # -----------------------------------------------------------------------------
-package profile::OpenSLX::Distro::Scilin;
+package profile::OpenSLX::Distro::Rhel;
 
 use strict;
 use warnings;
@@ -26,7 +26,4 @@ use OpenSLX::Utils;
 ### interface methods
 ################################################################################
 
-
-
-
 1;
diff --git a/src/os-plugins/plugins/profile/OpenSLX/Distro/Scientific.pm b/src/os-plugins/plugins/profile/OpenSLX/Distro/Scientific.pm
new file mode 100644
index 00000000..e040e3f8
--- /dev/null
+++ b/src/os-plugins/plugins/profile/OpenSLX/Distro/Scientific.pm
@@ -0,0 +1,29 @@
+# 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/Scientific.pm
+#    - provides Scientific Linux specific overrides of the Distro API for the
+#      profile plugin.
+# -----------------------------------------------------------------------------
+package profile::OpenSLX::Distro::Scientific;
+
+use strict;
+use warnings;
+
+use base qw(profile::OpenSLX::Distro::Rhel);
+
+use OpenSLX::Basics;
+use OpenSLX::Utils;
+
+################################################################################
+### interface methods
+################################################################################
+
+1;
diff --git a/src/os-plugins/plugins/vmgrid/OpenSLX/OSPlugin/vmgrid.pm b/src/os-plugins/plugins/vmgrid/OpenSLX/OSPlugin/vmgrid.pm
index 0965b482..0100d553 100644
--- a/src/os-plugins/plugins/vmgrid/OpenSLX/OSPlugin/vmgrid.pm
+++ b/src/os-plugins/plugins/vmgrid/OpenSLX/OSPlugin/vmgrid.pm
@@ -131,7 +131,7 @@ sub getAttrInfo
                  comma separated list. first will be started first,
                  second second, and so on, max. 4 VMs
             End-of-Here
-            content_descr => 'name of xml file e.g. scilin-5.4-wn(.xml)',
+            content_descr => 'name of xml file e.g. rhel-5-wn(.xml)',
             default => undef,
         },
         'vmgrid::vt' => {