diff options
| author | Michael Janczyk | 2008-03-27 18:03:55 +0100 |
|---|---|---|
| committer | Michael Janczyk | 2008-03-27 18:03:55 +0100 |
| commit | c732cc5cd3b18c13908deb1dfdc0343fd4135a2f (patch) | |
| tree | 49d07c319c0da61b56b61923f8db3bf279f399e9 /os-plugins/plugins/bootsplash/init-hooks | |
| parent | * Changed check of syscall from die() to warn() in order to let the caller (diff) | |
| download | core-c732cc5cd3b18c13908deb1dfdc0343fd4135a2f.tar.gz core-c732cc5cd3b18c13908deb1dfdc0343fd4135a2f.tar.xz core-c732cc5cd3b18c13908deb1dfdc0343fd4135a2f.zip | |
New plugin concept: Default theme and splashy binaries moved to plugin. Makefile modified: removed copy of splashy, theme dir shouldn't be copied either after display theme and pxe theme have been moved as well. Added support of own themes in config-path/plugins/bootsplash/themes. New init-hooks added, not really necessary. A few cosmetic corrections ->styleguide
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@1702 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins/plugins/bootsplash/init-hooks')
10 files changed, 13 insertions, 10 deletions
diff --git a/os-plugins/plugins/bootsplash/init-hooks/05-have-kernelvars/bootsplash.sh b/os-plugins/plugins/bootsplash/init-hooks/05-have-kernelvars/bootsplash.sh index 392b234e..657ae1e4 100644 --- a/os-plugins/plugins/bootsplash/init-hooks/05-have-kernelvars/bootsplash.sh +++ b/os-plugins/plugins/bootsplash/init-hooks/05-have-kernelvars/bootsplash.sh @@ -4,13 +4,13 @@ if grep -E "(VESA|VGA)" /proc/fb > /dev/null 2>&1 \ && grep -qi " quiet " /proc/cmdline > /dev/null 2>&1 \ && [ $DEBUGLEVEL -eq 0 ] \ && [ -e /bin/splashy ] ; then - export no_bootsplash=0 + export no_bootsplash=0 else export no_bootsplash=1 fi if [ ${no_bootsplash} -eq 0 ]; then - /bin/splashy boot 2>/dev/null - # add splashy.stop runlevel script - D_SPLASHY=splashy.stop + /bin/splashy boot 2>/dev/null + # add splashy.stop runlevel script + D_SPLASHY=splashy.stop fi diff --git a/os-plugins/plugins/bootsplash/init-hooks/15-have-ip-config/bootsplash.sh b/os-plugins/plugins/bootsplash/init-hooks/15-have-ip-config/bootsplash.sh index 7d8db91b..8df98b22 100644 --- a/os-plugins/plugins/bootsplash/init-hooks/15-have-ip-config/bootsplash.sh +++ b/os-plugins/plugins/bootsplash/init-hooks/15-have-ip-config/bootsplash.sh @@ -1 +1 @@ -[ ${no_bootsplash} = 0 ] && /bin/splashy_update "progress 15" >/dev/null 2>&1 +[ ${no_bootsplash} -eq 0 ] && /bin/splashy_update "progress 15" >/dev/null 2>&1 diff --git a/os-plugins/plugins/bootsplash/init-hooks/25-have-network-root/bootsplash.sh b/os-plugins/plugins/bootsplash/init-hooks/25-have-network-root/bootsplash.sh index 5d2f9a85..be6ac567 100644 --- a/os-plugins/plugins/bootsplash/init-hooks/25-have-network-root/bootsplash.sh +++ b/os-plugins/plugins/bootsplash/init-hooks/25-have-network-root/bootsplash.sh @@ -1 +1 @@ -[ ${no_bootsplash} = 0 ] && /bin/splashy_update "progress 25" >/dev/null 2>&1 +[ ${no_bootsplash} -eq 0 ] && /bin/splashy_update "progress 25" >/dev/null 2>&1 diff --git a/os-plugins/plugins/bootsplash/init-hooks/40-started-hw-config/bootsplash.sh b/os-plugins/plugins/bootsplash/init-hooks/40-started-hw-config/bootsplash.sh index 12affaa4..d5fc62ec 100644 --- a/os-plugins/plugins/bootsplash/init-hooks/40-started-hw-config/bootsplash.sh +++ b/os-plugins/plugins/bootsplash/init-hooks/40-started-hw-config/bootsplash.sh @@ -1 +1 @@ -[ ${no_bootsplash} = 0 ] && /bin/splashy_update "progress 40" >/dev/null 2>&1 +[ ${no_bootsplash} -eq 0 ] && /bin/splashy_update "progress 40" >/dev/null 2>&1 diff --git a/os-plugins/plugins/bootsplash/init-hooks/60-have-servconfig/bootsplash.sh b/os-plugins/plugins/bootsplash/init-hooks/60-have-servconfig/bootsplash.sh index 5f6a1f57..9c3bd20f 100644 --- a/os-plugins/plugins/bootsplash/init-hooks/60-have-servconfig/bootsplash.sh +++ b/os-plugins/plugins/bootsplash/init-hooks/60-have-servconfig/bootsplash.sh @@ -1 +1 @@ -[ ${no_bootsplash} = 0 ] && /bin/splashy_update "progress 60" >/dev/null 2>&1 +[ ${no_bootsplash} -eq 0 ] && /bin/splashy_update "progress 60" >/dev/null 2>&1 diff --git a/os-plugins/plugins/bootsplash/init-hooks/70-before-plugins/bootsplash.sh b/os-plugins/plugins/bootsplash/init-hooks/70-before-plugins/bootsplash.sh index d1b810f6..fcd0c410 100644 --- a/os-plugins/plugins/bootsplash/init-hooks/70-before-plugins/bootsplash.sh +++ b/os-plugins/plugins/bootsplash/init-hooks/70-before-plugins/bootsplash.sh @@ -1 +1 @@ -[ ${no_bootsplash} = 0 ] && /bin/splashy_update "progress 70" >/dev/null 2>&1 +[ ${no_bootsplash} -eq 0 ] && /bin/splashy_update "progress 70" >/dev/null 2>&1 diff --git a/os-plugins/plugins/bootsplash/init-hooks/80-after-plugins/bootsplash.sh b/os-plugins/plugins/bootsplash/init-hooks/80-after-plugins/bootsplash.sh index fa1d0baa..0abfa5b2 100644 --- a/os-plugins/plugins/bootsplash/init-hooks/80-after-plugins/bootsplash.sh +++ b/os-plugins/plugins/bootsplash/init-hooks/80-after-plugins/bootsplash.sh @@ -1 +1 @@ -[ ${no_bootsplash} = 0 ] && /bin/splashy_update "progress 80" >/dev/null 2>&1 +[ ${no_bootsplash} -eq 0 ] && /bin/splashy_update "progress 80" >/dev/null 2>&1 diff --git a/os-plugins/plugins/bootsplash/init-hooks/85-have-initial-boot/bootsplash.sh b/os-plugins/plugins/bootsplash/init-hooks/85-have-initial-boot/bootsplash.sh new file mode 100644 index 00000000..8738e454 --- /dev/null +++ b/os-plugins/plugins/bootsplash/init-hooks/85-have-initial-boot/bootsplash.sh @@ -0,0 +1 @@ +[ ${no_bootsplash} -eq 0 ] && /bin/splashy_update "progress 85" >/dev/null 2>&1 diff --git a/os-plugins/plugins/bootsplash/init-hooks/90-postinit-done/bootsplash.sh b/os-plugins/plugins/bootsplash/init-hooks/90-postinit-done/bootsplash.sh new file mode 100644 index 00000000..2546d298 --- /dev/null +++ b/os-plugins/plugins/bootsplash/init-hooks/90-postinit-done/bootsplash.sh @@ -0,0 +1 @@ +[ ${no_bootsplash} -eq 0 ] && /bin/splashy_update "progress 90" >/dev/null 2>&1 diff --git a/os-plugins/plugins/bootsplash/init-hooks/95-cleanup/bootsplash.sh b/os-plugins/plugins/bootsplash/init-hooks/95-cleanup/bootsplash.sh new file mode 100644 index 00000000..5ff86715 --- /dev/null +++ b/os-plugins/plugins/bootsplash/init-hooks/95-cleanup/bootsplash.sh @@ -0,0 +1 @@ +[ ${no_bootsplash} -eq 0 ] && /bin/splashy_update "progress 95" >/dev/null 2>&1 |