diff options
| author | Michael Janczyk | 2008-02-15 18:53:47 +0100 |
|---|---|---|
| committer | Michael Janczyk | 2008-02-15 18:53:47 +0100 |
| commit | 4ecdf953abc21256fe32bba103c1e6c6bc089d48 (patch) | |
| tree | e690343ac44b713e372f516e240774b868503737 /os-plugins | |
| parent | Closing ticket #169: (diff) | |
| download | core-4ecdf953abc21256fe32bba103c1e6c6bc089d48.tar.gz core-4ecdf953abc21256fe32bba103c1e6c6bc089d48.tar.xz core-4ecdf953abc21256fe32bba103c1e6c6bc089d48.zip | |
test commit, splashy seems to be very picky
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1545 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins')
| -rw-r--r-- | os-plugins/plugins/theme/XX_theme.sh | 18 | ||||
| -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 |
3 files changed, 26 insertions, 21 deletions
diff --git a/os-plugins/plugins/theme/XX_theme.sh b/os-plugins/plugins/theme/XX_theme.sh index 2d2b0f0f..b7d84761 100644 --- a/os-plugins/plugins/theme/XX_theme.sh +++ b/os-plugins/plugins/theme/XX_theme.sh @@ -3,6 +3,7 @@ # stage3 part of 'theme' plugin - the runlevel script # . /etc/functions +. /etc/distro-functions . /etc/sysconfig/config if [ -e /initramfs/plugin-conf/theme.conf ]; then . /initramfs/plugin-conf/theme.conf @@ -18,5 +19,20 @@ if [ -e /initramfs/plugin-conf/theme.conf ]; then fi [ $DEBUGLEVEL -gt 0 ] && echo "done with 'theme' os-plugin ..."; - fi + + if [ ${theme_nosplash} -eq 0 ]; then + # 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 "" + fi + fi fi 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 |