X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=grml-autoconfig;h=7ef820e642935c98ef425ec79b702b3b889457bd;hp=335244b29c20556a3b6bd779614cb54b3af77e2e;hb=d694c20c01f73f9224b7a6f0495656ddc32b27fb;hpb=f4e274b64189cf0e000bcf71f9ce098ebce9cdea

diff --git a/grml-autoconfig b/grml-autoconfig
index 335244b..7ef820e 100755
--- a/grml-autoconfig
+++ b/grml-autoconfig
@@ -4,14 +4,13 @@
 # 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: Mon Sep 17 17:39:29 CEST 2007 [mika]
 ################################################################################
 
 # http://wiki.debian.org/LSBInitScripts =>
 ### BEGIN INIT INFO
 # Provides:          grml-autoconfig
-# Required-Start:
-# Required-Stop:
+# Required-Start:    $remote_fs
+# Required-Stop:     $remote_fs
 # Should-Start:      udev
 # Default-Start:     S 2 3 4 5
 # Default-Stop:
@@ -54,76 +53,44 @@ mount_pts
 mount_sys
 # }}}
 
-# {{{ Read in boot parameters
-CMDLINE="$(cat /proc/cmdline)"
-[ -d /cdrom/bootparams/ ] && CMDLINE="$CMDLINE $(cat /cdrom/bootparams/* | tr '\n' ' ')"
-# }}}
-
 # {{{ 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
-      for i in rootfs sysfs proc /live/image /live/cow /lib/init/rw /dev/shm /dev/pts ; do
-          grep $i /proc/mounts >> /etc/mtab
+      for i in rootfs "none /sys sysfs" proc /live/image /live/cow /lib/init/rw /dev/shm /dev/pts ; do
+          grep $i /proc/mounts | grep -v /dev/.static >> /etc/mtab
       done
    fi
 fi
 
-# make sure /etc/resolv.conf points to /dev/shm/resolvconf
-# and /dev/shm/resolvconf exists:
-if [ -z "$INSTALLED" ] && ! [ -d /dev/shm/resolvconf ] ; then
-   if [[ $(readlink /etc/resolv.conf) == /etc/resolvconf/run/resolv.conf ]] && \
-      [[ $(readlink /etc/resolvconf/run) == /dev/shm/resolvconf ]] ; then
-      mkdir /dev/shm/resolvconf
-   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."
-  echo "2" > /proc/sys/kernel/printk ; eend $?
+   einfo "Setting kernel ring buffer to level 2."
+   echo "2" > /proc/sys/kernel/printk ; eend $?
 else
-  einfo "Setting kernel ring buffer to level 6. Adjust manually via running dmesg -n \$VALUE."
-  echo "6" > /proc/sys/kernel/printk ; eend $?
+   einfo "Setting kernel ring buffer to level 6. Adjust manually via running dmesg -n \$VALUE."
+   echo "6" > /proc/sys/kernel/printk ; eend $?
 fi
 
-if checkbootparam "forensic" ; then
-   eerror "Bootopion forensic found. Important notice!"
-   eerror " Do *not* boot with something like 'grml forensic ...' but with 'forensic ...' instead!"
-   eerror " To avoid damage to your system a debugshell will be started after a delay of 10 seconds." ; eend 1
-   eerror " If you want to continue booting just exit the shell, but think about what you are doing!" ; eend 1
-   sleep 10
-   rundebugshell
-fi
+checkvalue $CONFIG_SYSLOG && config_syslog
 
-if [ -n "$SPLASH" ] ; then
-   /usr/bin/grml-bootsplash "|">/dev/tty14
-   chvt 14
+if checkbootparam 'forensic' ; then
+   ewarn "Bootopion forensic found. Important notice:" ; eend 0
+   ewarn " Do *NOT* boot with something like 'grml forensic ...' but always use 'forensic ...' instead!" ; eend 0
 fi
 
 checkvalue $CONFIG_LANGUAGE && config_language
 
 checkvalue $CONFIG_LOG && config_log
 
