summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--initramfs/distro-specs/ubuntu/functions-default4
-rwxr-xr-xinitramfs/stage3-stuff/bin/hwautocfg1
-rw-r--r--initramfs/stage3-stuff/etc/messages3
-rw-r--r--initramfs/stage3-stuff/etc/messages.de1
-rw-r--r--installer/OpenSLX/OSExport/Distro/Suse.pm3
-rw-r--r--installer/OpenSLX/OSExport/Distro/Ubuntu.pm3
-rw-r--r--os-plugins/plugins/bootsplash/XX_bootsplash.sh19
-rw-r--r--os-plugins/plugins/syslog/OpenSLX/OSPlugin/syslog.pm18
-rw-r--r--os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm2
9 files changed, 50 insertions, 4 deletions
diff --git a/initramfs/distro-specs/ubuntu/functions-default b/initramfs/distro-specs/ubuntu/functions-default
index 11d82e9a..1a863966 100644
--- a/initramfs/distro-specs/ubuntu/functions-default
+++ b/initramfs/distro-specs/ubuntu/functions-default
@@ -258,8 +258,12 @@ fi
}
# start portmapper (needed at least for nfsN and nis services)
config_portmap () {
+if [ -f /mnt/etc/init.inactive/portmap.conf ]; then
mv /mnt/etc/init.inactive/portmap.conf /mnt/etc/init
mv /mnt/etc/init.inactive/statd.conf /mnt/etc/init
+else
+ error "$df_errpmap" nonfatal
+fi
}
# mostly unused yet (needs to be properly integrated)
config_nfs () {
diff --git a/initramfs/stage3-stuff/bin/hwautocfg b/initramfs/stage3-stuff/bin/hwautocfg
index fdf9f485..b21cf776 100755
--- a/initramfs/stage3-stuff/bin/hwautocfg
+++ b/initramfs/stage3-stuff/bin/hwautocfg
@@ -28,6 +28,7 @@ done
echo "0 0 0 0" >/proc/sys/kernel/printk
echo "/sbin/mdev" >/proc/sys/kernel/hotplug
modprobe -a ${MODPRV} usbhid hid-bright 2>/dev/null &
+# check from vga= that the traditional framebuffer is needed e.g. for splashy
# get information on the graphics adaptor if bootsplash or xserver plugins are
# present and the new drm/kms infrastructure is present
if strinfile "vga=" /proc/cmdline; then
diff --git a/initramfs/stage3-stuff/etc/messages b/initramfs/stage3-stuff/etc/messages
index 8c362144..81748642 100644
--- a/initramfs/stage3-stuff/etc/messages
+++ b/initramfs/stage3-stuff/etc/messages
@@ -153,13 +153,14 @@ is needed\n for the bootup procedure to follow. If upstart is used instead no \
inittab\n is needed any more, but a proper configured events.d."
df_errumod=" Failed to load the \"unix\" module. Problems with Hardware \
detection\nwill probably arise."
-df_errserv="seems not to be installed or start script is\n not available\
+df_errserv=" seems not to be installed or start script is\n not available\
so requesting the start of service make no sense. Please\n disable service\
or install the files/packages needed."
df_errcron=" The cron start script $df_errserv"
df_errsysl=" The syslog start script $df_errserv"
df_errsshd=" The sshd start script $df_errserv"
df_erryp=" The NIS client $df_errserv"
+df_errpmap=" The portmapper $df_errserv"
df_erramnt=" Automounter $df_errserv"
df_errnsc=" Name Service caching deamon $df_errserv\n This service might \
be useful to take load from a ldap user directory."
diff --git a/initramfs/stage3-stuff/etc/messages.de b/initramfs/stage3-stuff/etc/messages.de
index 0d68b551..a1ff5149 100644
--- a/initramfs/stage3-stuff/etc/messages.de
+++ b/initramfs/stage3-stuff/etc/messages.de
@@ -169,6 +169,7 @@ df_errcron=" Das cron Start-Skript $df_errserv"
df_errsysl=" Das syslog Start-Skript $df_errserv"
df_errsshd=" Das sshd Start-Skript $df_errserv"
df_erryp=" Der NIS-Klient $df_errserv"
+df_errpmap=" Der Portmapper $df_errserv"
df_erramnt=" Der Automounter $df_errserv"
df_errnsc=" Der Name Service Zwischenspeicherungs Daemon $df_errserv\n \
Dieser Dienst koennte nuetzlich sein, um Daten von einem ldap Benutzer-\
diff --git a/installer/OpenSLX/OSExport/Distro/Suse.pm b/installer/OpenSLX/OSExport/Distro/Suse.pm
index 4378224a..586cf51a 100644
--- a/installer/OpenSLX/OSExport/Distro/Suse.pm
+++ b/installer/OpenSLX/OSExport/Distro/Suse.pm
@@ -96,6 +96,9 @@ sub initDistroInfo
- */autostart/beagle*.desktop
- */autostart/gpk-update-icon*.desktop
- */autostart/kupdateapplet.desktop
+ - */config/SuSE/default/kupdateapplet.*
+ - */config/SuSE/default/*.live
+ - */config/SuSE/default/*beagle*
- /mnt/*
- /media/*
+ /media
diff --git a/installer/OpenSLX/OSExport/Distro/Ubuntu.pm b/installer/OpenSLX/OSExport/Distro/Ubuntu.pm
index 566817b8..a1e477d5 100644
--- a/installer/OpenSLX/OSExport/Distro/Ubuntu.pm
+++ b/installer/OpenSLX/OSExport/Distro/Ubuntu.pm
@@ -53,6 +53,9 @@ sub initDistroInfo
- /usr/share/vmware/*
- /usr/share/autostart/trackerd.desktop
- /usr/share/autostart/knetworkmanager.desktop
+ - /etc/update-motd.d/90*
+ - /etc/update-motd.d/91*
+ - /etc/update-motd.d/98*
- /tmp/*
- /sys/*
- /proc/*
diff --git a/os-plugins/plugins/bootsplash/XX_bootsplash.sh b/os-plugins/plugins/bootsplash/XX_bootsplash.sh
index 924d304c..c405d735 100644
--- a/os-plugins/plugins/bootsplash/XX_bootsplash.sh
+++ b/os-plugins/plugins/bootsplash/XX_bootsplash.sh
@@ -32,6 +32,25 @@ if [ -e /initramfs/plugin-conf/bootsplash.conf ]; then
chmod 744 /mnt/etc/init.d/bootsplash.halt
cp -a /etc/splashy /mnt/etc/
rllinker "bootsplash.halt" 1 1
+
+ # fix for ubuntu 1004+
+ for i in init init.inactive; do
+ for j in kdm gdm xdm lxdm; do
+ dmfile=/mnt/etc/${i}/${j}.conf
+ if [ -f $dmfile ]; then
+ sed -e "s,^script.*,script\n\t#0x42#," \
+ -e "s,#0x42#,# shutdown splashy - added by splashy plugin\n\t#0x42#," \
+ -e "s,#0x42#,if [ ! -e /var/run/splashy-killed ]; then\n\t#0x42#, " \
+ -e "s,#0x42#, LD_LIBRARY_PATH=/opt/openslx/uclib-rootfs/lib/ \\\\\n\t#0x42#," \
+ -e "s,#0x42#, /opt/openslx/plugin-repo/bootsplash/bin/splashy_update exit \\\\\n\t#0x42#," \
+ -e "s,#0x42#, 2>/dev/null \n\t#0x42#," \
+ -e "s,#0x42#, touch /var/run/splashy-killed \n\t#0x42#," \
+ -e "s,#0x42#,fi \n\t#0x42#," \
+ -e "s,#0x42#,#splashy-stop-done#," \
+ -i $dmfile 2>/dev/null &
+ fi
+ done
+ done
fi
fi
fi
diff --git a/os-plugins/plugins/syslog/OpenSLX/OSPlugin/syslog.pm b/os-plugins/plugins/syslog/OpenSLX/OSPlugin/syslog.pm
index 2952f2e7..87c3d9e5 100644
--- a/os-plugins/plugins/syslog/OpenSLX/OSPlugin/syslog.pm
+++ b/os-plugins/plugins/syslog/OpenSLX/OSPlugin/syslog.pm
@@ -127,7 +127,7 @@ sub installationPhase
my $engine = $self->{'os-plugin-engine'};
if ($self->{kind} eq 'rsyslog' && !isInPath($self->{distro}->getBinaryName('rsyslog'))) {
- $engine->installPackages($self->{distro}->getPackageName('syslog-ng'));
+ $engine->installPackages($self->{distro}->getPackageName('rsyslog'));
}
if ($self->{kind} eq 'syslog-ng' && !isInPath('syslog-ng')) {
@@ -190,7 +190,21 @@ sub _setupRsyslog
my $self = shift;
my $attrs = shift;
- return;
+ my $repoPath = $self->{pluginRepositoryPath};
+
+ my $kind = lc($attrs->{'syslog::kind'});
+ my $rlInfo = $self->{distro}->runlevelInfo($kind);
+
+ my $conf = unshiftHereDoc(<<" End-of-Here");
+ #!/bin/ash
+ # written by OpenSLX-plugin 'syslog'
+
+ rllinker $rlInfo->{scriptName} $rlInfo->{startAt} $rlInfo->{stopAt}
+
+ End-of-Here
+ spitFile("$repoPath/syslog.sh", $conf);
+
+ return;
}
sub _setupSyslogNG
diff --git a/os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm b/os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm
index 29342f3b..7a706019 100644
--- a/os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm
+++ b/os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm
@@ -41,6 +41,7 @@ sub setupXserverScript
# add stuff to the script generated via Base.pm
$script .= unshiftHereDoc(<<' End-of-Here');
# SuSE specific extension to stage3 xserver.sh
+ testmkd /mnt/etc/X11/xorg.conf.d
# Add InputClass to proper setup the keyboard and other input
echo 'Section "InputClass"
Identifier "evdev pointer catchall"
@@ -75,7 +76,6 @@ sub setupXserverScript
# Xorg hardware is autodetected, so no module information provided
[ -z "${xmodule}" ] && \
sed "/Section \"Device\"/,/EndSection/d" -i ${xfc}
- testmkd /mnt/etc/X11/xorg.conf.d
testmkd /mnt/var/lib/xkb/compiled
testmkd /mnt/var/lib/X11
testmkd /mnt/var/lib/xdm/authdir/authfiles 0700
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2024-06-04 14:20:45 +0200