projects
/
grml-autoconfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix displaying information about virtual environment
[grml-autoconfig.git]
/
grml-autoconfig
diff --git
a/grml-autoconfig
b/grml-autoconfig
index
c8584b6
..
9305cfe
100755
(executable)
--- a/
grml-autoconfig
+++ b/
grml-autoconfig
@@
-32,7
+32,7
@@
fi
# }}}
# {{{ path, signals, umask, zsh, colors
# }}}
# {{{ path, signals, umask, zsh, colors
-export PATH="/bin:/sbin:/usr/bin:/usr/sbin
:/usr/X11R6/bin
"
+export PATH="/bin:/sbin:/usr/bin:/usr/sbin"
umask 022
# Ignore these signals: INT, TERM, SEGV
trap "" 2 3 11
umask 022
# Ignore these signals: INT, TERM, SEGV
trap "" 2 3 11
@@
-56,11
+56,6
@@
mount_sys
# {{{ main grml-autoconfig
checkvalue $CONFIG_DEBUG && config_debug
# {{{ main grml-autoconfig
checkvalue $CONFIG_DEBUG && config_debug
-SPLASH=''
-if checkbootparam 'textsplash' || checkbootparam 'tsplash'; then
- SPLASH=1
-fi
-
# update /etc/mtab if running in live-initramfs mode:
if [ -z "$INSTALLED" -a -e /live/cow ] ; then
if ! grep -q rootfs /etc/mtab ; then
# update /etc/mtab if running in live-initramfs mode:
if [ -z "$INSTALLED" -a -e /live/cow ] ; then
if ! grep -q rootfs /etc/mtab ; then
@@
-70,10
+65,8
@@
if [ -z "$INSTALLED" -a -e /live/cow ] ; then
fi
fi
fi
fi
-if [ -z "$SPLASH" ] ; then
- stage=5
- rundebugshell
-fi
+stage=5
+rundebugshell
if [ -z "$BOOTDEBUG" ] ; then
einfo "Setting kernel ring buffer to level 2."
if [ -z "$BOOTDEBUG" ] ; then
einfo "Setting kernel ring buffer to level 2."
@@
-90,11
+83,6
@@
if checkbootparam 'forensic' ; then
ewarn " Do *NOT* boot with something like 'grml forensic ...' but always use 'forensic ...' instead!" ; eend 0
fi
ewarn " Do *NOT* boot with something like 'grml forensic ...' but always use 'forensic ...' instead!" ; eend 0
fi
-if [ -n "$SPLASH" ] ; then
- /usr/bin/grml-bootsplash "|">/dev/tty14
- chvt 14
-fi
-
checkvalue $CONFIG_LANGUAGE && config_language
checkvalue $CONFIG_LOG && config_log
checkvalue $CONFIG_LANGUAGE && config_language
checkvalue $CONFIG_LOG && config_log
@@
-103,11
+91,9
@@
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/tty14
-
checkvalue $CONFIG_HOSTNAME && config_hostname
checkvalue $CONFIG_HOSTNAME && config_hostname
-checkvalue $CONFIG_
USERFSTAB && config_userfstab
+checkvalue $CONFIG_
CONFIGFS && config_configfs
checkvalue $CONFIG_TIME && config_time
checkvalue $CONFIG_TIME && config_time
@@
-121,8
+107,6
@@
checkvalue $CONFIG_TIMEZONE && config_timezone
checkvalue $CONFIG_FAST && config_fast
checkvalue $CONFIG_FAST && config_fast
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|||">/dev/tty14
-
checkvalue $CONFIG_SWRAID && config_swraid
checkvalue $CONFIG_DMRAID && config_dmraid
checkvalue $CONFIG_SWRAID && config_swraid
checkvalue $CONFIG_DMRAID && config_dmraid
@@
-132,28
+116,20
@@
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
-checkvalue $CONFIG_LOCAL_NET && config_local_net
-
checkvalue $CONFIG_TESTCD && config_testcd
checkvalue $CONFIG_TESTCD && config_testcd
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||||">/dev/tty14
-
checkvalue $CONFIG_MODULES && config_modules
checkvalue $CONFIG_MODULES && config_modules
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|||||">/dev/tty14
+checkvalue $CONFIG_BRLTTY && config_brltty
checkvalue $CONFIG_ACPI && config_acpi
checkvalue $CONFIG_ACPI && config_acpi
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||||||">/dev/tty14
-
checkvalue $CONFIG_DMA && config_dma
checkvalue $CONFIG_FSTAB && config_fstab
checkvalue $CONFIG_MOUSE && config_mouse
checkvalue $CONFIG_DMA && config_dma
checkvalue $CONFIG_FSTAB && config_fstab
checkvalue $CONFIG_MOUSE && config_mouse
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|||||||">/dev/tty14
-
checkvalue $CONFIG_CPU && config_cpu
checkvalue $CONFIG_SSH && config_ssh
checkvalue $CONFIG_CPU && config_cpu
checkvalue $CONFIG_SSH && config_ssh
@@
-176,14
+152,6
@@
checkvalue $CONFIG_FINDDCSDIR && config_umount_dcsdir
checkvalue $CONFIG_PARTCONF && config_partconf
checkvalue $CONFIG_PARTCONF && config_partconf
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||||||||">/dev/tty14
-
-# device symlinks {{{
- [ -r /mnt/floppy ] || mkdir /mnt/floppy
- [ -r /mnt/cdrom ] || mkdir /mnt/cdrom
- [ -r /mnt/test ] || mkdir /mnt/test
-# }}}
-
checkvalue $CONFIG_MIXER && config_mixer
checkvalue $CONFIG_MODEM && config_modem
checkvalue $CONFIG_MIXER && config_mixer
checkvalue $CONFIG_MODEM && config_modem
@@
-192,26
+160,24
@@
checkvalue $CONFIG_WONDERSHAPER && config_wondershaper
checkvalue $CONFIG_GPM && config_gpm
checkvalue $CONFIG_GPM && config_gpm
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|||||||||">/dev/tty14
+checkvalue $CONFIG_SERVICES && config_services
+
+checkvalue $CONFIG_DEBNET && config_debnet
+
+checkvalue $CONFIG_DISPLAY_SSH_FINGERPRINTS && config_display_ssh_fingerprints
checkvalue $CONFIG_NETCONFIG && config_netconfig
checkvalue $CONFIG_NETSCRIPT && config_netscript
checkvalue $CONFIG_NETCONFIG && config_netconfig
checkvalue $CONFIG_NETSCRIPT && config_netscript
-checkvalue $CONFIG_SERVICES && config_services
-
checkvalue $CONFIG_NETIPV6 && config_ipv6
checkvalue $CONFIG_NETIPV6 && config_ipv6
-checkvalue $CONFIG_DEBNET && config_debnet
-
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||||||||||">/dev/tty14
+checkvalue $CONFIG_STATS && config_stats
checkvalue $CONFIG_CONSOLE && config_console
checkvalue $CONFIG_FIX_UNIONFS && fix_unionfs
checkvalue $CONFIG_CONSOLE && config_console
checkvalue $CONFIG_FIX_UNIONFS && fix_unionfs
-checkvalue $CONFIG_915RESOLUTION && config_915resolution
-
checkvalue $CONFIG_VIRTUALBOX_SHARED_FOLDERS && config_virtualbox_shared_folders
checkvalue $CONFIG_MYPATH && config_mypath
checkvalue $CONFIG_VIRTUALBOX_SHARED_FOLDERS && config_virtualbox_shared_folders
checkvalue $CONFIG_MYPATH && config_mypath
@@
-222,11
+188,6
@@
checkvalue $CONFIG_DISTRI && config_distri
checkvalue $CONFIG_BLANKING && config_blanking
checkvalue $CONFIG_BLANKING && config_blanking
-if [ -n "$SPLASH" ] ; then
- /usr/bin/grml-bootsplash "|||||||||||">/dev/tty14
- chvt 1
-fi
-
checkvalue $CONFIG_TOHD && config_tohd
checkvalue $CONFIG_DEBOOTSTRAP && config_debootstrap
checkvalue $CONFIG_TOHD && config_tohd
checkvalue $CONFIG_DEBOOTSTRAP && config_debootstrap
@@
-235,10
+196,8
@@
checkvalue $CONFIG_XSTARTUP && config_x_startup
# }}}
# {{{ debug
# }}}
# {{{ debug
-if [ -z "$SPLASH" ] ; then
- stage=6
- rundebugshell
-fi
+stage=6
+rundebugshell
if [ -n "$BOOTDEBUG" ] ; then
# set only if not already set
if [ -n "$BOOTDEBUG" ] ; then
# set only if not already set