projects
/
grml-live-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add conkeror to GRML_FULL
[grml-live-grml.git]
/
etc
/
grml
/
fai
/
live-initramfs
/
grml-script.init-top
diff --git
a/etc/grml/fai/live-initramfs/grml-script.init-top
b/etc/grml/fai/live-initramfs/grml-script.init-top
index
a9bd284
..
462642d
100755
(executable)
--- a/
etc/grml/fai/live-initramfs/grml-script.init-top
+++ b/
etc/grml/fai/live-initramfs/grml-script.init-top
@@
-1,5
+1,22
@@
#!/bin/sh
#!/bin/sh
+# prereq header {{{
+# without this header booting will fail with:
+# "PANIC: Circular dependancy. Exiting."
+PREREQ=""
+prereqs()
+{
+ echo "$PREREQ"
+}
+case $1 in
+# get pre-requisites
+prereqs)
+ prereqs
+ exit 0
+ ;;
+esac
+# }}}
+
# helper functions {{{
if grep -qe debug -qe verbose /proc/cmdline 2>/dev/null ; then
# helper functions {{{
if grep -qe debug -qe verbose /proc/cmdline 2>/dev/null ; then
@@
-119,11
+136,13
@@
fi
echo ""
echo "${WHITE}Welcome to"
echo "$SPLASH"
echo ""
echo "${WHITE}Welcome to"
echo "$SPLASH"
-
-echo
-log_grml_begin_msg "Running $GRML_VERSION"
echo
echo
+if [ -n "$GRML_VERSION" ] ; then
+ log_grml_begin_msg "Running $GRML_VERSION"
+ echo
+fi
+
# don't output anything if running with bootsplash feature
if checkbootparam "splash" ; then
exec >/dev/null </dev/null 2>&1
# don't output anything if running with bootsplash feature
if checkbootparam "splash" ; then
exec >/dev/null </dev/null 2>&1