X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=autoconfig.functions;h=150717280ea67ce378cc213b5fe55498942dacd1;hp=aa85c0824e041960aca3fe73aac30be8813e7d3d;hb=acf6153710aa0ac1b65a612ba21f44d79dc7d64c;hpb=aea47d4ad4c27fd01432d76ebb3c5477f73cff97 diff --git a/autoconfig.functions b/autoconfig.functions index aa85c08..1507172 100755 --- a/autoconfig.functions +++ b/autoconfig.functions @@ -4,7 +4,7 @@ # Authors: grml-team (grml.org), (c) Klaus Knopper , (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2. -# Latest change: Don Okt 12 13:00:04 CEST 2006 [mika] +# Latest change: Son Mär 25 12:32:37 CEST 2007 [mika] ################################################################################ # {{{ path, variables, signals, umask, zsh @@ -89,6 +89,7 @@ mount_sys(){ # }}} # {{{ Read in boot parameters +[ -f /proc/version ] || mount_proc # make sure we can access /proc/cmdline when sourcing this file too CMDLINE="$(cat /proc/cmdline)" [ -d /cdrom/bootparams/ ] && CMDLINE="$CMDLINE $(cat /cdrom/bootparams/* | tr '\n' ' ')" # }}} @@ -196,7 +197,7 @@ config_language(){ # set default to 'en' in live-cd mode if $LANGUAGE is not yet set: if [ -z "$INSTALLED" ] ; then - [ -n "$LANGUAGE" ] || LANGUAGE='en' + [ -n "$LANGUAGE" ] || LANGUAGE='en-utf8' fi # if bootoption lang is used update /etc/default/locale, otherwise *not*! @@ -208,10 +209,11 @@ config_language(){ if [ -z "$CONSOLEFONT" ] ; then if ! checkbootparam "nodefaultfont" >>$DEBUG 2>&1 ; then # [ -n "$UTF8" ] && CONSOLEFONT='LatArCyrHeb-16' || CONSOLEFONT='Lat15-Terminus16' - if [ -r /usr/share/consolefonts/Lat15-Terminus16.psf.gz ] ; then - CONSOLEFONT='Lat15-Terminus16' + # if [ -r /usr/share/consolefonts/Lat15-Terminus16.psf.gz ] ; then + if [ -r /usr/share/consolefonts/Uni3-Terminus16.psf.gz ] ; then + CONSOLEFONT='Uni3-Terminus16' else - ewarn "/usr/share/consolefonts/Lat15-Terminus16.psf.gz not available. Please upgrade package console-terminus." ; eend 1 + ewarn "/usr/share/consolefonts/Uni3-Terminus16.psf.gz not available. Please upgrade package console-terminus." ; eend 1 fi fi fi @@ -259,6 +261,7 @@ config_language(){ [[ "$KKEYBOARD" == 'at' ]] && KEYTABLE=de-latin1-nodeadkeys # write keyboard related variables to file for later use + [ -d /etc/sysconfig ] || mkdir /etc/sysconfig echo "KEYTABLE=\"$KEYTABLE\"" > /etc/sysconfig/keyboard echo "XKEYBOARD=\"$XKEYBOARD\"" >> /etc/sysconfig/keyboard echo "KDEKEYBOARD=\"$KDEKEYBOARD\"" >> /etc/sysconfig/keyboard @@ -278,22 +281,27 @@ config_language(){ einfo "Running consolechars using ${CONSOLEFONT}" consolechars -f $CONSOLEFONT || consolechars -d eend $? - - if [ -n "$UTF8" ] ; then - einfo "Notice: run 'filterm - dynafont' in your shell to enable a unicode capable console." - fi fi # we have to set up all consoles, therefore loop it over all ttys: if [ -n "$CHARMAP" ] ; then - einfo "Running consolechars for ${CHARMAP}" - NUM_CONSOLES=`fgconsole --next-available` - NUM_CONSOLES=`expr ${NUM_CONSOLES} - 1` - [ ${NUM_CONSOLES} -eq 1 ] && NUM_CONSOLES=6 - for vc in `seq 0 ${NUM_CONSOLES}` ; do - consolechars --tty=/dev/tty${vc} -m ${CHARMAP} ; RC=$? - done - eend ${RC} + einfo "Running consolechars for ${CHARMAP}" + NUM_CONSOLES=`fgconsole --next-available` + NUM_CONSOLES=`expr ${NUM_CONSOLES} - 1` + [ ${NUM_CONSOLES} -eq 1 ] && NUM_CONSOLES=6 + for vc in `seq 0 ${NUM_CONSOLES}` ; do + consolechars --tty=/dev/tty${vc} -m ${CHARMAP} ; RC=$? + done + eend ${RC} + fi + + # activate unicode console if running within utf8 environment + if [ -r /etc/default/locale ] ; then + if grep -q "LANG=.*UTF" /etc/default/locale ; then + einfo "Setting up unicode environment." + unicode_start + eend $? + fi fi eoutdent @@ -315,7 +323,13 @@ config_hostname(){ # fstabuser (needed when running from harddisk with username != grml {{{ config_userfstab(){ - fstabuser=$(getent passwd 1000 | cut -d: -f1) + [ -r /etc/grml/autoconfig ] && . /etc/grml/autoconfig + if [ -n "$CONFIG_FSTAB_USER" ] ; then + fstabuser="$CONFIG_FSTAB_USER" + else + fstabuser=$(getent passwd 1000 | cut -d: -f1) + fi + # if not yet set fall back to default 'grml' user [ -n "$fstabuser" ] || fstabuser='grml' } # }}} @@ -324,58 +338,80 @@ config_userfstab(){ config_time(){ # don't touch the files if running from harddisk: if [ -z "$INSTALLED" ]; then - UTC="" - checkbootparam utc >>$DEBUG 2>&1 && UTC="-u" - checkbootparam gmt >>$DEBUG 2>&1 && UTC="-u" - # hwclock uses the TZ variable - export TZ - hwclock $UTC -s + UTC="" + checkbootparam utc >>$DEBUG 2>&1 && UTC="-u" + checkbootparam gmt >>$DEBUG 2>&1 && UTC="-u" + # hwclock uses the TZ variable + [ -r /etc/timezone ] && TZ=$(cat /etc/timezone) + [ -n "$TZ" ] || TZ=Europe/Vienna + + if ! [ -r /dev/rtc ] ; then + ewarn "Realtime clock not available, skipping execution of hwclock therefore." ; eend 0 + else + ERROR=$(TZ="$TZ" hwclock $UTC -s 2>&1 | head -1) ; RC=$? + if [ -n "$ERROR" ] ; then + eindent + ERROR=$(TZ="$TZ" hwclock $UTC -s --directisa 2>&1 | head -1) + if [ -n "$ERROR" ] ; then + eerror "Problem running hwclock: $ERROR" ; eend 1 + fi + eoutdent + fi + fi fi } # }}} # {{{ print kernel info config_kernel(){ - vmware-detect &>/dev/null && VMWARE="inside ${WHITE}VMWare${NORMAL}" + vmware-detect &>/dev/null && VMWARE="inside ${WHITE}VMware/Qemu${NORMAL}" + [ -d /proc/xen ] && VMWARE='' # vmware-detect returns '0' when running with a Xen-enabled kernel einfo "Running Linux Kernel $KERNEL $VMWARE" ; eend 0 + if [ -r /proc/cpuinfo ] ; then + if egrep -q '^flags.*(vmx|svm)' /proc/cpuinfo ; then + eindent + einfo 'CPU(s) featuring virtualization technology detected' ; eend 0 + eoutdent + fi + fi + if [ -d /proc/xen ] ; then + eindent + einfo 'Running kernel featuring support for Xen detected' ; eend 0 + eoutdent + fi } # }}} # {{{ vmware specific stuff config_vmware(){ if checkbootparam novmware ; then - ewarn "Skipping running vmware specific stuff as requested on boot commandline." ; eend 0 + ewarn "Skipping running vmware specific stuff as requested on boot commandline." ; eend 0 else - if [ -z "$INSTALLED" ]; then - if vmware-detect ; then - if [ -r /etc/X11/xorg.conf.vmware ] ; then - einfo "Copying /etc/X11/xorg.conf.vmware to /etc/X11/xorg.conf" - cp /etc/X11/xorg.conf.vmware /etc/X11/xorg.conf ; eend $? - fi - fi - fi + if [ -z "$INSTALLED" ] ; then + if ! checkbootparam qemu ; then + if vmware-detect ; then + if [ -r /etc/X11/xorg.conf.vmware ] ; then + einfo "VMware: Copying /etc/X11/xorg.conf.vmware to /etc/X11/xorg.conf" + cp /etc/X11/xorg.conf.vmware /etc/X11/xorg.conf ; eend $? + fi + fi + fi + fi fi } # }}} -# {{{ installed on hd? -config_checkfs(){ -if [ -n "$INSTALLED" ]; then - einfo "Running from HD, checking filesystems." -# We are running from HD, so a file system check is recommended - [ -f /etc/init.d/checkroot.sh ] && /etc/init.d/checkroot.sh - [ -f /etc/init.d/checkfs.sh ] && /etc/init.d/checkfs.sh - eend 0 +# {{{ qemu specific stuff +config_qemu(){ +if checkbootparam qemu ; then + if [ -r /etc/X11/xorg.conf.example ] ; then + einfo "Qemu: Copying /etc/X11/xorg.conf.example to /etc/X11/xorg.conf" + cp /etc/X11/xorg.conf.example /etc/X11/xorg.conf ; eend $? + fi fi } # }}} -# {{{ / must be read-write in any case, starting from here -config_remount_root(){ - mount -o remount,rw / 2>>$DEBUG -} -# }}} - # {{{ ld.so.cache + depmod config_ld_mod(){ if [ -n "$INSTALLED" ]; then @@ -494,7 +530,11 @@ done # {{{ Bring up loopback interface now config_local_net(){ if [ -z "$INSTALLED" ] ; then - grep -q lo=lo /etc/network/run/ifstate 2>/dev/null || ifup lo + if grep -q 'iface lo inet loopback' /etc/network/interfaces 2>/dev/null ; then + grep -q lo=lo /etc/network/run/ifstate 2>/dev/null || ifup lo + else + ifconfig lo up + fi fi } # }}} @@ -632,7 +672,7 @@ fi } # }}} -# {{{ blacklist specific module +# {{{ blacklist specific module [ used in /etc/init.d/udev ] config_blacklist(){ if checkbootparam "blacklist" ; then if [ -z "$INSTALLED" ]; then @@ -915,7 +955,7 @@ check_partitions 1>/dev/null 2>&1 # avoid output "check_partitions:3: read-only # }}} # {{{ Enable DMA for all IDE drives now if not disabled -# Notice: Already done by linuxrc, maybe not on hd-installations +# Notice: Already done by linuxrc, but make sure it's done also on harddisk-installed systems config_dma(){ if checkbootparam "nodma"; then ewarn "Skipping DMA accelleration as requested on boot commandline." ; eend 0 @@ -938,9 +978,9 @@ fi # {{{ Start creating /etc/fstab with HD partitions and USB SCSI devices now config_fstab(){ -NOSWAP="" -if checkbootparam "noswap" -o checkbootparam "forensic" ; then - NOSWAP="yes" +NOSWAP="yes" # we do not use swap by default! +if checkbootparam "swap" -o checkbootparam "anyswap" ; then + NOSWAP='' fi if checkbootparam "nofstab" -o checkbootparam "forensic" ; then @@ -961,8 +1001,8 @@ else fi fi # Scan for swap, config, homedir -if [ -z "$NOSWAP" -o -z "$INSTALLED" ]; then - einfo "Checking for swap partition(s)." +if [ -z "$NOSWAP" ]; then + einfo "Searching for swap partition(s) as requested." fi GRML_IMG="" GRML_SWP="" @@ -975,7 +1015,9 @@ if [ -n "$partitions" ]; then case "$f" in swap) eindent if [ -n "$NOSWAP" ]; then - ewarn "Ignoring swap partition ${WHITE}$p${NORMAL} as requested." ; eend 0 + if [ -z "$INSTALLED" ] ; then + ewarn "Ignoring swap partition ${WHITE}$p${NORMAL}. (Force usage via boot option 'swap', or execute grml-swapon)" ; eend 0 + fi else case "$(dd if=$p bs=1 count=6 skip=4086 2>/dev/null)" in S1SUSP|S2SUSP|pmdisk|[zZ]*) @@ -1016,9 +1058,11 @@ if [ -n "$partitions" ]; then *) continue ;; # *) NONEFOUND='1'; continue ;; esac - mount -o "$MOUNTOPTS" -t $f $p $m 2>>$DEBUG || continue - # Activate swapfile, if exists - SWAPFILE="$(/bin/ls -1d $m/[Gg][Rr][Mm][Ll].[Ss][Ww][Pp] 2>/dev/null)" + if [ -z "$NOSWAP" ] ; then + mount -o "$MOUNTOPTS" -t $f $p $m 2>>$DEBUG || continue + # Activate swapfile, if exists + SWAPFILE="$(/bin/ls -1d $m/[Gg][Rr][Mm][Ll].[Ss][Ww][Pp] 2>/dev/null)" + fi if [ -z "$NOSWAP" -a -n "$SWAPFILE" -a -f "$SWAPFILE" ]; then mount -o remount,rw $m if swapon "$SWAPFILE" 2>>$DEBUG ; then @@ -1069,22 +1113,19 @@ if checkbootparam "ipv6"; then # we probably need some time until stateless autoconfiguration has happened sleep 2 NETDEVICES="$(awk -F: '/eth.:|tr.:|wlan.:/{print $1}' /proc/net/dev 2>>$DEBUG)" - for DEVICE in `echo "$NETDEVICES"` - do - eindent - einfo "$DEVICE:" - ADDRESSES="$(ifconfig $DEVICE | awk '/.*inet6 addr:.*/{print $3}')" - COUNT="$(ifconfig $DEVICE | awk '/.*inet6 addr:.*/{ sum += 1};END {print sum }')" + for DEVICE in `echo "$NETDEVICES"`; do eindent - for ADDR in `echo "$ADDRESSES"` - do - einfo "$ADDR" - done - if [ "$COUNT" -eq "0" ] - then - einfo "(none)" ; eend 1 - fi - eoutdent + einfo "$DEVICE:" + ADDRESSES="$(ifconfig $DEVICE | awk '/.*inet6 addr:.*/{print $3}')" + COUNT="$(ifconfig $DEVICE | awk '/.*inet6 addr:.*/{ sum += 1};END {print sum }')" + eindent + for ADDR in `echo "$ADDRESSES"` ; do + einfo "$ADDR" + done + if [ "$COUNT" -eq "0" ] ; then + einfo "(none)" ; eend 1 + fi + eoutdent eoutdent done eend 0 @@ -1170,56 +1211,39 @@ config_cpu(){ if checkbootparam "nocpu"; then ewarn "Skipping CPU detection as requested on boot commandline." ; eend 0 else - if ! [ -x /etc/init.d/powernowd ] ; then - ewarn "Skipping CPU detection as powernowd dependencies are not fulfilled." ; eend 1 - elif [ ! -e /lib/modules/${KERNEL}/kernel/arch/i386/kernel/cpu/cpufreq -o ! -e /lib/modules/${KERNEL}/kernel/drivers/cpufreq ] ; then - ewarn "Skipping CPU detection as module dependencies are not fulfilled." ; eend 1 + # check module dependencies + cpufreq_check() { + if [ -e /lib64 ] ; then + [ -e /lib/modules/${KERNEL}/kernel/arch/x86_64/kernel/cpufreq ] || return 1 + else + [ -e /lib/modules/${KERNEL}/kernel/arch/i386/kernel/cpu/cpufreq -o ! -e /lib/modules/${KERNEL}/kernel/drivers/cpufreq ] || return 1 + fi + } + + if [[ `grep -c processor /proc/cpuinfo` -gt 1 ]] ; then + einfo "Detecting CPU:" + CPU=$(awk -F: '/^processor/{printf " Processor"$2" is"};/^model name/{printf $2};/^vendor_id/{printf vendor};/^cpu MHz/{printf " %dMHz",int($2)};/^cache size/{printf ","$2" Cache"};/^$/{print ""}' /proc/cpuinfo 2>>$DEBUG) + echo $CPU | sed 's/ \{1,\}/ /g' + eend 0 else - if [[ `grep -c processor /proc/cpuinfo` -gt 1 ]] ; then - einfo "Detecting CPU:" - CPU=$(awk -F: '/^processor/{printf " Processor"$2" is"};/^model name/{printf $2};/^vendor_id/{printf vendor};/^cpu MHz/{printf " %dMHz",int($2)};/^cache size/{printf ","$2" Cache"};/^$/{print ""}' /proc/cpuinfo 2>>$DEBUG) - echo $CPU | sed 's/ \{1,\}/ /g' - eend 0 - else - einfo "Detecting CPU: `awk -F: '/^processor/{printf " Processor"$2" is"};/^model name/{printf $2};/^vendor_id/{printf vendor};/^cpu MHz/{printf " %dMHz",int($2)};/^cache size/{printf ","$2" Cache"};/^$/{print ""}' /proc/cpuinfo 2>>$DEBUG` " ; eend 0 - fi - if /usr/sbin/laptop-detect ; then - einfo "Detected Laptop - trying to use cpu frequency scaling:" -# loadcpumod() { -# for module in /lib/modules/${KERNEL}/kernel/arch/i386/kernel/cpu/cpufreq/*.ko /lib/modules/${KERNEL}/kernel/drivers/cpufreq/*.ko ; do -# # modprobe ${${${${(f)"$(_call_program modules ${(M)words[1]##*/}modprobe -l | grep cpufreq 2>>$DEBUG)"}:#}##*/}%.*} -# modprobe `basename ${module%%\.ko}` 1>>$DEBUG 2>&1 -# done -# } -# CPU=$(grep 'model name' /proc/cpuinfo | cut -b14- | head -1) -# eindent -# if [[ $CPU = *Intel* ]] ; then -# einfo "Detected CPU is of type Intel - loading modules and starting cpudyn." -# local DETECTED=1 -# loadcpumod -# /etc/init.d/cpudyn start 1>>$DEBUG ; eend $? -# fi -# if [[ $CPU = *AMD* ]] ; then -# einfo "Detected CPU is of type AMD - loading modules and starting powernowd." -# local DETECTED=1 -# loadcpumod -# /etc/init.d/powernowd start 1>>$DEBUG ; eend $? -# fi + einfo "Detecting CPU: `awk -F: '/^processor/{printf " Processor"$2" is"};/^model name/{printf $2};/^vendor_id/{printf vendor};/^cpu MHz/{printf " %dMHz",int($2)};/^cache size/{printf ","$2" Cache"};/^$/{print ""}' /proc/cpuinfo 2>>$DEBUG` " ; eend 0 + fi - eindent - if [ -r /usr/bin/cpufreq-detect.sh ] ; then - . /usr/bin/cpufreq-detect.sh - if [ -n "$MODULE" -a "$MODULE" != none ]; then - einfo "Loading module ${MODULE} and starting powernowd." - modprobe cpufreq_userspace 1>>$DEBUG - modprobe "$MODULE" 1>>$DEBUG || modprobe "$MODULE_FALLBACK" 1>>$DEBUG - /etc/init.d/powernowd start 1>>$DEBUG ; eend $? - else - ewarn "Could not detect an appropriate CPU for use with powernowd - skipping." && eend 1 - fi - fi - eoutdent - fi + if ! cpufreq_check ; then + ewarn "Skipping cpufreq setup as module dependencies are not fulfilled." ; eend 1 + else + if /usr/sbin/laptop-detect ; then + einfo "Detected Laptop - trying to use cpu frequency scaling:" + eindent + einfo "Loading module cpufreq_ondemand and adjusting scaling_governor." + if modprobe cpufreq_ondemand && RC=0 || RC=1 ; then + for file in $(find /sys/devices/system/cpu/ -name scaling_governor 2>/dev/null) ; do + echo ondemand > $file + done + fi + eend $RC + eoutdent + fi fi fi } @@ -1265,6 +1289,7 @@ fi # {{{ Check for persistent homedir option and eventually mount /home from there, or use a loopback file. config_homedir(){ +if checkbootparam home ; then HOMEDIR="$(getbootparam home)" MYHOMEDEVICE="" MYHOMEMOUNTPOINT="" @@ -1338,91 +1363,7 @@ $(cat /proc/mounts) EOT fi fi -} -# }}} - -# {{{ Check if we want the config floppy -config_old_myconfig(){ -MYCONF="" -case "$CMDLINE" in *\ myconfig*) MYCONF="yes"; ;; esac -if [ -n "$MYCONF" ]; then - einfo "Bootoption myconfig detected." && eend 0 -# Check for given config directory - MYCONFDIR="$(getbootparam 'myconfig')" - [ -n "$MYCONFDIR" ] || MYCONFDIR="$(getbootparam 'myconfig')" -fi - -# Check for configuration floppy add-on if not running from HD -if [ -z "$INSTALLED" -a -n "$MYCONF" ]; then - FOUND_CONFIG="" - if [ -n "$MYCONFDIR" ]; then - case "$MYCONFDIR" in - /dev/*) - MYCONFDEVICE="${MYCONFDIR##/dev/}" - MYCONFDEVICE="/dev/${MYCONFDEVICE%%/*}" - MYCONFMOUNTPOINT="/mnt/${MYCONFDEVICE##/dev/}" - MYCONFDIR="/mnt/${MYCONFDIR##/dev/}" - ;; - /mnt/*) - MYCONFDEVICE="${MYCONFDIR##/mnt/}" - MYCONFDEVICE="/dev/${MYCONFDEVICE%%/*}" - MYCONFMOUNTPOINT="/mnt/${MYCONFDEVICE##/dev/}" - ;; - [Aa][Uu][Tt][Oo]|[Ss][Cc][Aa][Nn]|[Ff][Ii][Nn][Dd]) - MYCONFDIR="$(findfile grml.sh)" - if [ -n "$MYCONFDIR" ]; then - MYCONFDEVICE="${MYCONFDIR##/mnt/}" - MYCONFDEVICE="/dev/${MYCONFDEVICE%%/*}" - MYCONFMOUNTPOINT="/mnt/${MYCONFDEVICE##/dev/}" - MYCONFDIR="${MYCONFMOUNTPOINT}" - else - FOUND_CONFIG="none" - fi - ;; - *) - eerror "Invalid configdir '$MYCONFDIR' specified (must start with /dev/ or /mnt/ or 'scan')." ; eend 1 - eerror "Option ignored." - FOUND_CONFIG="invalid" - ;; - esac - else - MYCONFDEVICE="/dev/fd0" - MYCONFMOUNTPOINT="/mnt/floppy" - MYCONFDIR="/mnt/floppy" - fi - - eindent - if [ -z "$FOUND_CONFIG" ]; then - einfo "Checking ${WHITE}${MYCONFDIR}${NORMAL} for grml configuration files...${NORMAL}" - [ -d $MYCONFMOUNTPOINT ] || mkdir $MYCONFMOUNTPOINT && chown grml: $MYCONFMOUNTPOINT - if trymount "$MYCONFDEVICE" "$MYCONFMOUNTPOINT"; then - MYCONFIG="$(/bin/ls -1d $MYCONFDIR/[Gg][Rr][Mm][Ll].[Ss][Hh] 2>>$DEBUG)" - if [ -n "$MYCONFIG" -a -f "$MYCONFIG" ]; then - echo "" - FOUND_CONFIG="yes" - einfo "Found, now executing ${WHITE}${MYCONFIG}${NORMAL}." - echo "6" > /proc/sys/kernel/printk - . "$MYCONFIG" "$MYCONFDIR" || true - echo "0" > /proc/sys/kernel/printk - fi - umount "$MYCONFMOUNTPOINT" 2>>$DEBUG - fi - fi - [ -n "$FOUND_CONFIG" ] || eerror "Not present." - eoutdent -fi -# }}} - -# {{{ Check for extra shellscript on CD-ROM (/cdrom/GRML/grml.sh) -MYCONFIG="$(/bin/ls -1d /cdrom/GRML/[Gg][Rr][Mm][Ll].[Ss][Hh] 2>>$DEBUG)" -if [ -n "$MYCONFIG" -a -f "$MYCONFIG" ]; then - echo "" - FOUND_CONFIG="yes" - einfo "grml script/configuration file found on CD, executing ${BLUE}${MYCONFIG}${NORMAL}:" - echo "6" > /proc/sys/kernel/printk - . "$MYCONFIG" /cdrom/GRML || true - echo "0" > /proc/sys/kernel/printk -fi +fi # checkbootparam home } # }}} @@ -1688,9 +1629,17 @@ if checkbootparam startx ; then sudo -u $fstabuser -i /usr/bin/grml-x $WINDOWMANAGER 1>>$DEBUG EOF chmod 755 /etc/init.d/xstartup - sed -i 's/^allowed_users=.*/allowed_users=anybody/' /etc/X11/Xwrapper.config - sed -i 's#^6.*#6:2345:respawn:/bin/zsh --login -c "/etc/init.d/xstartup ; /bin/zsh"#' /etc/inittab + + sed -i 's#^6:.*#6:2345:respawn:/bin/zsh --login -c "/etc/init.d/xstartup ; /bin/zsh"#' /etc/inittab + /sbin/telinit q ; eend $? + + if grep -q '^allowed_users=' /etc/X11/Xwrapper.config ; then + sed -i 's/^allowed_users=.*/allowed_users=anybody/' /etc/X11/Xwrapper.config + else + echo 'allowed_users=anybody' >> /etc/X11/Xwrapper.config + fi + else eerror "We are not running from CD - startx will not work, skipping it. Please use something like xdm, gdm or kdm for starting X on a harddisk system!" ; eend 1 @@ -1759,6 +1708,17 @@ fi } config_myconfig(){ + +if checkbootparam "config" ; then + CONFIG="$(getbootparam 'config' 2>>$DEBUG)" + [ -z "$CONFIG" ] && CONFIG='config.tbz' + einfo "Bootoption config found. config is set to: $CONFIG" + eindent + einfo "Trying to extract configuration file ${CONFIG}:" + cd / && unp /cdrom/config/$CONFIG $EXTRACTOPTIONS ; eend $? + eoutdent +fi + if checkbootparam myconfig ; then MOUNTDEVICE="$(getbootparam 'myconfig' 2>>$DEBUG)" if [ -n "$MOUNTDEVICE" ]; then @@ -1830,18 +1790,6 @@ if checkbootparam "debs" ; then fi } -config_config(){ -if checkbootparam "config" ; then - CONFIG="$(getbootparam 'config' 2>>$DEBUG)" - [ -z "$CONFIG" ] && CONFIG='config.tbz' - einfo "Bootoption config found. config is set to: $CONFIG" - eindent - einfo "Trying to extract configuration file ${CONFIG}:" - cd / && unp /cdrom/config/$CONFIG $EXTRACTOPTIONS ; eend $? - eoutdent -fi -} - config_scripts(){ if checkbootparam "scripts" ; then SCRIPTS="$(getbootparam 'scripts' 2>>$DEBUG)" @@ -1994,55 +1942,64 @@ fi config_swraid(){ if [ -z "$INSTALLED" ] ; then # notice: checkbootparam "forensic" is just for users who don't know how to really use the bootoption - if checkbootparam "noraid" -o checkbootparam "forensic" -o checkbootparam "raid=noautodetect" ; then - ewarn "Skipping search for SW-RAID as requested on boot commandline." ; eend 0 + if checkbootparam 'noraid' -o checkbootparam 'noswraid' -o \ + checkbootparam 'forensic' -o checkbootparam 'raid=noautodetect' ; then + ewarn "Skipping SW-RAID code as requested on boot commandline." ; eend 0 else if ! [ -x /sbin/mdadm ] ; then eerror "mdadm not available, can not execute it." ; eend 1 else + # if ! egrep -qv '^(MAILADDR.*|#.*|)$' /etc/mdadm/mdadm.conf 2>>$DEBUG ; then + # find out whether we have a valid configuration file already if ! grep -q ARRAY /etc/mdadm/mdadm.conf 2>>$DEBUG ; then - einfo "Creating /etc/mdadm/mdadm.conf" - [ -r /etc/mdadm/mdadm.conf ] && mv /etc/mdadm/mdadm.conf /etc/mdadm/mdadm.conf.old - /usr/share/mdadm/mkconf > /etc/mdadm/mdadm.conf ; eend $? - else - ewarn "/etc/mdadm/mdadm.conf looks like a configured mdadm setup, will not touch it." ; eend 0 + einfo "Creating /etc/mdadm/mdadm.conf for use with mdadm." + [ -r /etc/mdadm/mdadm.conf ] && mv /etc/mdadm/mdadm.conf /etc/mdadm/mdadm.conf.old + MDADM_MAILADDR__='root' /usr/share/mdadm/mkconf > /etc/mdadm/mdadm.conf ; eend $? + else + ewarn "/etc/mdadm/mdadm.conf looks like a configured mdadm setup, will not touch it." ; eend 0 fi - einfo "Searching for software RAID arrays (disable via bootoption noraid):" - eindent - IFSOLD=${IFS:-} - IFS=' + if ! checkbootparam 'swraid' ; then + eindent + einfo "Just run 'Start mdadm-raid' to assemble md arrays or boot using 'swraid' as bootoption for autostart." + eoutdent + else + einfo "Bootoption swraid found. Searching for software RAID arrays:" + eindent + IFSOLD=${IFS:-} + IFS=' ' - for line in $(mdadm --assemble --scan --auto=yes --symlink=no 2>&1) ; do - case $line in - *'No arrays found'*) - ewarn "$line" ; eend 0 - ;; - *) - einfo "$line" ; eend 0 - ;; - esac - done - IFS=$IFSOLD - eoutdent + for line in $(mdadm --assemble --scan --auto=yes --symlink=no 2>&1) ; do + case $line in + *'No arrays found'*) + ewarn "$line" ; eend 0 + ;; + *) + einfo "$line" ; eend 0 + ;; + esac + done + IFS=$IFSOLD + eoutdent - if [ -r /proc/mdstat ] ; then - eindent - MDSTAT=$(grep '^md[0-9]' /proc/mdstat) - if [ -z "$MDSTAT" ] ; then - ewarn "No active arrays found" ; eend 0 - else - IFSOLD=${IFS:-} - IFS=' + if [ -r /proc/mdstat ] ; then + eindent + MDSTAT=$(grep '^md[0-9]' /proc/mdstat) + if [ -z "$MDSTAT" ] ; then + ewarn "No active arrays found" ; eend 0 + else + IFSOLD=${IFS:-} + IFS=' ' - for line in $(grep '^md[0-9]' /proc/mdstat) ; do - einfo "active arrays: $line" ; eend 0 - done - IFS=$IFSOLD - fi - eoutdent - fi + for line in $(grep '^md[0-9]' /proc/mdstat) ; do + einfo "active arrays: $line" ; eend 0 + done + IFS=$IFSOLD + fi + eoutdent + fi # /proc/mdstat + fi # bootoption swraid fi # is /sbin/mdadm executable? fi # check for bootoptions @@ -2158,9 +2115,6 @@ fi config_environment(){ ewarn "config_environment is deprecated. Please set CONFIG_ENVIRONMENT in /etc/grml/autoconfig to 'no'." ; eend 0 } -config_running_from() { - ewarn "config_running_from is deprecated. Please set CONFIG_RUNNING_FROM in /etc/grml/autoconfig to 'no'." ; eend 0 -} config_keyboard(){ ewarn "config_keyboard is deprecated. Please set CONFIG_KEYBOARD in /etc/grml/autoconfig to 'no'." ; eend 0 }