-checkvalue $CONFIG_SWSPEAK && config_swspeak
-
 checkvalue $CONFIG_FWTIMEOUT && config_fwtimeout
 
 checkvalue $CONFIG_FIX_PASSWD && config_fix_passwd
 
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||">/dev/tty14
-
 checkvalue $CONFIG_HOSTNAME && config_hostname
 
 checkvalue $CONFIG_USERFSTAB && config_userfstab
@@ -132,10 +99,6 @@ checkvalue $CONFIG_TIME && config_time
 
 checkvalue $CONFIG_KERNEL &&  config_kernel
 
-checkvalue $CONFIG_VMWARE &&  config_vmware
-
-checkvalue $CONFIG_QEMU && config_qemu
-
 checkvalue $CONFIG_SMALL && config_small
 
 checkvalue $CONFIG_LD_MOD && config_ld_mod
@@ -144,62 +107,22 @@ checkvalue $CONFIG_TIMEZONE && config_timezone
 
 checkvalue $CONFIG_FAST && config_fast
 
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|||">/dev/tty14
-
-checkvalue $CONFIG_ENVIRONMENT && config_environment
-
 checkvalue $CONFIG_SWRAID && config_swraid
 
+checkvalue $CONFIG_DMRAID && config_dmraid
+
 checkvalue $CONFIG_LVM && config_lvm
 
 # No kernel messages while probing modules
 echo "0" > /proc/sys/kernel/printk
 
-checkvalue $CONFIG_CDROM_PERM && config_cdrom_perm
-
 checkvalue $CONFIG_LOCAL_NET && config_local_net
 
-checkvalue $CONFIG_FIREWIRE_DEV && config_firewire_dev
-
 checkvalue $CONFIG_TESTCD && config_testcd
 
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||||">/dev/tty14
-
-checkvalue $CONFIG_DISCOVER && config_discover
-
-checkvalue $CONFIG_HWINFO && config_hwinfo
-
-checkvalue $CONFIG_HOTPLUG_AGENT && config_hotplug_agent
-
-checkvalue $CONFIG_HOTPLUG_BLACKLIST && config_hotplug_blacklist
-
-checkvalue $CONFIG_HOTPLUG_MAIN && config_hotplug
-
 checkvalue $CONFIG_MODULES && config_modules
 
-checkvalue $CONFIG_ACPI_APM && config_acpi_apm
-
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|||||">/dev/tty14
-
-checkvalue $CONFIG_PCMCIA && config_pcmcia
-
-# {{{ Read in what hwsetup has found
-[ -f /etc/sysconfig/grml ] && . /etc/sysconfig/grml
-# }}}
-
-checkvalue $CONFIG_KEYBOARD && config_keyboard
-
-[ -n "$SPLASH" ] &&  /usr/bin/grml-bootsplash "||||||">/dev/tty14
-
-checkvalue $CONFIG_BLIND && config_blind
-
-checkvalue $CONFIG_INTERACTIVE && config_interactive
-
-checkvalue $CONFIG_AGP && config_agp
-
-[ -f /etc/sysconfig/grml ] && . /etc/sysconfig/grml
-
-checkvalue $CONFIG_AUTOMOUNTER && config_automounter
+checkvalue $CONFIG_ACPI && config_acpi
 
 checkvalue $CONFIG_DMA && config_dma
 
@@ -207,31 +130,27 @@ checkvalue $CONFIG_FSTAB && config_fstab
 
 checkvalue $CONFIG_MOUSE && config_mouse
 
-checkvalue $CONFIG_DHCP && config_dhcp
-
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|||||||">/dev/tty14
-
-checkvalue $CONFIG_SYSLOG && config_syslog
-
 checkvalue $CONFIG_CPU && config_cpu
 
 checkvalue $CONFIG_SSH && config_ssh
 
+checkvalue $CONFIG_VNC && config_vnc
+
 checkvalue $CONFIG_PASSWD && config_passwd
 
 checkvalue $CONFIG_EXTRACT  && config_extract
 
-checkvalue $CONFIG_HOMEDIR && config_homedir
-
-checkvalue $CONFIG_MYCONFIG && config_myconfig
+checkvalue $CONFIG_FINDDCSDIR && config_finddcsdir
 
 checkvalue $CONFIG_DEBS && config_debs
 
