diff options
| author | Dirk von Suchodoletz | 2008-10-15 01:12:27 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2008-10-15 01:12:27 +0200 |
| commit | f943f65283f2a81bb176147dcb1ba0fa4da1b54f (patch) | |
| tree | c4e770847df2ed63a6e5c9f79e65548da8a1f82e /os-plugins | |
| parent | Applying init-wrapper to the init-hook system. (diff) | |
| download | core-f943f65283f2a81bb176147dcb1ba0fa4da1b54f.tar.gz core-f943f65283f2a81bb176147dcb1ba0fa4da1b54f.tar.xz core-f943f65283f2a81bb176147dcb1ba0fa4da1b54f.zip | |
Needed changes because of the init-wrapper, new init-hook system, check
comments of r2302.
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2303 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins')
12 files changed, 16 insertions, 20 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 e3e56e99..6ccbd9f0 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 @@ -5,13 +5,9 @@ if grep -E "(VESA|VGA)" /proc/fb > /dev/null 2>&1 \ > /dev/null 2>&1 \ && [ $DEBUGLEVEL -eq 0 ] \ && [ -e /bin/splashy ] ; then - 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 + echo "we have bootsplash" >/tmp/bootsplash + /bin/splashy boot 2>/dev/null + # add splashy.stop runlevel script (does not work any more here, + # temporarily moved to init awaiting a proper solution) + #D_SPLASHY=splashy.stop fi diff --git a/os-plugins/plugins/bootsplash/init-hooks/10-have-nw-modules/bootsplash.sh b/os-plugins/plugins/bootsplash/init-hooks/10-have-nw-modules/bootsplash.sh index 7f3d563e..90447302 100644 --- a/os-plugins/plugins/bootsplash/init-hooks/10-have-nw-modules/bootsplash.sh +++ b/os-plugins/plugins/bootsplash/init-hooks/10-have-nw-modules/bootsplash.sh @@ -1 +1 @@ -[ ${no_bootsplash} -eq 0 ] && /bin/splashy_update "progress 10" >/dev/null 2>&1 +[ -e /tmp/bootsplash ] && /bin/splashy_update "progress 10" >/dev/null 2>&1 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 8df98b22..a7d0672f 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} -eq 0 ] && /bin/splashy_update "progress 15" >/dev/null 2>&1 +[ -e /tmp/bootsplash ] && /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 be6ac567..eeea566c 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} -eq 0 ] && /bin/splashy_update "progress 25" >/dev/null 2>&1 +[ -e /tmp/bootsplash ] && /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 d5fc62ec..1273e3ac 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} -eq 0 ] && /bin/splashy_update "progress 40" >/dev/null 2>&1 +[ -e /tmp/bootsplash ] && /bin/splashy_update "progress 40" >/dev/null 2>&1 diff --git a/os-plugins/plugins/bootsplash/init-hooks/50-have-layered-fs/bootsplash.sh b/os-plugins/plugins/bootsplash/init-hooks/50-have-layered-fs/bootsplash.sh index 4b7e9c78..b283dfb3 100644 --- a/os-plugins/plugins/bootsplash/init-hooks/50-have-layered-fs/bootsplash.sh +++ b/os-plugins/plugins/bootsplash/init-hooks/50-have-layered-fs/bootsplash.sh @@ -1 +1 @@ -[ ${no_bootsplash} -eq 0 ] && /bin/splashy_update "progress 50" >/dev/null 2>&1 +[ -e /tmp/bootsplash ] && /bin/splashy_update "progress 50" >/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 9c3bd20f..4d71a4f4 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} -eq 0 ] && /bin/splashy_update "progress 60" >/dev/null 2>&1 +[ -e /tmp/bootsplash ] && /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 fcd0c410..911a1be6 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} -eq 0 ] && /bin/splashy_update "progress 70" >/dev/null 2>&1 +[ -e /tmp/bootsplash ] && /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 0abfa5b2..4efa1efb 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} -eq 0 ] && /bin/splashy_update "progress 80" >/dev/null 2>&1 +[ -e /tmp/bootsplash ] && /bin/splashy_update "progress 80" >/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 index 2546d298..61d07b9f 100644 --- a/os-plugins/plugins/bootsplash/init-hooks/90-postinit-done/bootsplash.sh +++ b/os-plugins/plugins/bootsplash/init-hooks/90-postinit-done/bootsplash.sh @@ -1 +1 @@ -[ ${no_bootsplash} -eq 0 ] && /bin/splashy_update "progress 90" >/dev/null 2>&1 +[ -e /tmp/bootsplash ] && /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 index 5ff86715..51d90b69 100644 --- a/os-plugins/plugins/bootsplash/init-hooks/95-cleanup/bootsplash.sh +++ b/os-plugins/plugins/bootsplash/init-hooks/95-cleanup/bootsplash.sh @@ -1 +1 @@ -[ ${no_bootsplash} -eq 0 ] && /bin/splashy_update "progress 95" >/dev/null 2>&1 +[ -e /tmp/bootsplash ] && /bin/splashy_update "progress 95" >/dev/null 2>&1 diff --git a/os-plugins/plugins/bootsplash/init-hooks/99-handing-over/bootsplash.sh b/os-plugins/plugins/bootsplash/init-hooks/99-handing-over/bootsplash.sh index 93673915..72c664c6 100644 --- a/os-plugins/plugins/bootsplash/init-hooks/99-handing-over/bootsplash.sh +++ b/os-plugins/plugins/bootsplash/init-hooks/99-handing-over/bootsplash.sh @@ -1 +1 @@ -[ ${no_bootsplash} -eq 0 ] && /bin/splashy_update "progress 100" >/dev/null 2>&1 +[ -e /tmp/bootsplash ] && /bin/splashy_update "progress 100" >/dev/null 2>&1 |