diff options
Diffstat (limited to 'os-plugins')
| -rw-r--r-- | os-plugins/plugins/bootsplash/XX_bootsplash.sh | 19 | ||||
| -rw-r--r-- | os-plugins/plugins/syslog/OpenSLX/OSPlugin/syslog.pm | 18 | ||||
| -rw-r--r-- | os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm | 2 |
3 files changed, 36 insertions, 3 deletions
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 |