summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--boot-env/OpenSLX/BootEnvironment/PBS.pm8
-rwxr-xr-xboot-env/pbs/uclib-rootfs/init1
-rw-r--r--initramfs/distro-specs/ubuntu/functions-default38
-rw-r--r--os-plugins/plugins/profile/OpenSLX/Distro/Ubuntu_10.pm66
4 files changed, 93 insertions, 20 deletions
diff --git a/boot-env/OpenSLX/BootEnvironment/PBS.pm b/boot-env/OpenSLX/BootEnvironment/PBS.pm
index 2e7ef706..2072884b 100644
--- a/boot-env/OpenSLX/BootEnvironment/PBS.pm
+++ b/boot-env/OpenSLX/BootEnvironment/PBS.pm
@@ -92,12 +92,12 @@ sub writeBootloaderMenuFor
'systems' => $systemInfos
});
my $ua = LWP::UserAgent->new;
- my $res = $ua->request(POST 'http://pbs.lan/backend/system/sync', [data => $data_json]);
+ my $res = $ua->request(POST 'http://pbs.experimental.openslx.org/backend/system/sync', [data => $data_json]);
if ($res->is_success) {
my $resData = from_json($res->content);
if ($resData->{'getKernel'} eq 'fresh') {
- $res = $ua->request(POST 'http://pbs.lan/backend/system/addkernel',
+ $res = $ua->request(POST 'http://pbs.experimental.openslx.org/backend/system/addkernel',
['kernel' => basename($prebootSystemInfo->{'kernel-file'}),
'kernelFile' => ["$self->{'target-path'}/imagebase/vmlinuz"],
'initramfsFile' => ["$self->{'target-path'}/imagebase/initramfs"],
@@ -109,7 +109,7 @@ sub writeBootloaderMenuFor
} else {
if ($resData->{'getKernel'} eq 'update') {
- $res = $ua->request(POST 'http://pbs.lan/backend/system/updatekernel',
+ $res = $ua->request(POST 'http://pbs.experimental.openslx.org/backend/system/updatekernel',
['kernel' => basename($prebootSystemInfo->{'kernel-file'}),
'kernelFile' => ["$self->{'target-path'}/imagebase/vmlinuz"],
],
@@ -121,7 +121,7 @@ sub writeBootloaderMenuFor
# do nothing
}
if ($resData->{'getInitramfs'} eq 'update') {
- $res = $ua->request(POST 'http://pbs.lan/backend/system/updateinitramfs',
+ $res = $ua->request(POST 'http://pbs.experimental.openslx.org/backend/system/updateinitramfs',
['kernel' => basename($prebootSystemInfo->{'kernel-file'}),
'initramfsFile' => ["$self->{'target-path'}/imagebase/initramfs"],
],
diff --git a/boot-env/pbs/uclib-rootfs/init b/boot-env/pbs/uclib-rootfs/init
index 0706dab8..847cad87 100755
--- a/boot-env/pbs/uclib-rootfs/init
+++ b/boot-env/pbs/uclib-rootfs/init
@@ -209,7 +209,6 @@ echo "macaddr=$macaddr" >>/etc/initramfs-setup
# user choose what kind of SLX client he wants to get
dialog --infobox "Fetching preboot interactive part and configuration from \
the net ($boot_uri) ..." 4 65
-echo -e "192.168.2.100\t pbs.lan" > /etc/hosts
mkdir -p /preboot
wget -q -O /preboot/preboot.init ${boot_uri}bootloader/env/getinit/formedia/$PBS_ID
chmod u+x /preboot/preboot.init
diff --git a/initramfs/distro-specs/ubuntu/functions-default b/initramfs/distro-specs/ubuntu/functions-default
index bfd01524..475290bb 100644
--- a/initramfs/distro-specs/ubuntu/functions-default
+++ b/initramfs/distro-specs/ubuntu/functions-default
@@ -82,23 +82,31 @@ rllinker () {
local script="$1"
# activating the new way, check if a appropriate script is available, else
# try the traditional approach
-if [ -e /mnt/etc/init.inactive/${script}.conf ] ; then
- mv /mnt/etc/init.inactive/${script}.conf /mnt/etc/init
-elif [ -e /mnt/etc/init.d/${script} -a -n "$1" -a -n "$2" ] ; then
- if [ $2 -lt 10 ] ; then
- local start="0$2"; else local start="$2"
- fi
- if [ $3 -lt 10 ] ; then
- local stop="0$3"; else local stop="$3"
- fi
- for i in rc2.d/K$stop$script rc3.d/K$stop$script \
- rc2.d/S$start$script rc3.d/S$start$script ; do
- ln -sf ../init.d/$script /mnt/etc/$i
- [ "$DEBUGLEVEL" == 5 ] && echo "Linked $script"
- done
+
+if [ -e /mnt/etc/init.inactive/${script}.conf -o -e /mnt/etc/init/${script}.conf ]; then
+ # we have upstart scripts
+ if [ -e /mnt/etc/init.inactive/${script}.conf ] ; then
+ mv /mnt/etc/init.inactive/${script}.conf /mnt/etc/init
+ fi
+elif [ -e /mnt/etc/init.d/${script} ]; then
+ # we old rc scripts
+ if [ -e /mnt/etc/init.d/${script} -a -n "$1" -a -n "$2" ] ; then
+ if [ $2 -lt 10 ] ; then
+ local start="0$2"; else local start="$2"
+ fi
+ if [ $3 -lt 10 ] ; then
+ local stop="0$3"; else local stop="$3"
+ fi
+ for i in rc2.d/K$stop$script rc3.d/K$stop$script \
+ rc2.d/S$start$script rc3.d/S$start$script ; do
+ ln -sf ../init.d/$script /mnt/etc/$i
+ [ "$DEBUGLEVEL" == 5 ] && echo "Linked $script"
+ done
+ fi
else
- error echo "Target $(pwd)../${script} does not exist. Skipping links."
+ error "Script: ${script} does not exist. Skipping setup of startscipts/events.." nonfatal
fi
+
}
# set up localization like keytable, console
diff --git a/os-plugins/plugins/profile/OpenSLX/Distro/Ubuntu_10.pm b/os-plugins/plugins/profile/OpenSLX/Distro/Ubuntu_10.pm
new file mode 100644
index 00000000..3b288e97
--- /dev/null
+++ b/os-plugins/plugins/profile/OpenSLX/Distro/Ubuntu_10.pm
@@ -0,0 +1,66 @@
+# 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/Ubuntu.pm
+# - provides Debian-specific overrides of the Distro API for the profile
+# plugin.
+# -----------------------------------------------------------------------------
+package profile::OpenSLX::Distro::Ubuntu_10;
+
+use strict;
+use warnings;
+
+use base qw(profile::OpenSLX::Distro::Base);
+
+use OpenSLX::Basics;
+use OpenSLX::Utils;
+
+################################################################################
+### interface methods
+################################################################################
+
+sub _getKdeHomeMap
+{
+ my $self = shift;
+
+ return;
+}
+
+sub getProfileDPAth
+{
+ my $self = shift;
+
+
+ return "/etc/profile.d/slx-kdehome.sh";
+}
+
+sub getKdeHome
+{
+ my $self = shift;
+
+ return ".openslx/ubuntu-lucid.kde";
+}
+
+sub getGconfPathConfig
+{
+ my $self = shift;
+
+ return "/etc/gconf/2/path";
+}
+
+
+sub getGconfHome
+{
+ my $self = shift;
+
+ return ".openslx.ubuntu-lucid.gconf";
+}
+
+1;
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2026-05-07 15:58:25 +0200