summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorjoe2012-08-22 15:03:19 +0200
committerjoe2012-08-22 15:03:19 +0200
commitd942e3a5eaaf18b7ad682845320925d5c5e4de77 (patch)
tree71cfa9e89b339aa65ce3d3ef95909c203d97b9a6 /src
parentfix typo (diff)
downloadcore-d942e3a5eaaf18b7ad682845320925d5c5e4de77.tar.gz
core-d942e3a5eaaf18b7ad682845320925d5c5e4de77.tar.xz
core-d942e3a5eaaf18b7ad682845320925d5c5e4de77.zip
plymouth plugin updated to set the theme to the target system
Diffstat (limited to 'src')
-rw-r--r--src/os-plugins/plugins/plymouth/OpenSLX/OSPlugin/plymouth.pm10
-rw-r--r--src/os-plugins/plugins/plymouth/XX_plymouth.sh3
-rw-r--r--src/os-plugins/plugins/plymouth/init-hooks/40-started-hw-config/plymouth.sh3
3 files changed, 15 insertions, 1 deletions
diff --git a/src/os-plugins/plugins/plymouth/OpenSLX/OSPlugin/plymouth.pm b/src/os-plugins/plugins/plymouth/OpenSLX/OSPlugin/plymouth.pm
index 34b6241c..8bdd2138 100644
--- a/src/os-plugins/plugins/plymouth/OpenSLX/OSPlugin/plymouth.pm
+++ b/src/os-plugins/plugins/plymouth/OpenSLX/OSPlugin/plymouth.pm
@@ -112,6 +112,16 @@ sub installationPhase
my $self = shift;
my $info = shift;
+ my $pluginRepoPath = $info->{'plugin-repo-path'};
+ my $pluginTempPath = $info->{'plugin-temp-path'};
+ my $openslxBasePath = $info->{'openslx-base-path'};
+ my $openslxConfigPath = $info->{'openslx-config-path'};
+ my $attrs = $info->{'plugin-attrs'};
+
+ my $filesDir = "$openslxBasePath/lib/plugins/plymouth/files";
+
+ copyDir("$filesDir", "$pluginRepoPath");
+
return;
}
diff --git a/src/os-plugins/plugins/plymouth/XX_plymouth.sh b/src/os-plugins/plugins/plymouth/XX_plymouth.sh
index f1b99511..79f91325 100644
--- a/src/os-plugins/plugins/plymouth/XX_plymouth.sh
+++ b/src/os-plugins/plugins/plymouth/XX_plymouth.sh
@@ -19,6 +19,9 @@ if [ -e /initramfs/plugin-conf/plymouth.conf ]; then
if [ $plymouth_active -ne 0 ]; then
[ $DEBUGLEVEL -gt 0 ] && echo "executing the 'plymouth' plugin...";
+ [ ! -d /mnt/etc/alternatives ] && mkdir -p /mnt/etc/alternatives
+ ln -sf /opt/openslx/plugin-repo/plymouth/files/lib/plymouth/themes/default.plymouth /mnt/etc/alternatives/default.plymouth
+ ln -sf /opt/openslx/plugin-repo/plymouth/files/lib/plymouth/themes/unifr-rz/ /mnt/lib/plymouth/themes/unifr-rz/
if [ -f /mnt/etc/init/kdm.conf ];
then
sed 's/exec kdm/$(sleep 0.5 \&\& plymouth quit) \&\n exec kdm/g' -i /mnt/etc/init/kdm.conf
diff --git a/src/os-plugins/plugins/plymouth/init-hooks/40-started-hw-config/plymouth.sh b/src/os-plugins/plugins/plymouth/init-hooks/40-started-hw-config/plymouth.sh
index 54a86774..ad90e30f 100644
--- a/src/os-plugins/plugins/plymouth/init-hooks/40-started-hw-config/plymouth.sh
+++ b/src/os-plugins/plugins/plymouth/init-hooks/40-started-hw-config/plymouth.sh
@@ -1,5 +1,6 @@
# only start with no debug level
if [ $DEBUGLEVEL -eq 0 ]; then
- /sbin/plymouthd --mode=boot --attach-to-session
+ /sbin/plymouthd --attach-to-session
+ #/sbin/plymouthd --mode=shutdown --attach-to-session
/bin/plymouth show-splash
fi