diff options
Diffstat (limited to 'installer/OpenSLX/OSSetup/Engine.pm')
| -rw-r--r-- | installer/OpenSLX/OSSetup/Engine.pm | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/installer/OpenSLX/OSSetup/Engine.pm b/installer/OpenSLX/OSSetup/Engine.pm index 6846eef6..82ab6163 100644 --- a/installer/OpenSLX/OSSetup/Engine.pm +++ b/installer/OpenSLX/OSSetup/Engine.pm @@ -111,6 +111,7 @@ sub DESTROY kill TERM => $pid; } } + return; } sub initialize @@ -206,6 +207,7 @@ sub initialize $self->createPackager(); $self->createMetaPackager(); } + return; } sub installVendorOS @@ -264,6 +266,7 @@ sub installVendorOS $self->touchVendorOS(); $self->addInstalledVendorOSToConfigDB(); + return; } sub cloneVendorOS @@ -346,6 +349,7 @@ sub cloneVendorOS $self->touchVendorOS(); $self->addInstalledVendorOSToConfigDB(); + return; } sub updateVendorOS @@ -371,6 +375,7 @@ sub updateVendorOS 0, _tr("Vendor-OS '%s' updated succesfully.\n", $self->{'vendor-os-name'}) ); + return; } sub startChrootedShellForVendorOS @@ -401,6 +406,7 @@ sub startChrootedShellForVendorOS $self->{'vendor-os-name'} ) ); + return; } sub callChrootedFunctionForVendorOS @@ -432,6 +438,7 @@ sub callChrootedFunctionForVendorOS $self->{'vendor-os-name'} ) ); + return; } sub removeVendorOS @@ -458,6 +465,7 @@ sub removeVendorOS ); } $self->removeVendorOSFromConfigDB(); + return; } sub addInstalledVendorOSToConfigDB @@ -517,6 +525,7 @@ sub addInstalledVendorOSToConfigDB } $openslxDB->disconnect(); + return; } sub removeVendorOSFromConfigDB @@ -563,6 +572,7 @@ sub removeVendorOSFromConfigDB } $openslxDB->disconnect(); + return; } ################################################################################ @@ -643,6 +653,7 @@ sub readDistroInfo } } } + return; } sub createVendorOSPath @@ -653,6 +664,7 @@ sub createVendorOSPath die _tr("unable to create directory '%s', giving up! (%s)\n", $self->{'vendor-os-path'}, $!); } + return; } sub touchVendorOS @@ -663,6 +675,7 @@ sub touchVendorOS # 'age' of the vendor-OS when trying to determine whether or not we # need to re-export this vendor-OS: slxsystem("touch $self->{'vendor-os-path'}"); + return; } sub createPackager @@ -674,6 +687,7 @@ sub createPackager my $packager = instantiateClass($packagerClass); $packager->initialize($self); $self->{'packager'} = $packager; + return; } sub createMetaPackager @@ -695,6 +709,7 @@ sub createMetaPackager my $metaPackager = instantiateClass($metaPackagerClass); $metaPackager->initialize($self); $self->{'meta-packager'} = $metaPackager; + return; } sub sortRepositoryURLs @@ -812,6 +827,7 @@ sub startLocalURLServersAsNeeded $port++; } } + return; } sub setupStage1A @@ -837,6 +853,7 @@ sub setupStage1A $self->stage1A_copyPrerequiredFiles(); $self->stage1A_copyTrustedPackageKeys(); $self->stage1A_createRequiredFiles(); + return; } sub stage1A_createBusyboxEnvironment @@ -892,6 +909,7 @@ sub stage1A_createBusyboxEnvironment } $self->stage1A_setupResolver($libcFolder); + return; } sub stage1A_setupResolver @@ -911,6 +929,7 @@ sub stage1A_setupResolver my $stage1cDir = "$self->{'stage1aDir'}/$self->{'stage1bSubdir'}/$self->{'stage1cSubdir'}"; copyFile('/etc/resolv.conf', "$stage1cDir/etc"); + return; } sub stage1A_copyPrerequiredFiles @@ -933,6 +952,7 @@ sub stage1A_copyPrerequiredFiles ); } $self->{distro}->fixPrerequiredFiles($stage1cDir); + return; } sub stage1A_copyTrustedPackageKeys @@ -964,6 +984,7 @@ sub stage1A_copyTrustedPackageKeys copyFile("$keyDir/pubring.gpg", "$stage1cDir/usr/lib/rpm/gnupg"); } } + return; } sub stage1A_createRequiredFiles @@ -992,6 +1013,7 @@ sub stage1A_createRequiredFiles "unable to create node '%s' (%s)\n", "$stage1cDir/dev/null", $! ); } + return; } sub setupStage1B @@ -1000,6 +1022,7 @@ sub setupStage1B vlog(1, "setting up stage1b for $self->{'vendor-os-name'}..."); $self->stage1B_chrootAndBootstrap(); + return; } sub stage1B_chrootAndBootstrap @@ -1039,6 +1062,7 @@ sub stage1B_chrootAndBootstrap my @bootstrapPkgs = $self->downloadBaseFiles(\@pkgs); my @allPkgs = (@prereqPkgs, @bootstrapPrereqPkgs, @bootstrapPkgs); $self->{'bootstrap-packages'} = \@allPkgs; + return; } sub setupStage1C @@ -1047,6 +1071,7 @@ sub setupStage1C vlog(1, "setting up stage1c for $self->{'vendor-os-name'}..."); $self->stage1C_chrootAndInstallBasicVendorOS(); + return; } sub stage1C_chrootAndInstallBasicVendorOS @@ -1080,6 +1105,7 @@ sub stage1C_chrootAndInstallBasicVendorOS $self->{packager}->installPackages( $self->{'bootstrap-packages'}, $stage1cDir ); + return; } sub stage1C_cleanupBasicVendorOS @@ -1100,6 +1126,7 @@ sub stage1C_cleanupBasicVendorOS $self->{stage1aDir}, $! ); } + return; } sub setupStage1D @@ -1113,6 +1140,7 @@ sub setupStage1D $self->stage1D_setupPackageSources(); $self->stage1D_updateBasicVendorOS(); $self->stage1D_installPackageSelection(); + return; } sub updateStage1D @@ -1124,6 +1152,7 @@ sub updateStage1D chrootInto($self->{'vendor-os-path'}); $self->stage1D_updateBasicVendorOS(); + return; } sub startChrootedShellInStage1D @@ -1144,6 +1173,7 @@ sub startChrootedShellInStage1D $self->{'distro'}->updateDistroConfig(); $self->{'meta-packager'}->finishSession(); + return; } sub callChrootedFunctionInStage1D @@ -1160,6 +1190,7 @@ sub callChrootedFunctionInStage1D $self->{'distro'}->updateDistroConfig(); $self->{'meta-packager'}->finishSession(); + return; } sub stage1D_setupPackageSources @@ -1176,6 +1207,7 @@ sub stage1D_setupPackageSources vlog(2, "setting up package source $rk..."); $self->{'meta-packager'}->setupPackageSource($rk, $repo, $excludeList); } + return; } sub stage1D_updateBasicVendorOS @@ -1187,6 +1219,7 @@ sub stage1D_updateBasicVendorOS $self->{'meta-packager'}->updateBasicVendorOS(); $self->{'distro'}->updateDistroConfig(); $self->{'meta-packager'}->finishSession(); + return; } sub stage1D_installPackageSelection @@ -1223,6 +1256,7 @@ sub stage1D_installPackageSelection } $self->{'distro'}->updateDistroConfig(); $self->{'meta-packager'}->finishSession(); + return; } sub clone_fetchSource @@ -1255,6 +1289,7 @@ sub clone_fetchSource or croak _tr( "unable to clone from source '%s', giving up! (%s)\n", $source, $! ); + return; } sub clone_determineIncludeExcludeList @@ -1292,6 +1327,7 @@ sub changePersonalityIfNeeded syscall &SYS_personality, PER_LINUX32(); } + return; } sub hostIs64Bit @@ -1332,6 +1368,7 @@ sub chrootInto or die _tr("unable to chroot into '%s' (%s)\n", $osDir, $!); $ENV{PATH} = "/bin:/sbin:/usr/bin:/usr/sbin"; + return; } 1; |