projects
/
grml-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
config/hooks/instsoft.GRMLBASE: force installation of file-rc
[grml-live.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
78d65aa
..
5afaca4
100755
(executable)
--- a/
etc/grml/fai/live-initramfs/grml-script.init-top
+++ b/
etc/grml/fai/live-initramfs/grml-script.init-top
@@
-1,9
+1,26
@@
#!/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
- echo "debug: scripts/init-top/grml running"
+ echo "debug: scripts/init-top/grml running"
>/dev/console
fi
# get boot command line
fi
# get boot command line
@@
-95,7
+112,11
@@
FAILED=" ${NORMAL}[${RED}fail${NORMAL}]"
DISTRI="$(getbootparam 'distri' 2>/dev/null)"
if [ -r /etc/grml_version ] ; then
DISTRI="$(getbootparam 'distri' 2>/dev/null)"
if [ -r /etc/grml_version ] ; then
- GRML_VERSION="[$(cat /etc/grml_version)] "
+ GRML_VERSION="$(cat /etc/grml_version)"
+fi
+
+if checkbootparam "quiet" ; then
+ echo -e "${CLEAR}"
fi
if [ -n "$DISTRI" ] ; then
fi
if [ -n "$DISTRI" ] ; then
@@
-113,13
+134,18
@@
${RED} | | _| |_) | |\/| | |
${RED} | |_| | _ <| | | | |___
${RED} \____|_| \_\_| |_|_____|
${RED} | |_| | _ <| | | | |___
${RED} \____|_| \_\_| |_|_____|
-${WHITE}grml.org - Linux for sysadmins and texttool users.
-${WHITE}$GRML_VERSION${NORMAL}"
+${WHITE}grml.org - Linux for sysadmins and texttool users.${NORMAL}"
fi
echo ""
echo "${WHITE}Welcome to"
echo "$SPLASH"
fi
echo ""
echo "${WHITE}Welcome to"
echo "$SPLASH"
+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
# don't output anything if running with bootsplash feature
if checkbootparam "splash" ; then
@@
-135,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