diff options
| author | Michael Janczyk | 2008-02-16 00:10:13 +0100 |
|---|---|---|
| committer | Michael Janczyk | 2008-02-16 00:10:13 +0100 |
| commit | 19f2c9b671a5e39040c0383e3639dcca288dc216 (patch) | |
| tree | 6bca043f9ebdd46709cd9a8dc65c93a6962c6b0e /os-plugins | |
| parent | changed runlevel linker stuff. debian needs splashy to term earlier, changed ... (diff) | |
| download | core-19f2c9b671a5e39040c0383e3639dcca288dc216.tar.gz core-19f2c9b671a5e39040c0383e3639dcca288dc216.tar.xz core-19f2c9b671a5e39040c0383e3639dcca288dc216.zip | |
added D_SPLASHY variable to all systems, variable will be written in XX_theme.sh, if theme_nosplash -eq 0
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1547 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins')
| -rw-r--r-- | os-plugins/plugins/theme/XX_theme.sh | 1 | ||||
| -rw-r--r-- | os-plugins/plugins/theme/init-hooks/05-have-kernelvars/theme.sh | 8 |
2 files changed, 2 insertions, 7 deletions
diff --git a/os-plugins/plugins/theme/XX_theme.sh b/os-plugins/plugins/theme/XX_theme.sh index b7d84761..5cebc108 100644 --- a/os-plugins/plugins/theme/XX_theme.sh +++ b/os-plugins/plugins/theme/XX_theme.sh @@ -33,6 +33,7 @@ if [ -e /initramfs/plugin-conf/theme.conf ]; then \n\trm -f /var/lib/openslx/bin/splashy_update 2>/dev/null" \ >>/mnt/etc/${D_INITDIR}/splashy.stop d_mkrlscript close splashy.stop "" + D_SPLASHY=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 8212b706..e2f8f089 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,10 +9,4 @@ else export theme_nosplash=1 fi -if [ ${theme_nosplash} -eq 0 ]; then - # start splashy - /bin/splashy boot 2>/dev/null - - # add splashy.stop (XX_theme) to runlevel scripts - export D_SPLASHY=splashy.stop -fi +[ ${theme_nosplash} -eq 0 ] && /bin/splashy boot 2>/dev/null |