From 95da2c40e364b4d2dc68aed83d332c8eed6d2030 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Thu, 2 Jun 2011 17:27:43 +0200 Subject: rename distro versions --- src/installer/OpenSLX/OSExport/Distro/LinuxMint.pm | 109 ------------------- src/installer/OpenSLX/OSExport/Distro/Linuxmint.pm | 109 +++++++++++++++++++ src/installer/OpenSLX/OSSetup/Distro/LinuxMint.pm | 119 --------------------- src/installer/OpenSLX/OSSetup/Distro/Linuxmint.pm | 119 +++++++++++++++++++++ 4 files changed, 228 insertions(+), 228 deletions(-) delete mode 100644 src/installer/OpenSLX/OSExport/Distro/LinuxMint.pm create mode 100644 src/installer/OpenSLX/OSExport/Distro/Linuxmint.pm delete mode 100644 src/installer/OpenSLX/OSSetup/Distro/LinuxMint.pm create mode 100644 src/installer/OpenSLX/OSSetup/Distro/Linuxmint.pm (limited to 'src/installer') diff --git a/src/installer/OpenSLX/OSExport/Distro/LinuxMint.pm b/src/installer/OpenSLX/OSExport/Distro/LinuxMint.pm deleted file mode 100644 index 175addbe..00000000 --- a/src/installer/OpenSLX/OSExport/Distro/LinuxMint.pm +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright (c) 2011 - 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/LinuxMint.pm -# - provides LinuxMint-specific overrides of the OSExport Distro API. -# ----------------------------------------------------------------------------- -package OpenSLX::OSExport::Distro::LinuxMint; - -use strict; -use warnings; - -use base qw(OpenSLX::OSExport::Distro::Base); - -use OpenSLX::Basics; - -################################################################################ -### implementation -################################################################################ -sub new -{ - my $class = shift; - my $self = { - 'base-name' => 'LinuxMint', - }; - return bless $self, $class; -} - -sub initDistroInfo -{ - my $self = shift; - - $self->{'export-filter'} = " - - /var/tmp/* - - /var/spool/* - - /var/run/* - + /var/run/screen - - /var/log/* - - /var/log/apt/* - + /var/log/apt - - /var/lib/*dm/* - - /var/lib/libnss-ldap/* - - /var/cache/apt/archives/* - + /var/cache/apt/archives/partial - - /var/cache/man/* - - /var/cache/nscd/* - - /usr/share/vmware/* - - /usr/share/autostart/trackerd.desktop - - /usr/share/autostart/*knetworkmanager*.desktop - - /usr/share/autostart/kaddressbookmigrator.desktop - - /usr/share/autostart/kab2kabc.desktop - - /usr/share/autostart/kwrited-autostart.desktop - - /etc/update-motd.d/90* - - /etc/update-motd.d/91* - - /etc/update-motd.d/98* - - /tmp/* - - /sys/* - - /proc/* - - /mnt/* - - /media/* - - /lib/udev/devices - - /initrd* - - /etc/cron.*/* - - /boot/initrd* - - /boot/grub - - /etc/xdg/compiz - - /etc/xdg/autostart/adept_notifier_auto.desktop - - /etc/xdg/autostart/evolution*alarm*notify* - - /etc/xdg/autostart/knetworkmanager* - - /etc/xdg/autostart/mint* - - /etc/xdg/autostart/nm-applet.desktop - - /etc/xdg/autostart/system-config-printer-applet-kde.desktop - - /etc/xdg/autostart/tracker* - - /etc/xdg/autostart/jockey-* - - /etc/xdg/autostart/ica* - - /etc/xdg/autostart/hplip* - - /etc/xdg/autostart/redhat* - - /etc/xdg/autostart/gnome-power-manager* - - /etc/xdg/autostart/update* - - /etc/xdg/update-notifier.desktop - - /etc/xdg/user-dirs-update-gtk.desktop - "; - return; -} - - -sub getSquashfsVersion -{ - my $self = shift; - my $distroVersion = shift; - - my %versionMap = ( - '10' => '4.0', - '11' => '4.0', - ); - - my $distroDefault = '4.0'; - - return $versionMap{$distroVersion} || $distroDefault; -} - - -1; diff --git a/src/installer/OpenSLX/OSExport/Distro/Linuxmint.pm b/src/installer/OpenSLX/OSExport/Distro/Linuxmint.pm new file mode 100644 index 00000000..34ca9fb6 --- /dev/null +++ b/src/installer/OpenSLX/OSExport/Distro/Linuxmint.pm @@ -0,0 +1,109 @@ +# Copyright (c) 2011 - 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/LinuxMint.pm +# - provides LinuxMint-specific overrides of the OSExport Distro API. +# ----------------------------------------------------------------------------- +package OpenSLX::OSExport::Distro::Linuxmint; + +use strict; +use warnings; + +use base qw(OpenSLX::OSExport::Distro::Base); + +use OpenSLX::Basics; + +################################################################################ +### implementation +################################################################################ +sub new +{ + my $class = shift; + my $self = { + 'base-name' => 'LinuxMint', + }; + return bless $self, $class; +} + +sub initDistroInfo +{ + my $self = shift; + + $self->{'export-filter'} = " + - /var/tmp/* + - /var/spool/* + - /var/run/* + + /var/run/screen + - /var/log/* + - /var/log/apt/* + + /var/log/apt + - /var/lib/*dm/* + - /var/lib/libnss-ldap/* + - /var/cache/apt/archives/* + + /var/cache/apt/archives/partial + - /var/cache/man/* + - /var/cache/nscd/* + - /usr/share/vmware/* + - /usr/share/autostart/trackerd.desktop + - /usr/share/autostart/*knetworkmanager*.desktop + - /usr/share/autostart/kaddressbookmigrator.desktop + - /usr/share/autostart/kab2kabc.desktop + - /usr/share/autostart/kwrited-autostart.desktop + - /etc/update-motd.d/90* + - /etc/update-motd.d/91* + - /etc/update-motd.d/98* + - /tmp/* + - /sys/* + - /proc/* + - /mnt/* + - /media/* + - /lib/udev/devices + - /initrd* + - /etc/cron.*/* + - /boot/initrd* + - /boot/grub + - /etc/xdg/compiz + - /etc/xdg/autostart/adept_notifier_auto.desktop + - /etc/xdg/autostart/evolution*alarm*notify* + - /etc/xdg/autostart/knetworkmanager* + - /etc/xdg/autostart/mint* + - /etc/xdg/autostart/nm-applet.desktop + - /etc/xdg/autostart/system-config-printer-applet-kde.desktop + - /etc/xdg/autostart/tracker* + - /etc/xdg/autostart/jockey-* + - /etc/xdg/autostart/ica* + - /etc/xdg/autostart/hplip* + - /etc/xdg/autostart/redhat* + - /etc/xdg/autostart/gnome-power-manager* + - /etc/xdg/autostart/update* + - /etc/xdg/update-notifier.desktop + - /etc/xdg/user-dirs-update-gtk.desktop + "; + return; +} + + +sub getSquashfsVersion +{ + my $self = shift; + my $distroVersion = shift; + + my %versionMap = ( + '10' => '4.0', + '11' => '4.0', + ); + + my $distroDefault = '4.0'; + + return $versionMap{$distroVersion} || $distroDefault; +} + + +1; diff --git a/src/installer/OpenSLX/OSSetup/Distro/LinuxMint.pm b/src/installer/OpenSLX/OSSetup/Distro/LinuxMint.pm deleted file mode 100644 index 84a80ee2..00000000 --- a/src/installer/OpenSLX/OSSetup/Distro/LinuxMint.pm +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright (c) 2011 - 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/ -# ----------------------------------------------------------------------------- -# OSSetup/Distro/LinuxMint.pm -# - provides LinuxMint-specific overrides of the OSSetup Distro API. -# ----------------------------------------------------------------------------- -package OpenSLX::OSSetup::Distro::LinuxMint; - -use strict; -use warnings; - -use base qw(OpenSLX::OSSetup::Distro::Base); - -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'} = 'dpkg'; - $self->{'meta-packager-type'} = $ENV{SLX_META_PACKAGER} || 'apt'; - $self->{'stage1c-faked-files'} = []; - return; -} - -sub preSystemInstallationHook -{ - my $self = shift; - - $self->SUPER::preSystemInstallationHook(); - - # fake required /dev-entries - my %devInfo = ( - mem => { type => 'c', major => '1', minor => '1' }, - null => { type => 'c', major => '1', minor => '3' }, - zero => { type => 'c', major => '1', minor => '5' }, - random => { type => 'c', major => '1', minor => '8' }, - urandom => { type => 'c', major => '1', minor => '9' }, - kmsg => { type => 'c', major => '1', minor => '11' }, - console => { type => 'c', major => '5', minor => '1' }, - ptmx => { type => 'c', major => '5', minor => '2' }, - ); - foreach my $dev (keys %devInfo) { - my $info = $devInfo{$dev}; - if (!-e "/dev/$dev") { - if (slxsystem( - "mknod /dev/$dev $info->{type} $info->{major} $info->{minor}" - )) { - croak(_tr("unable to create dev-node '%s'! (%s)", $dev, $!)); - } - } - } - foreach my $devDir ('pts', 'shm', '.udevdb', '.udev') { - if (!-e "/dev/$devDir") { - if (slxsystem("mkdir -p /dev/$devDir")) { - croak(_tr("unable to create dev-dir '%s'! (%s)", $devDir, $!)); - } - } - } - - # replace /usr/sbin/invoke-rc.d by a dummy, in order to avoid a whole lot - # of initscripts being started. Wishful thinking: there should be another - # way to stop LinuxMint from doing this, as this is not really very supportive - # of folder-based installations (then again: I may simply be too stupid - # to find out how it is supposed to work ...) - rename('/usr/sbin/invoke-rc.d', '/usr/sbin/_invoke-rc.d'); - spitFile('/usr/sbin/invoke-rc.d', "#! /bin/sh\nexit 0\n"); - chmod 0755, '/usr/sbin/invoke-rc.d'; -} - -sub startSession -{ - my $self = shift; - my $osDir = shift; - - $self->SUPER::startSession($osDir); - - # As in preSystemInstallationHook, we replace /usr/sbin/invoke-rc.d by a - # dummy. - # - # During installation, this might not exist yet, so we better check - if (-e '/usr/sbin/invoke-rc.d') { - rename('/usr/sbin/invoke-rc.d', '/usr/sbin/_invoke-rc.d'); - spitFile('/usr/sbin/invoke-rc.d', "#! /bin/sh\nexit 0\n"); - chmod 0755, '/usr/sbin/invoke-rc.d'; - } -} - -sub finishSession -{ - my $self = shift; - - # restore /usr/sbin/invoke-rc.d - rename('/usr/sbin/_invoke-rc.d', '/usr/sbin/invoke-rc.d'); - - $self->SUPER::finishSession(); -} - -1; diff --git a/src/installer/OpenSLX/OSSetup/Distro/Linuxmint.pm b/src/installer/OpenSLX/OSSetup/Distro/Linuxmint.pm new file mode 100644 index 00000000..761513da --- /dev/null +++ b/src/installer/OpenSLX/OSSetup/Distro/Linuxmint.pm @@ -0,0 +1,119 @@ +# Copyright (c) 2011 - 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/ +# ----------------------------------------------------------------------------- +# OSSetup/Distro/LinuxMint.pm +# - provides LinuxMint-specific overrides of the OSSetup Distro API. +# ----------------------------------------------------------------------------- +package OpenSLX::OSSetup::Distro::Linuxmint; + +use strict; +use warnings; + +use base qw(OpenSLX::OSSetup::Distro::Base); + +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'} = 'dpkg'; + $self->{'meta-packager-type'} = $ENV{SLX_META_PACKAGER} || 'apt'; + $self->{'stage1c-faked-files'} = []; + return; +} + +sub preSystemInstallationHook +{ + my $self = shift; + + $self->SUPER::preSystemInstallationHook(); + + # fake required /dev-entries + my %devInfo = ( + mem => { type => 'c', major => '1', minor => '1' }, + null => { type => 'c', major => '1', minor => '3' }, + zero => { type => 'c', major => '1', minor => '5' }, + random => { type => 'c', major => '1', minor => '8' }, + urandom => { type => 'c', major => '1', minor => '9' }, + kmsg => { type => 'c', major => '1', minor => '11' }, + console => { type => 'c', major => '5', minor => '1' }, + ptmx => { type => 'c', major => '5', minor => '2' }, + ); + foreach my $dev (keys %devInfo) { + my $info = $devInfo{$dev}; + if (!-e "/dev/$dev") { + if (slxsystem( + "mknod /dev/$dev $info->{type} $info->{major} $info->{minor}" + )) { + croak(_tr("unable to create dev-node '%s'! (%s)", $dev, $!)); + } + } + } + foreach my $devDir ('pts', 'shm', '.udevdb', '.udev') { + if (!-e "/dev/$devDir") { + if (slxsystem("mkdir -p /dev/$devDir")) { + croak(_tr("unable to create dev-dir '%s'! (%s)", $devDir, $!)); + } + } + } + + # replace /usr/sbin/invoke-rc.d by a dummy, in order to avoid a whole lot + # of initscripts being started. Wishful thinking: there should be another + # way to stop LinuxMint from doing this, as this is not really very supportive + # of folder-based installations (then again: I may simply be too stupid + # to find out how it is supposed to work ...) + rename('/usr/sbin/invoke-rc.d', '/usr/sbin/_invoke-rc.d'); + spitFile('/usr/sbin/invoke-rc.d', "#! /bin/sh\nexit 0\n"); + chmod 0755, '/usr/sbin/invoke-rc.d'; +} + +sub startSession +{ + my $self = shift; + my $osDir = shift; + + $self->SUPER::startSession($osDir); + + # As in preSystemInstallationHook, we replace /usr/sbin/invoke-rc.d by a + # dummy. + # + # During installation, this might not exist yet, so we better check + if (-e '/usr/sbin/invoke-rc.d') { + rename('/usr/sbin/invoke-rc.d', '/usr/sbin/_invoke-rc.d'); + spitFile('/usr/sbin/invoke-rc.d', "#! /bin/sh\nexit 0\n"); + chmod 0755, '/usr/sbin/invoke-rc.d'; + } +} + +sub finishSession +{ + my $self = shift; + + # restore /usr/sbin/invoke-rc.d + rename('/usr/sbin/_invoke-rc.d', '/usr/sbin/invoke-rc.d'); + + $self->SUPER::finishSession(); +} + +1; -- cgit v1.2.3-55-g7522