From 2ddbcd32c1262791ff9a8a0367063e2332aea903 Mon Sep 17 00:00:00 2001 From: Michael Janczyk Date: Thu, 22 Nov 2012 12:37:46 +0100 Subject: change config structure: - old config, which was based only on stage3 wasn't modified. Only the directory has changed to /config/stage3 - stage1 config, which wasn't possible this way before, can be done now in /config/stage1 - the default/rootfs directory will be used for every vendor-OS - /config/stage1//rootfs will be used for the corresponding vendor-OS - so after a clone/install/update of stage1 the dafault config will be rsynced and after that the vendor-OS specific config will be rsynced. At the end the plugins will be installed. - This is all part of slxos-setup. ' --- src/lib/OpenSLX/ConfigFolder.pm | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) (limited to 'src/lib') diff --git a/src/lib/OpenSLX/ConfigFolder.pm b/src/lib/OpenSLX/ConfigFolder.pm index fd52821e..ac5d9325 100644 --- a/src/lib/OpenSLX/ConfigFolder.pm +++ b/src/lib/OpenSLX/ConfigFolder.pm @@ -21,7 +21,9 @@ $VERSION = 1.01; @EXPORT = qw( &createConfigFolderForDefaultSystem + &createConfigFolderForDefaultVendorOS &createConfigFolderForSystem + &createConfigFolderForVendorOS ); =head1 NAME @@ -66,7 +68,8 @@ required folders & files already existed. sub createConfigFolderForDefaultSystem { my $result = 0; - my $defaultConfigPath = "$openslxConfig{'private-path'}/config/default"; + my $defaultConfigPath = + "$openslxConfig{'private-path'}/config/stage3/default"; if (!-e "$defaultConfigPath/initramfs") { slxsystem("mkdir -p $defaultConfigPath/initramfs"); $result = 1; @@ -111,6 +114,18 @@ sub createConfigFolderForDefaultSystem return $result; } +sub createConfigFolderForDefaultVendorOS +{ + my $result = 0; + my $defaultConfigPath = + "$openslxConfig{'private-path'}/config/stage1/default"; + if (!-e "$defaultConfigPath/rootfs") { + slxsystem("mkdir -p $defaultConfigPath/rootfs"); + $result = 1; + } + return $result; +} + =item B Creates the configuration folder for the system whose name has been given in @@ -135,7 +150,7 @@ sub createConfigFolderForSystem my $result = 0; my $systemConfigPath - = "$openslxConfig{'private-path'}/config/$systemName/default"; + = "$openslxConfig{'private-path'}/config/stage3/$systemName/default"; if (!-e "$systemConfigPath/initramfs") { slxsystem("mkdir -p $systemConfigPath/initramfs"); $result = 1; @@ -147,6 +162,20 @@ sub createConfigFolderForSystem return $result; } +sub createConfigFolderForVendorOS +{ + my $vendorOSName = shift || confess "need to pass in system-name!"; + + my $result = 0; + my $vendorOSConfigPath + = "$openslxConfig{'private-path'}/config/stage1/$vendorOSName"; + if (!-e "$vendorOSConfigPath") { + slxsystem("mkdir -p $vendorOSConfigPath/rootfs"); + $result = 1; + } + return $result; +} + =back =cut -- cgit v1.2.3-55-g7522