+checkvalue $CONFIG_CONFIG && config_config
+
 checkvalue $CONFIG_SCRIPTS && config_scripts
 
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||||||||">/dev/tty14
+checkvalue $CONFIG_FINDDCSDIR && config_umount_dcsdir
 
-checkvalue $CONFIG_CDROM_SCRIPTS && config_cdrom_scripts
+checkvalue $CONFIG_PARTCONF && config_partconf
 
 # device symlinks {{{
   [ -r /mnt/floppy ] || mkdir /mnt/floppy
@@ -247,35 +166,23 @@ checkvalue $CONFIG_WONDERSHAPER && config_wondershaper
 
 checkvalue $CONFIG_GPM && config_gpm
 
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|||||||||">/dev/tty14
+checkvalue $CONFIG_NETCONFIG && config_netconfig
 
-checkvalue $CONFIG_SERVICES && config_services
+checkvalue $CONFIG_NETSCRIPT && config_netscript
 
-checkvalue $CONFIG_NETCONFIG && config_netconfig
+checkvalue $CONFIG_SERVICES && config_services
 
 checkvalue $CONFIG_NETIPV6 && config_ipv6
 
 checkvalue $CONFIG_DEBNET && config_debnet
 
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||||||||||">/dev/tty14
-
 checkvalue $CONFIG_CONSOLE && config_console
 
-checkvalue $CONFIG_SETKEYCODES && config_setkeycodes
-
-checkvalue $CONFIG_BLINDSOUND && config_blindsound
-
-checkvalue $CONFIG_WELCOME && config_welcome
-
 checkvalue $CONFIG_FIX_UNIONFS && fix_unionfs
 
-checkvalue $CONFIG_CREATE_MNT_DIRS && create_mnt_dirs
-
-checkvalue $CONFIG_915RESOLUTION && config_915resolution
+checkvalue $CONFIG_VIRTUALBOX_SHARED_FOLDERS && config_virtualbox_shared_folders
 
-checkvalue $CONFIG_IPW3945 && config_ipw3945
-
-checkvalue $CONFIG_AUTOMOUNT && config_automount
+checkvalue $CONFIG_MYPATH && config_mypath
 
 checkvalue $CONFIG_DISTCC && config_distcc
 
@@ -283,12 +190,7 @@ checkvalue $CONFIG_DISTRI && config_distri
 
 checkvalue $CONFIG_BLANKING && config_blanking
 
-if [ -n "$SPLASH" ] ; then
-   /usr/bin/grml-bootsplash "|||||||||||">/dev/tty14
-   chvt 1
-fi
-
-checkvalue $CONFIG_GRML2HD && config_grml2hd
+checkvalue $CONFIG_TOHD && config_tohd
 
 checkvalue $CONFIG_DEBOOTSTRAP && config_debootstrap
 
@@ -296,16 +198,18 @@ checkvalue $CONFIG_XSTARTUP && config_x_startup
 # }}}
 
 # {{{ debug
-if [ -z "$SPLASH" ] ; then
-  stage=6
-  rundebugshell
-fi
+stage=6
+rundebugshell
 
 if [ -n "$BOOTDEBUG" ] ; then
-  CMDLINE="$(cat /proc/cmdline)"
-  [ -d /cdrom/bootparams/ ] && CMDLINE="$CMDLINE $(cat /cdrom/bootparams/*)"
-  einfo "Bootoption debug detected. Printing kernel command line:"
-  echo "$CMDLINE"
+   # set only if not already set
+   if [ -z "$CMDLINE" ] ; then
+     CMDLINE="$(cat /proc/cmdline)"
+     [ -d /cdrom/bootparams/ ] && CMDLINE="$CMDLINE $(cat /cdrom/bootparams/*)"
+     [ -d /live/image/bootparams/ ] && CMDLINE="$CMDLINE $(cat /live/image/bootparams/*)"
+   fi
+   einfo "Bootoption debug detected. Printing kernel command line:"
+   echo "$CMDLINE"
 fi
 # }}}