diff options
Diffstat (limited to 'os-plugins/plugins/theme/init-hooks')
| -rw-r--r-- | os-plugins/plugins/theme/init-hooks/05-have-kernelvars/theme.sh | 9 | ||||
| -rw-r--r-- | os-plugins/plugins/theme/init-hooks/80-after-plugins/theme.sh | 20 |
2 files changed, 9 insertions, 20 deletions
diff --git a/os-plugins/plugins/theme/init-hooks/05-have-kernelvars/theme.sh b/os-plugins/plugins/theme/init-hooks/05-have-kernelvars/theme.sh index e2f8f089..440dda12 100644 --- a/os-plugins/plugins/theme/init-hooks/05-have-kernelvars/theme.sh +++ b/os-plugins/plugins/theme/init-hooks/05-have-kernelvars/theme.sh @@ -9,4 +9,11 @@ else export theme_nosplash=1 fi -[ ${theme_nosplash} -eq 0 ] && /bin/splashy boot 2>/dev/null +if [ ${theme_nosplash} -eq 0 ]; then + # start splashy + /bin/splashy boot 2>/dev/null + + # add splashy.stop (XX_theme) to runlevel scripts + echo 'D_INITSCRIPTS="${D_INITSCRIPTS} splashy.stop"' \ + >> /etc/sysconfig/config +fi diff --git a/os-plugins/plugins/theme/init-hooks/80-after-plugins/theme.sh b/os-plugins/plugins/theme/init-hooks/80-after-plugins/theme.sh index 5d62b21f..53032caf 100644 --- a/os-plugins/plugins/theme/init-hooks/80-after-plugins/theme.sh +++ b/os-plugins/plugins/theme/init-hooks/80-after-plugins/theme.sh @@ -1,19 +1 @@ -if [ ${theme_nosplash} -eq 0 ]; then - - /bin/splashy_update "progress 80" >/dev/null 2>&1 - - # make the splashy_update binary available in stage4 ... - mkdir -p /mnt/var/lib/openslx/bin - cp -a /bin/splashy_update /mnt/var/lib/openslx/bin - - # ... and create a runlevelscript that will stop splashy somewhere near - # the end of stage4 - d_mkrlscript init splashy.stop "Stopping Splashy ..." - echo -e "\t/var/lib/openslx/bin/splashy_update exit 2>/dev/null \ - \n\ttype killall >/dev/null 2>&1 && killall -9 splashy \ - \n\trm -f /var/lib/openslx/bin/splashy_update 2>/dev/null" \ - >>/mnt/etc/${D_INITDIR}/splashy.stop - d_mkrlscript close splashy.stop "" - D_INITSCRIPTS="${D_INITSCRIPTS} splashy.stop" - -fi
\ No newline at end of file +[ ${theme_nosplash} = 0 ] && /bin/splashy_update "progress 80" >/dev/null 2>&1 |