X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=autoconfig.functions;h=e81392145d00cd49200d6006d7fb0384678fc6cb;hp=a28b1f562cb9ddff57baf5fc979c0bbe9acfdab9;hb=b4e2826b9b5ba086d294caca298736a7468b74c1;hpb=a9ef28a9082b24866dcbd5769dcc6c51f09b4ec3 diff --git a/autoconfig.functions b/autoconfig.functions index a28b1f5..e813921 100755 --- a/autoconfig.functions +++ b/autoconfig.functions @@ -320,11 +320,26 @@ config_language(){ [ ${NUM_CONSOLES} -eq 1 ] && NUM_CONSOLES=6 fi CUR_CONSOLE=$(fgconsole 2>/dev/null) + + if [ -x "$(which setfont)" ] ; then + use_setfont=true + elif [ -x "$(which consolechars)" ] ; then + use_consolechars=true + else + eerror "Neither setfont nor consolechars tool present, can not set font." + eend 1 + return 1 + fi + if [ -n "$CHARMAP" ] ; then - einfo "Running consolechars for ${CHARMAP}" + einfo "Setting font to ${CHARMAP}" RC=0 for vc in $(seq 0 ${NUM_CONSOLES}) ; do - consolechars --tty=/dev/tty${vc} -m ${CHARMAP} ; RC=$? + if $use_setfont ; then + setfont -C /dev/tty${vc} $CHARMAP ; RC=$? + elif $use_consolechars ; then + consolechars --tty=/dev/tty${vc} -m ${CHARMAP} ; RC=$? + fi done if [ -n "$CUR_CONSOLE" ] ; then [ "$CUR_CONSOLE" != "serial" ] && chvt $CUR_CONSOLE @@ -336,10 +351,14 @@ config_language(){ ewarn "Skipping setting console font as requested on boot commandline." ; eend 0 else if [ -n "$CONSOLEFONT" ] ; then - einfo "Running consolechars using ${CONSOLEFONT}" + einfo "Setting font to ${CONSOLEFONT}" RC=0 for vc in $(seq 0 ${NUM_CONSOLES}) ; do - consolechars --tty=/dev/tty${vc} -f $CONSOLEFONT ; RC=$? + if $use_setfont ; then + setfont -C /dev/tty${vc} ${CONSOLEFONT} ; RC=$? + elif $use_consolechars ; then + consolechars --tty=/dev/tty${vc} -f ${CONSOLEFONT} ; RC=$? + fi done if [ -n "$CUR_CONSOLE" ] ; then [ "$CUR_CONSOLE" != "serial" ] && chvt $CUR_CONSOLE @@ -442,41 +461,6 @@ config_kernel(){ } # }}} -# {{{ vmware specific stuff -config_vmware(){ -if checkbootparam 'novmware' ; then - ewarn "Skipping running vmware specific stuff as requested on boot commandline." ; eend 0 -else - if [ -z "$INSTALLED" ] ; then - if vmware-detect || checkbootparam "BOOT_IMAGE=vmware" ; then - if ! checkbootparam 'qemu' ; 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 - elif [ -r /proc/acpi/battery/BAT0/info -a -r /etc/X11/xorg.conf.virtualbox ] ; then - if grep -q 'OEM info: innotek' /proc/acpi/battery/BAT0/info ; then - einfo 'Virtual Box: Copying /etc/X11/xorg.conf.virtualbox to /etc/X11/xorg.conf' - cp /etc/X11/xorg.conf.virtualbox /etc/X11/xorg.conf ; eend $? - fi - fi - fi -fi -} -# }}} - -# {{{ 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 -} -# }}} - # {{{ ld.so.cache + depmod config_ld_mod(){ if [ -n "$INSTALLED" ]; then @@ -633,16 +617,6 @@ fi } # }}} -# For burning on IDE-CD-Roms, k3b (and others) check for special permissions {{{ -config_cdrom_perm(){ -CDROMS="" -for DEVICE in /proc/ide/hd?; do - [ "$(cat $DEVICE/media 2>/dev/null)" = "cdrom" ] && CDROMS="$CDROMS /dev/${DEVICE##*/}" -done -[ -n "$CDROMS" ] && { chown root.cdrom $CDROMS; chmod 666 $CDROMS; } 2>/dev/null -} -# }}} - # {{{ Bring up loopback interface now config_local_net(){ if [ -z "$INSTALLED" ] ; then @@ -1042,13 +1016,6 @@ fi } # }}} -# {{{ Interactive configuration -config_interactive(){ - ewarn "config_interactive is deprecated nowadays." - ewarn "Please set CONFIG_INTERACTIVE='no' in /etc/grml/autoconfig" ; eend 0 -} -# }}} - # {{{ AGP config_agp(){ if checkbootparam 'forceagp' ; then @@ -1161,19 +1128,6 @@ if checkbootparam 'swap' || checkbootparam 'anyswap' ; then checkbootparam 'anyswap' && export ANYSWAP='yes' || export ANYSWAP="" fi -if checkbootparam 'nofstab' || checkbootparam 'forensic' ; then - ewarn "Skipping /etc/fstab creation as requested on boot commandline." ; eend 0 -else - einfo "Scanning for harddisk partitions and creating /etc/fstab. (Disable this via boot option: nofstab)" - iszsh && setopt nonomatch - if [ -x /usr/sbin/rebuildfstab ] ; then - config_userfstab || fstabuser=grml - /usr/sbin/rebuildfstab -r -u $fstabuser -g $fstabuser ; eend $? - else - ewarn "Command rebuildfstab not found. Install package grml-rebuildfstab." ; eend 1 - fi -fi # checkbootparam nofstab/forensic - # Scan for swap, config, homedir - but only in live-mode if [ -z "$INSTALLED" ] ; then [ -z "$NOSWAP" ] && einfo "Searching for swap partition(s) as requested." @@ -1315,130 +1269,69 @@ fi } # }}} -# {{{ Fat-Client-Version: DHCP Broadcast for IP address -config_dhcp(){ -if checkbootparam 'nodhcp'; then - ewarn "Skipping DHCP broadcast/network detection as requested on boot commandline." ; eend 0 -else - NETDEVICES="$(awk -F: '/eth.:|tr.:|wlan.:/{print $1}' /proc/net/dev 2>>$DEBUG)" - rm -rf /etc/network/status ; mkdir -p /etc/network/status - for DEVICE in `echo "$NETDEVICES"` ; do - einfo "Network device ${WHITE}${DEVICE}${NORMAL} detected, DHCP broadcasting for IP. (Backgrounding)" - trap 2 3 11 - ifconfig $DEVICE up >>$DEBUG 2>&1 - ( pump -i $DEVICE --script=/usr/lib/grml-autoconfig/pump-runparts >>$DEBUG 2>&1 && echo finished_running_pump > /etc/network/status/$DEVICE ) & - trap "" 2 3 11 - sleep 1 - eend 0 - done - if [ -n "$INSTALLED" ] ; then - ewarn 'If you want to disable automatic DHCP requests set CONFIG_DHCP=no in /etc/grml/autoconfig.' - eend 0 - fi -fi -} -# }}} - # {{{ CPU-detection config_cpu(){ if checkbootparam 'nocpu'; then ewarn "Skipping CPU detection as requested on boot commandline." ; eend 0 + return 0 +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 - # check module dependencies - cpufreq_check() { - if ! [ -e /lib/modules/${KERNEL}/kernel/arch/x86/kernel/cpu/cpufreq ] ; then - if [ -e /lib64 ] ; then - [ -e /lib/modules/${KERNEL}/kernel/arch/x86_64/kernel/cpufreq ] || return 1 + 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 + +# Virtual Box supports ACPI and laptop-detect would return with '0', so check for it: +if [ -r /proc/acpi/battery/BAT0/info ] && grep -q 'OEM info:.*innotek' /proc/acpi/battery/BAT0/info ; then + einfo 'Virtual Box detected, skipping cpufreq setup.' ; eend 0 + return 0 +fi + +if [ -x /etc/init.d/loadcpufreq ] ; then + einfo "Trying to set up cpu frequency scaling:" + eindent + SKIP_CPU_GOVERNOR='' + LOADCPUFREQ=$(mktemp) + /etc/init.d/loadcpufreq start >"$LOADCPUFREQ" 2>&1 ; RC=$? + if grep -q FATAL "$LOADCPUFREQ" ; then + eindent + SKIP_CPU_GOVERNOR=1 + oldIFS="$IFS" + IFS=" +" + for line in $(grep FATAL "$LOADCPUFREQ" | sed 's/.*FATAL: //; s/ (.*)//') ; do + eerror "$line" ; eend $RC + done + IFS="$oldIFS" + eoutdent + elif grep -q done "$LOADCPUFREQ" ; then + MODULE=$(grep done "$LOADCPUFREQ" | sed 's/.*done (\(.*\))./\1/') + if [ -n "$MODULE" -a "$MODULE" != none ]; then + einfo "Loading cpufreq kernel module $MODULE" ; eend 0 else - [ -e /lib/modules/${KERNEL}/kernel/arch/i386/kernel/cpu/cpufreq -o ! -e /lib/modules/${KERNEL}/kernel/drivers/cpufreq ] || return 1 + ewarn "Could not find an appropriate kernel module for cpu frequency scaling." ; eend 1 fi 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 - 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 + rm -f $LOADCPUFREQ - # Disclaimer: sorry for the tons of if/then/else... but this makes sure we use: - # * it only if we have the according kernel modules available - # * cpufreq not inside Virtual Box - # * current version of /etc/init.d/loadcpufreq from Debian (to stay in sync) - # -> parse output of the initscript and output it according to our look'n'feel - # * our own cpufreq-detect.sh if /etc/init.d/loadcpufreq isn't present - if ! cpufreq_check ; then - ewarn "Skipping cpufreq setup as module dependencies are not fulfilled." ; eend 1 - else - # Virtual Box supports ACPI and laptop-detect would return with '0', so check for it: - if [ -r /proc/acpi/battery/BAT0/info ] ; then - if grep -q 'OEM info: innotek' /proc/acpi/battery/BAT0/info ; then - einfo 'Virtual Box detected, skipping cpufreq setup.' ; eend 0 - return 0 - fi - fi - einfo "Trying to set up cpu frequency scaling:" - eindent - if [ -x /etc/init.d/loadcpufreq ] ; then - SKIP_CPU_GOVERNOR='' - LOADCPUFREQ=$(mktemp) - /etc/init.d/loadcpufreq start >"$LOADCPUFREQ" 2>&1 ; RC=$? - if grep -q FATAL "$LOADCPUFREQ" ; then - eindent - SKIP_CPU_GOVERNOR=1 - oldIFS="$IFS" - IFS=" -" - for line in $(grep FATAL "$LOADCPUFREQ" | sed 's/.*FATAL: //; s/ (.*)//') ; do - eerror "$line" ; eend $RC - done - IFS="$oldIFS" - eoutdent - elif grep -q done "$LOADCPUFREQ" ; then - MODULE=$(grep done "$LOADCPUFREQ" | sed 's/.*done (\(.*\))./\1/') - if [ -n "$MODULE" -a "$MODULE" != none ]; then - einfo "Loading cpufreq kernel module $MODULE" ; eend 0 - else - ewarn "Could not find an appropriate kernel module for cpu frequency scaling." ; eend 1 - fi - fi - rm -f $LOADCPUFREQ - elif [ -r /usr/bin/cpufreq-detect.sh ] ; then - . /usr/bin/cpufreq-detect.sh - if [ -n "$MODULE" -a "$MODULE" != none ]; then - einfo "Loading modules ${MODULE}" - modprobe "$MODULE" >>$DEBUG || modprobe "$MODULE_FALLBACK" >>$DEBUG - RC=$? - if [[ "$RC" == 0 ]]; then - eend 0 - else - SKIP_CPU_GOVERNOR=1 - eend $RC - fi - else - ewarn "Could not detect an appropriate CPU for use with cpu frequency scaling - skipping." - eend 1 - fi # $MODULE - fi # loadcpufreq - - if [ -z "$SKIP_CPU_GOVERNOR" ] ; then - einfo "Loading cpufreq_ondemand, setting ondemand governor" - RC=0 - if modprobe cpufreq_ondemand ; RC=$? ; then - for file in $(find /sys/devices/system/cpu/ -name scaling_governor 2>/dev/null) ; do - echo ondemand > $file - done - fi - eend $RC - fi # cpu-governor - - eoutdent + if [ -z "$SKIP_CPU_GOVERNOR" ] ; then + einfo "Loading cpufreq_ondemand, setting ondemand governor" + RC=0 + if modprobe cpufreq_ondemand ; RC=$? ; then + for file in $(find /sys/devices/system/cpu/ -name scaling_governor 2>/dev/null) ; do + echo ondemand > $file + done + fi + eend $RC + fi # cpu-governor - fi # cpufreq_check -fi # checkbootparam nocpu + eoutdent +fi } # }}} @@ -1540,6 +1433,15 @@ if checkbootparam 'vnc' ; then /bin/chown -R "$USER": "$VNCDIR" fi fi + if checkbootparam 'vnc_connect' ; then + VNC_CONNECT='' + VNC_CONNECT="$(getbootparam 'vnc_connect' 2>>$DEBUG)" + einfo "Bootoption vnc_connect found, will start vnc with connect to $VNC_CONNECT." + #store the options in a file + VNCDIR="/home/${USER}/.vnc" + [ -d "$VNCDIR" ] || mkdir "$VNCDIR" + echo " --connect $VNC_CONNECT " >> $VNCDIR/options + fi fi } # }}} @@ -1561,95 +1463,68 @@ fi } # }}} -# {{{ Check for persistent homedir option and eventually mount /home from there, or use a loopback file. -config_homedir(){ -if checkbootparam 'home' ; then - ewarn "The \"home\" bootoption is deprecated, please use the persistency feature instead."; eend 1 -fi -} -# }}} - # {{{ Sound - -config_mixer(){ -if ! [ -x /usr/bin/amixer ] ; then - eerror "amixer binary not available. Can not set sound volumes therefore." ; eend 1 -else - - if ! [ -r /proc/asound/cards ] ; then - ewarn "No soundcard present, skipping mixer settings therefore." ; eend 0 - return - fi - - if checkbootparam 'vol' ; then - VOL="$(getbootparam 'vol' 2>>$DEBUG)" - if [ -z "$VOL" ] ; then - eerror "Bootoption vol found but no volume level/parameter given. Using defaults." ; eend 1 - VOL='75' # default - fi - else - VOL='75' # default - fi - - if checkbootparam 'nosound' ; then - einfo "Muting sound devices on request." - - fix_ibm_sound 0 - # mute the master, this should be sufficient - ERROR=$(amixer -q set Master mute) - RC=$? - - if [ -n "$ERROR" ] ; then - eindent - eerror "Problem muting sound devices: $ERROR" - eoutdent - fi - eend $RC - elif [ -z "$INSTALLED" ]; then - einfo "Setting mixer volumes to level ${WHITE}${VOL}${NORMAL}." - - fix_ibm_sound ${VOL} - - # by default assume '0' as volume for microphone: - if checkbootparam 'micvol' ; then - MICVOL="$(getbootparam 'micvol' 2>>$DEBUG)" - else - MICVOL=0 - fi - - # finally set the volumes: - RC=0 - for CONTROL in Master PCM ; do - amixer -q set ${CONTROL} ${VOL}% - if [ $? -ne 0 ] ; then RC=$? ; fi - done - # dont know how to set microphone volume for all soundcards with amixer, - # so use aumix instead :/ - if [ ${MICVOL} -ne 0 -a -x /usr/bin/aumix ] ; then - aumix -m $MICVOL &>/dev/null - if [ $? -ne 0 ] ; then RC=$? ; fi +config_mixer () { + if ! [ -x /usr/bin/amixer ] ; then + eerror "amixer binary not available. Can not set sound volumes therefore." + eend 1 + else + if ! [ -r /proc/asound/cards ] ; then + ewarn "No soundcard present, skipping mixer settings therefore." + eend 0 + return fi - eend $RC - fi + for card in $(cat /proc/asound/cards| grep -e '^\s*[0-9]' | awk '{print $1}') ; do + einfo "Configuring soundcard \"$(awk -F\[ '/^ *'$card' \[/{ FS=" "; $0=$2; print $1}' < /proc/asound/cards)\"" + eindent -fi -} + if checkbootparam 'vol' ; then + VOL="$(getbootparam 'vol' 2>>$DEBUG)" + if [ -z "$VOL" ] ; then + eerror "Bootoption vol found but no volume level/parameter given. Using defaults (75%)." + VOL='75' + eend 1 + fi + else + VOL='75' + fi -# on some IBM notebooks the front control has to be toggled -fix_ibm_sound() { - if [ -z $1 ] ; then - return - fi + if checkbootparam 'nosound' ; then + einfo "Muting sound devices on request." + ERROR=$(amixer -q set Master mute) + RC=$? + if [ -n "$ERROR" ] ; then + eindent + eerror "Problem muting sound devices: $ERROR" + eoutdent + fi + eend $RC + elif [ -z "$INSTALLED" ] ; then + einfo "Setting mixer volumes to level ${WHITE}${VOL}${NORMAL}." - VOL=${1} + if checkbootparam 'micvol' ; then + MICVOL="$(getbootparam 'micvol' 2>>$DEBUG)" + else + MICVOL=0 + fi - if [ -x /usr/bin/amixer ] ; then - if amixer -q get Front >/dev/null 2>>$DEBUG ; then - amixer -q set Front unmute &>/dev/null - amixer -q set Front ${VOL}% &>/dev/null - fi - fi + for CONTROL in Master PCM ; do + if amixer -q | grep -q "Simple mixer control '$CONTROL'" ; then + amixer -q set "${CONTROL}" "${VOL}"% + eend $? + fi + done + + if [ ${MICVOL} -ne 0 ] ; then + einfo "Setting microphone to ${WHITE}${MICVOL}${NORMAL}." + amixer -q set "Mic" $MICVOL &> /dev/null + eend $? + fi + fi # checkbootparam 'nosound' + eoutdent + done + fi } # }}} @@ -1668,34 +1543,6 @@ fi } # }}} -# {{{ keyboard add-ons -config_setkeycodes(){ -if checkbootparam 'setkeycodes' ; then - einfo "Setting keycodes as requested via bootparameter 'setkeycodes'." - # MS MM keyboard add-on - # fix - setkeycodes e001 126 &>/dev/null - setkeycodes e059 127 &>/dev/null - # fn keys - setkeycodes e03b 59 &>/dev/null - setkeycodes e008 60 &>/dev/null - setkeycodes e007 61 &>/dev/null - setkeycodes e03e 62 &>/dev/null - setkeycodes e03f 63 &>/dev/null - setkeycodes e040 64 &>/dev/null - setkeycodes e041 65 &>/dev/null - setkeycodes e042 66 &>/dev/null - setkeycodes e043 67 &>/dev/null - setkeycodes e023 68 &>/dev/null - setkeycodes e057 87 &>/dev/null - setkeycodes e058 88 &>/dev/null - # hp keycodes - setkeycodes e00a 89 e008 90 &>/dev/null - eend 0 -fi -} -# }}} - # {{{ wondershaper config_wondershaper(){ if checkbootparam 'wondershaper' ; then @@ -1865,19 +1712,12 @@ fix_unionfs(){ } # }}} -# {{{ create all /mnt-directories -create_mnt_dirs(){ - ewarn "create_mnt_dirs is deprecated as grml-rebuildfstab does all we need." - ewarn "Please set CONFIG_CREATE_MNT_DIRS='no' in /etc/grml/autoconfig" ; eend 0 -} -# }}} - # {{{ start X window system via grml-x config_x_startup(){ # make sure we start X only if startx is used *before* a nostartx option # so it's possible to disable automatic X startup using nostart if checkbootparam 'startx' && ! echo "$CMDLINE" | grep -q 'startx.*nostartx' ; then - if [ -x $(which X) ] ; then + if [ -x "$(which X)" ] ; then if [ -z "$INSTALLED" ] ; then WINDOWMANAGER="$(getbootparam 'startx' 2>>$DEBUG)" if [ -z "$WINDOWMANAGER" ] ; then @@ -1941,8 +1781,11 @@ config_finddcsdir() { # foo, even if a GRMLCFG partition is present. DCSDIR="" DCSMP="/mnt/grml" +# autoconfig, see issue673 +GRMLCFG="$(getbootparam 'autoconfig' 2>>$DEBUG)" +[ -n "$GRMLCFG" ] || GRMLCFG="GRMLCFG" if checkbootparam 'noautoconfig' || checkbootparam 'forensic' ; then - ewarn "Skipping running automount of device(s) labeled GRMLCFG as requested." ; eend 0 + ewarn "Skipping running automount of device(s) labeled $GRMLCFG as requested." ; eend 0 else if [ -z "$INSTALLED" ] ; then if checkbootparam 'myconfig' ; then @@ -1951,7 +1794,7 @@ else eerror "Error: No device for bootoption myconfig provided." ; eend 1 fi # [ -z "$DCSDEVICE" ] elif checkvalue $CONFIG_MYCONFIG; then # checkbootparam myconfig - einfo "Searching for device(s) labeled with GRMLCFG. (Disable this via boot option: noautoconfig)" ; eend 0 + einfo "Searching for device(s) labeled with $GRMLCFG. (Disable this via boot option: noautoconfig)" ; eend 0 eindent # We do need the following fix so floppy disk is available to blkid in any case :-/ if [ -r /dev/fd0 ] ; then @@ -1960,7 +1803,7 @@ else blkid /dev/fd0 >>$DEBUG 2>&1 fi fi - DCSDEVICE=$(blkid -t LABEL=GRMLCFG | head -1 | awk -F: '{print $1}') + DCSDEVICE=$(blkid -t LABEL=$GRMLCFG | head -1 | awk -F: '{print $1}') if [ -n "$DCSDEVICE" ]; then DCSMP="/mnt/grmlcfg" fi @@ -2029,6 +1872,9 @@ config_debs(){ if checkbootparam 'debs' ; then iszsh && setopt localoptions shwordsplit DEBS="$(getbootparam 'debs' 2>>$DEBUG)" + if [ -z "$DEBS" ] ; then + DEBS="*.deb" + fi if ! echo $DEBS | grep -q '/'; then # backwards compatibility: if no path is given get debs from debs/ DEBS="debs/$DEBS" @@ -2091,9 +1937,13 @@ if checkbootparam 'config' || [ "$DCSMP" = "/mnt/grmlcfg" ]; then fi fi fi -# umount $DCSMP if it was mounted by finddcsdir -# this doesn't really belong here -grep -q '$DCSMP' /proc/mounts && umount $DCSMP +} +# }}} + +# {{{ confing_umount_dcsdir +config_umount_dcsdir(){ + # umount $DCSMP if it was mounted by finddcsdir + grep -q "$DCSMP" /proc/mounts && umount "$DCSMP" } # }}} @@ -2425,62 +2275,12 @@ config_lvm(){ # {{{ debnet: setup network based on an existing one found on a partition config_debnet(){ if checkbootparam 'debnet' ; then - iszsh && setopt localoptions shwordsplit - DEVICES="$(< /proc/partitions tail -n +3 | awk '{print "/dev/"$4}' | tr "\n" " ")" - DEVICES="$DEVICES $(ls /dev/mapper/*)" - FOUND_DEBNET="" - einfo "Bootoption 'debnet' found. Searching for Debian network configuration: " - eindent - if ! mount | grep '/mnt ' >/dev/null 2>&1 ; then - for i in $DEVICES; do - if mount -o ro -t auto "$i" /mnt >/dev/null 2>&1; then - einfo "Scanning on $i" - if [ -f /mnt/etc/network/interfaces ]; then - einfo "/etc/network/interfaces found on ${i}" ; eend 0 - FOUND_DEBNET="$i" - break - fi - umount /mnt - fi - done - - if [ -n "$FOUND_DEBNET" ]; then - einfo "Stopping network." - pump -k >/dev/null 2>&1 - /etc/init.d/networking stop >/dev/null 2>&1 ; eend $? - einfo "Copying Debian network configuration from $FOUND_DEBNET to running system." - rm -rf /etc/network/run - cp -a /mnt/etc/network /etc - rm -rf /etc/network/run - mkdir /etc/network/run - umount /mnt ; eend $? - einfo "Starting network." - invoke-rc.d networking start ; eend $? - else - eerror "/etc/network/interfaces not found." ; eend 1 - fi - eoutdent - else - eerror "Error: /mnt already mounted." ; eend 1 - fi + /usr/sbin/debnet fi } # }}} -# {{{ check for broken ipw3945 driver which causes problems (especially on hd install) -config_ipw3945() { - if grep -q ipw3945 /proc/modules ; then - if ! iwconfig 2>/dev/null| grep -qe 'IEEE 802' -qe 'unassociated' ; then - ewarn "Broken ipw3945 network interface found, reloading module." - rmmod ipw3945 - modprobe ipw3945 - eend $? - fi - fi -} -# }}} - # {{{ disable console blanking config_blanking(){ if checkbootparam 'noblank' ; then @@ -2534,7 +2334,7 @@ config_tohd() # {{{ grml2hd: automatic installation config_grml2hd(){ -if checkbootparam "BOOT_IMAGE=grml2hd" ; then +if checkbootparam "grml2hd" || checkbootparam "BOOT_IMAGE=grml2hd" ; then if checkbootparam 'user' ; then NEWUSER='' @@ -2586,7 +2386,7 @@ fi # if checkbootparam "BOOT_IMAGE=grml2hd ... # {{{ debootstrap: automatic installation config_debootstrap(){ -if checkbootparam "BOOT_IMAGE=debian2hd" ; then +if checkbootparam "BOOT_IMAGE=debian2hd" || checkbootparam "debian2hd" ; then einfo "Bootoption debian2hd found. Setting up environment for automatic installation via grml-debootstrap." ; eend 0 @@ -2689,14 +2489,5 @@ fi } # }}} -### {{{ backwards compatible stuff -config_environment(){ - ewarn "config_environment is deprecated. Please set CONFIG_ENVIRONMENT 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 -} -# }}} - ## END OF FILE ################################################################# # vim:foldmethod=marker expandtab ai ft=zsh shiftwidth=3