diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/OpenSLX/Basics.pm | 6 | ||||
| -rw-r--r-- | lib/distro-info/fedora-6/settings.local.example | 6 | ||||
| -rw-r--r-- | lib/distro-info/fedora-6_x86_64/settings.local.example | 6 | ||||
| -rw-r--r-- | lib/distro-info/suse-10.1/settings.local.example | 2 | ||||
| -rw-r--r-- | lib/distro-info/suse-10.1_x86_64/settings.local.example | 2 | ||||
| -rw-r--r-- | lib/distro-info/suse-10.2/settings.local.example | 2 | ||||
| -rw-r--r-- | lib/distro-info/suse-10.2_x86_64/settings.local.example | 2 |
7 files changed, 20 insertions, 6 deletions
diff --git a/lib/OpenSLX/Basics.pm b/lib/OpenSLX/Basics.pm index f673d279..fad4903a 100644 --- a/lib/OpenSLX/Basics.pm +++ b/lib/OpenSLX/Basics.pm @@ -164,8 +164,10 @@ sub openslxInit # try to read and evaluate config files: my $configPath = $cmdlineConfig{'config-path'} || $openslxConfig{'config-path'}; - foreach my $f ("$configPath/settings.default", - "$configPath/settings.local", + my $sharePath = $cmdlineConfig{'share-path'} + || $openslxConfig{'share-path'}; + foreach my $f ("$sharePath/settings.default", + "$configPath/settings", "$ENV{HOME}/.openslx/settings") { next unless open(CONFIG, "<$f"); if ($cmdlineConfig{'verbose-level'} >= 2) { diff --git a/lib/distro-info/fedora-6/settings.local.example b/lib/distro-info/fedora-6/settings.local.example index b41c94f8..5fbe942d 100644 --- a/lib/distro-info/fedora-6/settings.local.example +++ b/lib/distro-info/fedora-6/settings.local.example @@ -1,6 +1,8 @@ +# copy this file to 'settings' and edit it as you please + # use local installation sources -$repository{'base'}->{'url'} = "local://localhost:5080/srv/ftp/pub/opensuse/distribution/SL-10.1/inst-source"; -$repository{'base_update'}->{'url'} = "local://localhost:5082/srv/ftp/pub/suse/update/10.1"; +$repository{'base'}->{'url'} = "local://localhost:5080/srv/ftp/pub/pub/linux/fedora/linux/core/6/i386/os"; +$repository{'base_update'}->{'url'} = "local://localhost:5082/srv/ftp/pub/linux/fedora/linux/core/updates/6/i386/"; # Add a new selection: # $selection{'my-kde'} = "$selection{default} diff --git a/lib/distro-info/fedora-6_x86_64/settings.local.example b/lib/distro-info/fedora-6_x86_64/settings.local.example index b41c94f8..5e4fec32 100644 --- a/lib/distro-info/fedora-6_x86_64/settings.local.example +++ b/lib/distro-info/fedora-6_x86_64/settings.local.example @@ -1,6 +1,8 @@ +# copy this file to 'settings' and edit it as you please + # use local installation sources -$repository{'base'}->{'url'} = "local://localhost:5080/srv/ftp/pub/opensuse/distribution/SL-10.1/inst-source"; -$repository{'base_update'}->{'url'} = "local://localhost:5082/srv/ftp/pub/suse/update/10.1"; +$repository{'base'}->{'url'} = "local://localhost:5080/srv/ftp/pub/pub/linux/fedora/linux/core/6/x86_64/os"; +$repository{'base_update'}->{'url'} = "local://localhost:5082/srv/ftp/pub/linux/fedora/linux/core/updates/6/x86_64/"; # Add a new selection: # $selection{'my-kde'} = "$selection{default} diff --git a/lib/distro-info/suse-10.1/settings.local.example b/lib/distro-info/suse-10.1/settings.local.example index 3588750a..d56f393a 100644 --- a/lib/distro-info/suse-10.1/settings.local.example +++ b/lib/distro-info/suse-10.1/settings.local.example @@ -1,3 +1,5 @@ +# copy this file to 'settings' and edit it as you please + # use local installation sources $repository{'base'}->{'url'} = "local://localhost:5080/srv/ftp/pub/opensuse/distribution/SL-10.1/inst-source"; $repository{'base_non-oss'}->{'url'} = "local://localhost:5081/srv/ftp/pub/opensuse/distribution/SL-10.1/non-oss-inst-source"; diff --git a/lib/distro-info/suse-10.1_x86_64/settings.local.example b/lib/distro-info/suse-10.1_x86_64/settings.local.example index 3588750a..d56f393a 100644 --- a/lib/distro-info/suse-10.1_x86_64/settings.local.example +++ b/lib/distro-info/suse-10.1_x86_64/settings.local.example @@ -1,3 +1,5 @@ +# copy this file to 'settings' and edit it as you please + # use local installation sources $repository{'base'}->{'url'} = "local://localhost:5080/srv/ftp/pub/opensuse/distribution/SL-10.1/inst-source"; $repository{'base_non-oss'}->{'url'} = "local://localhost:5081/srv/ftp/pub/opensuse/distribution/SL-10.1/non-oss-inst-source"; diff --git a/lib/distro-info/suse-10.2/settings.local.example b/lib/distro-info/suse-10.2/settings.local.example index d0afaa7f..7021fa6a 100644 --- a/lib/distro-info/suse-10.2/settings.local.example +++ b/lib/distro-info/suse-10.2/settings.local.example @@ -1,3 +1,5 @@ +# copy this file to 'settings' and edit it as you please + # use local installation sources $repository{'base'}->{'url'} = "local://localhost:5080/srv/ftp/pub/opensuse/distribution/10.2/repo/oss"; $repository{'base_non-oss'}->{'url'} = "local://localhost:5081/srv/ftp/pub/opensuse/distribution/10.2/repo/non-oss"; diff --git a/lib/distro-info/suse-10.2_x86_64/settings.local.example b/lib/distro-info/suse-10.2_x86_64/settings.local.example index d0afaa7f..7021fa6a 100644 --- a/lib/distro-info/suse-10.2_x86_64/settings.local.example +++ b/lib/distro-info/suse-10.2_x86_64/settings.local.example @@ -1,3 +1,5 @@ +# copy this file to 'settings' and edit it as you please + # use local installation sources $repository{'base'}->{'url'} = "local://localhost:5080/srv/ftp/pub/opensuse/distribution/10.2/repo/oss"; $repository{'base_non-oss'}->{'url'} = "local://localhost:5081/srv/ftp/pub/opensuse/distribution/10.2/repo/non-oss"; |