projects
/
grml-live-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move package validator behind FAI
[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
..
5afaca4
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
@@
-98,6
+115,10
@@
if [ -r /etc/grml_version ] ; then
GRML_VERSION="$(cat /etc/grml_version)"
fi
GRML_VERSION="$(cat /etc/grml_version)"
fi
+if checkbootparam "quiet" ; then
+ echo -e "${CLEAR}"
+fi
+
if [ -n "$DISTRI" ] ; then
SPLASH="
${RED} $DISTRI
if [ -n "$DISTRI" ] ; then
SPLASH="
${RED} $DISTRI
@@
-119,11
+140,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
@@
-138,7
+161,7
@@
fi
# Make sure we support squashfs:
if ! grep -q squashfs /proc/filesystems ; then
# Make sure we support squashfs:
if ! grep -q squashfs /proc/filesystems ; then
- modprobe -q squashfs || log_grml_failure_msg "Warning: look like you do not have support for squashfs"
+ modprobe -q squashfs || log_grml_failure_msg "Warning: look
s
like you do not have support for squashfs"
fi
if grep -q 'boot=live' /proc/cmdline 2>/dev/null ; then
fi
if grep -q 'boot=live' /proc/cmdline 2>/dev/null ; then