projects
/
grml-autoconfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adjust config_testcd and $INSTALLED for use with live-initramfs
[grml-autoconfig.git]
/
grml-autoconfig
diff --git
a/grml-autoconfig
b/grml-autoconfig
index
f663cd5
..
04625a9
100755
(executable)
--- a/
grml-autoconfig
+++ b/
grml-autoconfig
@@
-4,7
+4,7
@@
# Authors: grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
# Bug-Reports: see http://grml.org/bugs/
# License: This file is licensed under the GPL v2.
# Authors: grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
# Bug-Reports: see http://grml.org/bugs/
# License: This file is licensed under the GPL v2.
-# Latest change:
Fre Aug 04 12:13:13 CEST 2006
[mika]
+# Latest change:
Mit Jul 25 19:59:07 CEST 2007
[mika]
################################################################################
# http://wiki.debian.org/LSBInitScripts =>
################################################################################
# http://wiki.debian.org/LSBInitScripts =>
@@
-17,6
+17,7
@@
# Default-Stop:
### END INIT INFO
# Default-Stop:
### END INIT INFO
+# {{{ placeholder functions for restart/reload/stop
if [[ $1 == "restart" ]] ; then
echo "$0 restart - empty placeholder. Doing nothing but running."
fi
if [[ $1 == "restart" ]] ; then
echo "$0 restart - empty placeholder. Doing nothing but running."
fi
@@
-29,6
+30,7
@@
if [[ $1 == "stop" ]] ; then
echo "$0 stop - empty placeholder. Doing nothing but exiting."
exit 1
fi
echo "$0 stop - empty placeholder. Doing nothing but exiting."
exit 1
fi
+# }}}
# {{{ path, signals, umask, zsh, colors
export PATH="/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin"
# {{{ path, signals, umask, zsh, colors
export PATH="/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin"
@@
-43,7
+45,7
@@
setopt no_nomatch # avoid 'no matches found: ...'
# {{{ source main files
source /etc/grml/autoconfig # configuration file
source /etc/grml/autoconfig.functions # functions
# {{{ source main files
source /etc/grml/autoconfig # configuration file
source /etc/grml/autoconfig.functions # functions
-source /etc/grml/lsb-functions
+source /etc/grml/lsb-functions
# helper functions for smart display
# }}}
# {{{ mount important directories
# }}}
# {{{ mount important directories
@@
-61,8
+63,8
@@
CMDLINE="$(cat /proc/cmdline)"
checkvalue $CONFIG_DEBUG && config_debug
SPLASH=''
checkvalue $CONFIG_DEBUG && config_debug
SPLASH=''
-if checkbootparam "
splash"
; then
- SPLASH=1
+if checkbootparam "
textsplash" || checkbootparam "tsplash"
; then
+
SPLASH=1
fi
if [ -z "$SPLASH" ] ; then
fi
if [ -z "$SPLASH" ] ; then
@@
-87,7
+89,10
@@
if checkbootparam "forensic" ; then
rundebugshell
fi
rundebugshell
fi
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|">/dev/tty7
+if [ -n "$SPLASH" ] ; then
+ /usr/bin/grml-bootsplash "|">/dev/tty14
+ chvt 14
+fi
checkvalue $CONFIG_LANGUAGE && config_language
checkvalue $CONFIG_LANGUAGE && config_language
@@
-99,7
+104,7
@@
checkvalue $CONFIG_FWTIMEOUT && config_fwtimeout
checkvalue $CONFIG_FIX_PASSWD && config_fix_passwd
checkvalue $CONFIG_FIX_PASSWD && config_fix_passwd
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||">/dev/tty
7
+[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||">/dev/tty
14
checkvalue $CONFIG_HOSTNAME && config_hostname
checkvalue $CONFIG_HOSTNAME && config_hostname
@@
-111,6
+116,8
@@
checkvalue $CONFIG_KERNEL && config_kernel
checkvalue $CONFIG_VMWARE && config_vmware
checkvalue $CONFIG_VMWARE && config_vmware
+checkvalue $CONFIG_QEMU && config_qemu
+
checkvalue $CONFIG_SMALL && config_small
checkvalue $CONFIG_LD_MOD && config_ld_mod
checkvalue $CONFIG_SMALL && config_small
checkvalue $CONFIG_LD_MOD && config_ld_mod
@@
-119,12
+126,14
@@
checkvalue $CONFIG_TIMEZONE && config_timezone
checkvalue $CONFIG_FAST && config_fast
checkvalue $CONFIG_FAST && config_fast
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|||">/dev/tty
7
+[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|||">/dev/tty
14
checkvalue $CONFIG_ENVIRONMENT && config_environment
checkvalue $CONFIG_SWRAID && config_swraid
checkvalue $CONFIG_ENVIRONMENT && config_environment
checkvalue $CONFIG_SWRAID && config_swraid
+checkvalue $CONFIG_LVM && config_lvm
+
# No kernel messages while probing modules
echo "0" > /proc/sys/kernel/printk
# No kernel messages while probing modules
echo "0" > /proc/sys/kernel/printk
@@
-136,7
+145,7
@@
checkvalue $CONFIG_FIREWIRE_DEV && config_firewire_dev
checkvalue $CONFIG_TESTCD && config_testcd
checkvalue $CONFIG_TESTCD && config_testcd
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||||">/dev/tty
7
+[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||||">/dev/tty
14
checkvalue $CONFIG_DISCOVER && config_discover
checkvalue $CONFIG_DISCOVER && config_discover
@@
-152,7
+161,7
@@
checkvalue $CONFIG_MODULES && config_modules
checkvalue $CONFIG_ACPI_APM && config_acpi_apm
checkvalue $CONFIG_ACPI_APM && config_acpi_apm
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|||||">/dev/tty
7
+[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|||||">/dev/tty
14
checkvalue $CONFIG_PCMCIA && config_pcmcia
checkvalue $CONFIG_PCMCIA && config_pcmcia
@@
-162,7
+171,7
@@
checkvalue $CONFIG_PCMCIA && config_pcmcia
checkvalue $CONFIG_KEYBOARD && config_keyboard
checkvalue $CONFIG_KEYBOARD && config_keyboard
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||||||">/dev/tty
7
+[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||||||">/dev/tty
14
checkvalue $CONFIG_BLIND && config_blind
checkvalue $CONFIG_BLIND && config_blind
@@
-182,7
+191,7
@@
checkvalue $CONFIG_MOUSE && config_mouse
checkvalue $CONFIG_DHCP && config_dhcp
checkvalue $CONFIG_DHCP && config_dhcp
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|||||||">/dev/tty
7
+[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|||||||">/dev/tty
14
checkvalue $CONFIG_SYSLOG && config_syslog
checkvalue $CONFIG_SYSLOG && config_syslog
@@
-200,7
+209,9
@@
checkvalue $CONFIG_MYCONFIG && config_myconfig
checkvalue $CONFIG_DEBS && config_debs
checkvalue $CONFIG_DEBS && config_debs
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||||||||">/dev/tty7
+checkvalue $CONFIG_SCRIPTS && config_scripts
+
+[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||||||||">/dev/tty14
checkvalue $CONFIG_CDROM_SCRIPTS && config_cdrom_scripts
checkvalue $CONFIG_CDROM_SCRIPTS && config_cdrom_scripts
@@
-218,7
+229,7
@@
checkvalue $CONFIG_WONDERSHAPER && config_wondershaper
checkvalue $CONFIG_GPM && config_gpm
checkvalue $CONFIG_GPM && config_gpm
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|||||||||">/dev/tty
7
+[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|||||||||">/dev/tty
14
checkvalue $CONFIG_SERVICES && config_services
checkvalue $CONFIG_SERVICES && config_services
@@
-228,7
+239,7
@@
checkvalue $CONFIG_NETIPV6 && config_ipv6
checkvalue $CONFIG_DEBNET && config_debnet
checkvalue $CONFIG_DEBNET && config_debnet
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||||||||||">/dev/tty
7
+[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||||||||||">/dev/tty
14
checkvalue $CONFIG_CONSOLE && config_console
checkvalue $CONFIG_CONSOLE && config_console
@@
-244,16
+255,25
@@
checkvalue $CONFIG_CREATE_MNT_DIRS && create_mnt_dirs
checkvalue $CONFIG_915RESOLUTION && config_915resolution
checkvalue $CONFIG_915RESOLUTION && config_915resolution
+checkvalue $CONFIG_IPW3945 && config_ipw3945
+
checkvalue $CONFIG_AUTOMOUNT && config_automount
checkvalue $CONFIG_DISTCC && config_distcc
checkvalue $CONFIG_AUTOMOUNT && config_automount
checkvalue $CONFIG_DISTCC && config_distcc
+checkvalue $CONFIG_DISTRI && config_distri
+
checkvalue $CONFIG_BLANKING && config_blanking
checkvalue $CONFIG_BLANKING && config_blanking
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|||||||||||">/dev/tty7
+if [ -n "$SPLASH" ] ; then
+ /usr/bin/grml-bootsplash "|||||||||||">/dev/tty14
+ chvt 1
+fi
checkvalue $CONFIG_GRML2HD && config_grml2hd
checkvalue $CONFIG_GRML2HD && config_grml2hd
+checkvalue $CONFIG_DEBOOTSTRAP && config_debootstrap
+
checkvalue $CONFIG_XSTARTUP && config_x_startup
# }}}
checkvalue $CONFIG_XSTARTUP && config_x_startup
# }}}
@@
-262,7
+282,6
@@
if [ -z "$SPLASH" ] ; then
stage=6
rundebugshell
fi
stage=6
rundebugshell
fi
-# }}}
if [ -n "$BOOTDEBUG" ] ; then
CMDLINE="$(cat /proc/cmdline)"
if [ -n "$BOOTDEBUG" ] ; then
CMDLINE="$(cat /proc/cmdline)"
@@
-270,6
+289,7
@@
if [ -n "$BOOTDEBUG" ] ; then
einfo "Bootoption debug detected. Printing kernel command line:"
echo "$CMDLINE"
fi
einfo "Bootoption debug detected. Printing kernel command line:"
echo "$CMDLINE"
fi
+# }}}
# {{{ Re-enable signals
trap 2 3 11
# {{{ Re-enable signals
trap 2 3 11