X-Git-Url: http://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=autoconfig.functions;h=577e3b0a832dfab4002893771d3cbd3158541540;hp=46c5d43aa5efd6fae6fc3ceaea8b58e4447770fe;hb=da0eb41311219114b01918f36e6ec051bf22e472;hpb=5afe60315c73b5943152c79c3f4c64dae5699a42 diff --git a/autoconfig.functions b/autoconfig.functions index 46c5d43..577e3b0 100755 --- a/autoconfig.functions +++ b/autoconfig.functions @@ -15,8 +15,10 @@ umask 022 # old linuxrc version: [ -d /cdrom ] && export LIVECD_PATH=/cdrom -# new initramfs layout: +# initramfs layout until around December 2012: [ -d /live/image ] && export LIVECD_PATH=/live/image +# initramfs layout since around December 2012: +[ -d /lib/live/mount/medium ] && export LIVECD_PATH=/lib/live/mount/medium # Ignore these signals in non-interactive mode: INT, TERM, SEGV [ -z "$PS1" ] && trap "" 2 3 11 @@ -38,13 +40,12 @@ if [ -z "$CMDLINE" ]; then # if CMDLINE was set from the outside, we're debugging. # otherwise, take CMDLINE from Kernel and config files. CMDLINE="$(cat /proc/cmdline)" - [ -d /cdrom/bootparams/ ] && CMDLINE="$CMDLINE $(cat /cdrom/bootparams/* | tr '\n' ' ')" - [ -d /live/image/bootparams/ ] && CMDLINE="$CMDLINE $(cat /live/image/bootparams/* | tr '\n' ' ')" + [ -d ${LIVECD_PATH}/bootparams/ ] && CMDLINE="$CMDLINE $(cat ${LIVECD_PATH}/bootparams/* | tr '\n' ' ')" modprobe 9p 2>/dev/null || true if grep -q 9p /proc/filesystems ; then - local TAG="grml-parameters" + TAG="grml-parameters" if grep -q "$TAG" /sys/bus/virtio/devices/*/mount_tag 2>/dev/null ; then - local MOUNTDIR="$(mktemp -d)" + MOUNTDIR="$(mktemp -d)" mount -t 9p -o trans=virtio,ro "$TAG" "$MOUNTDIR" CMDLINE="$CMDLINE $(cat "$MOUNTDIR"/* 2>/dev/null | tr '\n' ' ')" umount "$MOUNTDIR" @@ -109,6 +110,28 @@ checkgrmlsmall(){ grep -q small /etc/grml_version 2>>$DEBUG && return 0 || return 1 } +# if no password is set return a random password +set_passwd() { + [ -n "$PASSWD" ] && return 0 + + if [ -x /usr/bin/apg ] ; then + PASSWD="$(apg -M NL -a 0 -m 8 -x 12 -n 1)" + elif [ -x /usr/bin/gpw ] ; then + PASSWD="$(gpw 1)" + elif [ -x /usr/bin/pwgen ] ; then + PASSWD="$(pwgen -1 8)" + elif [ -x /usr/bin/hexdump ] ; then + PASSWD="$(dd if=/dev/urandom bs=14 count=1 2>/dev/null | hexdump | awk '{print $3 $4}')" + elif [ -n "$RANDOM" ] ; then + PASSWD="grml${RANDOM}" + else + PASSWD='' + eerror "Empty passphrase and neither apg, gpw, pwgen, hexdump nor \$RANDOM available. Skipping." + eend 1 + return 1 + fi +} + ### }}} # {{{ filesystems (proc, pts, sys) and fixes @@ -130,6 +153,23 @@ INSTALLED="" [ -e /etc/grml_cd ] || INSTALLED="yes" # }}} +# {{{ provide information about virtual environments +VIRTUAL=false # assume physical system by default +KVM=false +VIRTUALBOX=false +VMWARE=false + +if vmware-detect &>/dev/null; then + VIRTUAL=true; VMWARE=true; VIRTUAL_ENV='VMware' +elif [ "$(virt-what 2>/dev/null)" = "kvm" ] || \ + [ "$(imvirt 2>/dev/null)" = "KVM" ] ; then + VIRTUAL=true; KVM=true; VIRTUAL_ENV='KVM' +elif [ "$(virt-what 2>/dev/null)" = "virtualbox" ] || \ + [ "$(imvirt 2>/dev/null)" = "VirtualBox" ] ; then + VIRTUAL=true; VIRTUALBOX=true; VIRTUAL_ENV='VirtualBox' +fi +# }}} + # {{{ source lsb-functions , color handling if checkbootparam 'nocolor'; then RC_NOCOLOR=yes @@ -226,10 +266,10 @@ config_language(){ if [ -x /usr/sbin/grml-setlang ] ; then # if bootoption lang is used update /etc/default/locale accordingly if [ -n "$BOOT_LANGUAGE" ] ; then - checkgrmlsmall && /usr/sbin/grml-setlang "POSIX" || /usr/sbin/grml-setlang "$LANGUAGE" + /usr/sbin/grml-setlang "$LANGUAGE" # otherwise default to lang=en else - checkgrmlsmall && /usr/sbin/grml-setlang "POSIX" || /usr/sbin/grml-setlang "en" + /usr/sbin/grml-setlang "en" fi fi @@ -248,12 +288,8 @@ config_language(){ fi # export it now, so error messages get translated, too - if checkgrmlsmall ; then - export LANG='C' # grml-small does not provide any further locales - else - [ -r /etc/default/locale ] && . /etc/default/locale - export LANG LANGUAGE - fi + [ -r /etc/default/locale ] && . /etc/default/locale + export LANG LANGUAGE # configure keyboard layout, read in already set values first: [ -r /etc/sysconfig/keyboard ] && . /etc/sysconfig/keyboard @@ -376,20 +412,20 @@ config_language(){ # {{{ Set hostname config_hostname(){ - if checkbootparam 'hostname' ; then + if ! checkbootparam 'hostname' ; then + return 0 + fi + HOSTNAME="$(getbootparam 'hostname' 2>>$DEBUG)" if [ -z "$HOSTNAME" ] && [ -x /usr/bin/random-hostname ] ; then - einfo "Generating random hostname as no hostname was specified." - HOSTNAME="$(/usr/bin/random-hostname)" - eend $? + einfo "Generating random hostname as no hostname was specified." + HOSTNAME="$(/usr/bin/random-hostname)" + eend $? fi + einfo "Setting hostname to $HOSTNAME as requested." - grml-hostname $HOSTNAME >>$DEBUG ; RC=$? - [ "$RC" = "0" ] && hostname $HOSTNAME - eend $RC - else - hostname --file /etc/hostname - fi + grml-hostname $HOSTNAME >>$DEBUG + eend $? } # }}} @@ -463,7 +499,7 @@ config_time(){ [ -z "$KTZ" ] && [ -r /etc/timezone ] && KTZ=$(cat /etc/timezone) if [ ! -f "/usr/share/zoneinfo/$KTZ" ] ; then ewarn "Warning: unknown timezone $KTZ" ; eend 1 - KTZ="Europe/Vienna" + KTZ="UTC" ewarn "Falling back to timezone $KTZ" ; eend 0 fi @@ -487,20 +523,24 @@ config_time(){ # {{{ print kernel info config_kernel(){ - 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 $VIRTUAL && [ -n "$VIRTUAL_ENV" ] ; then + einfo "Running Linux Kernel $KERNEL inside $VIRTUAL_ENV" ; eend 0 + else + einfo "Running Linux Kernel $KERNEL" ; eend 0 + fi + 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 + 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 + eindent + einfo 'Running kernel featuring support for Xen detected' ; eend 0 + eoutdent fi } # }}} @@ -673,40 +713,44 @@ config_fix_passwd(){ # {{{ CD Checker config_testcd(){ if checkbootparam 'testcd' ; then - einfo "Checking CD data integrity as requested by '${WHITE}testcd${NORMAL}' boot option." + einfo "Checking CD data integrity as requested by '${WHITE}testcd${NORMAL}' boot option." + eindent - ERROR=0 - FOUND_FILE=0 + local ERROR=true + local FOUND_FILE=false + local logfile='/tmp/md5sum.log' - rm -f /tmp/md5sum.log - for md5 in $(find "${LIVECD_PATH}" -name md5sums) ; do - einfo "Checking files against $md5, this may take a while..." + rm -f "$logfile" - FOUND_FILE=1 - ( cd $(dirname "$md5") && md5sum -c $(basename "$md5") ; RC=$?) |& tee -a /tmp/md5sum.log + for md5 in $(find "${LIVECD_PATH}" -name md5sums) ; do + einfo "Checking files against $md5, this may take a while..." - if [ $RC -ne 0 ] ; then - ERROR=1 - fi - done + FOUND_FILE=true + OLD_PWD=$(pwd) + cd $(dirname "$md5") + md5sum -c $(basename "$md5") |& tee -a "${logfile}" + if [ $pipestatus[1] -eq 0 ] ; then + ERROR=false + fi + cd "${OLD_PWD}" + done - if [ $FOUND_FILE -eq 0 ] ; then - echo "${RED} *** Error: Could not find md5sum file. ***" - return - fi + if ! $FOUND_FILE ; then + eerror 'Error: Could not find md5sum file' ; eend 1 + return + fi - if [ "$ERROR" -eq 0 ]; then - einfo "Everything looks OK" ; eend 0 - else - eerror 'Checksum failed for theses files:' ; eend 1 - egrep -v '(^md5sum:|OK$)' /tmp/md5sum.log - eerror 'Data on the grml medium is possibly incomplete/damaged or...' - eerror '... RAM of your computer is broken.' ; eend 1 - einfon "Hit return to continue, or press the reset button to quit." - read a - fi + if ! $ERROR ; then + einfo "Everything looks OK" ; eend 0 + else + eerror 'Checksum failed for theses files:' ; eend 1 + egrep -v '(^md5sum:|OK$)' "${logfile}" + eerror 'Data on the medium is possibly incomplete/damaged or RAM of your system is broken.' ; eend 1 + einfon "Hit return to continue, or press the power button to shut down system." + read a + fi - eend 0 + eoutdent fi } # }}} @@ -993,7 +1037,7 @@ else fi # no cpufreq setup inside VirtualBox -if [ -r /proc/acpi/battery/BAT0/info ] && grep -q 'OEM info:.*innotek' /proc/acpi/battery/BAT0/info ; then +if $VIRTUALBOX ; then einfo 'Virtual Box detected, skipping cpufreq setup.' ; eend 0 return 0 fi @@ -1050,61 +1094,62 @@ fi # {{{ autostart of ssh config_ssh(){ if checkbootparam 'ssh' ; then - SSH_PASSWD='' - SSH_PASSWD="$(getbootparam 'ssh' 2>>$DEBUG)" + local PASSWD + PASSWD="$(getbootparam 'ssh' 2>>$DEBUG)" + config_userlocal einfo "Bootoption ssh found, trying to set password for root and user $localuser" [ -z "$localuser" ] && eend 1 - eindent - if [ -z "$SSH_PASSWD" ] ; then - if [ -x /usr/bin/apg ] ; then - SSH_PASSWD="$(apg -M NL -a 0 -m 8 -x 12 -n 1)" - elif [ -x /usr/bin/gpw ] ; then - SSH_PASSWD="$(gpw 1)" - elif [ -x /usr/bin/pwgen ] ; then - SSH_PASSWD="$(pwgen -1 8)" - elif [ -x /usr/bin/hexdump ] ; then - SSH_PASSWD="$(dd if=/dev/urandom bs=14 count=1 2>/dev/null | hexdump | awk '{print $3 $4}')" - elif [ -n "$RANDOM" ] ; then - SSH_PASSWD="grml${RANDOM}" - else - SSH_PASSWD='' - eerror "Empty passphrase and neither pwgen nor hexdump nor \$RANDOM found. Skipping." - eend 1 - fi - if [ -n "$SSH_PASSWD" ] ; then - ewarn "No given password for ssh found. Using random password: $SSH_PASSWD" ; eend 0 - fi + eindent + if [ -z "$PASSWD" ] ; then + set_passwd && ewarn "No given password for found. Using random password: $PASSWD" && eend 0 fi eoutdent - # finally check if we have a password we can use: - if [ -n "$SSH_PASSWD" ] ; then - # chpasswd sucks, seriously. + if [ -n "$PASSWD" ] ; then chpass_options="" if chpasswd --help 2>&1 | grep -q -- '-m,' ; then chpass_options="-m" fi - echo "$localuser:$SSH_PASSWD" | chpasswd $chpass_options - echo "root:$SSH_PASSWD" | chpasswd $chpass_options + + echo "$localuser:$PASSWD" | chpasswd $chpass_options + echo "root:$PASSWD" | chpasswd $chpass_options + + eindent + ewarn "Warning: please change the password for root and user $localuser as soon as possible!" + eoutdent fi - einfo "Starting secure shell server in background for user $localuser" + einfo "Starting secure shell server in background for root and user $localuser" /etc/init.d/rmnologin start >>$DEBUG 2>>$DEBUG /etc/init.d/ssh start >>$DEBUG 2>>$DEBUG & eend $? - eindent - ewarn "Warning: please change the password for user $localuser as soon as possible!" - eoutdent fi } + +# }}} + +# {{{ display hostkeys of SSH server +config_display_ssh_fingerprints() { + if ! ls /etc/ssh/ssh_host_\*_key >/dev/null 2>&1 ; then + return 0 # no SSH host keys present + fi + + einfo "SSH key fingerprints:" + for file in /etc/ssh/ssh_host_*_key ; do + einfon + ssh-keygen -l -f $file + done | column -t + eend $? +} # }}} # {{{ autostart of x11vnc config_vnc(){ if checkbootparam 'vnc' ; then + config_userlocal VNC_PASSWD='' VNC_PASSWD="$(getbootparam 'vnc' 2>>$DEBUG)" einfo "Bootoption vnc found, trying to set password for user $localuser." @@ -1119,7 +1164,7 @@ if checkbootparam 'vnc' ; then elif [ -x /usr/bin/hexdump ] ; then VNC_PASSWD="$(dd if=/dev/urandom bs=14 count=1 2>/dev/null | hexdump | awk '{print $3 $4}')" elif [ -n "$RANDOM" ] ; then - VNC_PASSWD="${USER}${RANDOM}" + VNC_PASSWD="${localuser}${RANDOM}" else VNC_PASSWD='' eerror "Empty passphrase and neither pwgen nor hexdump nor \$RANDOM found. Skipping." @@ -1135,7 +1180,7 @@ if checkbootparam 'vnc' ; then # finally check if we have a password we can use: if [ -n "$VNC_PASSWD" ] ; then - VNCDIR="/home/${USER}/.vnc" + VNCDIR="/home/${localuser}/.vnc" [ -d "$VNCDIR" ] || mkdir "$VNCDIR" if [ ! -x /usr/bin/x11vnc ] ; then @@ -1151,7 +1196,7 @@ if checkbootparam 'vnc' ; then 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" + VNCDIR="/home/${localuser}/.vnc" [ -d "$VNCDIR" ] || mkdir "$VNCDIR" echo " --connect $VNC_CONNECT " >> $VNCDIR/options fi @@ -1159,21 +1204,63 @@ fi } # }}} -# {{{ set password for default user +# {{{ set password for root and default user config_passwd(){ if checkbootparam 'passwd' >>$DEBUG 2>&1; then + local PASSWD PASSWD="$(getbootparam 'passwd' 2>>$DEBUG)" + config_userlocal - einfo "Bootoption passwd found, change password for user '$localuser'." + einfo "Bootoption passwd found, trying to set password for root and user $localuser" [ -z "$localuser" ] && eend 1 - if [ -n "$PASSWD" ] ; then - echo "$localuser:$PASSWD" | chpasswd -m ; eend $? - else - eerror "No given password for ssh found. Autostart of SSH will not work." ; eend 1 - fi + eindent - ewarn "Warning: please change the password for user grml set via bootparameter as soon as possible!" + if [ -z "$PASSWD" ] ; then + set_passwd && ewarn "No given password for found. Using random password: $PASSWD" && eend 0 + fi eoutdent + + if [ -n "$PASSWD" ] ; then + chpass_options="" + if chpasswd --help 2>&1 | grep -q -- '-m,' ; then + chpass_options="-m" + fi + + echo "$localuser:$PASSWD" | chpasswd $chpass_options + echo "root:$PASSWD" | chpasswd $chpass_options + + eindent + ewarn "Warning: please change the password for root and user $localuser as soon as possible!" + eoutdent + fi + +fi + +if checkbootparam 'encpasswd' >>$DEBUG 2>&1; then + local PASSWD + PASSWD="$(getbootparam 'encpasswd' 2>>$DEBUG)" + + if [ -z "$PASSWD" ] ; then + eerror "No hashed password found, can not set password." + eend 1 + return + fi + + config_userlocal + einfo "Bootoption encpasswd found, trying to set hashed password for root and user $localuser" + [ -z "$localuser" ] && eend 1 + + if [ -n "$PASSWD" ] ; then + chpass_options="-e" + + echo "$localuser:$PASSWD" | chpasswd $chpass_options + echo "root:$PASSWD" | chpasswd $chpass_options + + eindent + ewarn "Warning: please change the password for root and user $localuser as soon as possible!" + eoutdent + fi + fi } # }}} @@ -1230,6 +1317,9 @@ config_mixer () { IFS=' ' for CONTROL in ${=CONTROLS} ; do + # such devices can not be controlled with amixer ... unmute + [[ "$CONTROL" == *Console* ]] && continue + if ! echo "${CONTROL}" | grep -q -i "mic" ; then if amixer -c $card sget "${CONTROL}" | grep -q 'Capabilities:.*pswitch' ; then amixer -c $card -q set "${CONTROL}" unmute @@ -1451,6 +1541,7 @@ config_stats() { fi } # }}} + # {{{ fix/workaround for unionfs fix_unionfs(){ if [ -z "$INSTALLED" ]; then @@ -1476,7 +1567,7 @@ if checkbootparam 'startx' && ! echo "$CMDLINE" | grep -q 'startx.*nostartx' ; t config_userlocal cat>|/etc/init.d/xstartup<>$DEBUG 2>&1 ; then - blkid /dev/fd0 >>$DEBUG 2>&1 - fi - fi DCSDEVICE=$(blkid -t LABEL=$GRMLCFG | head -1 | awk -F: '{print $1}') modprobe 9p 2>/dev/null || true @@ -1569,7 +1654,7 @@ else # if not specified/present then assume default: if [ -z "$DCSDEVICE" ]; then - DCSDIR="/live/image" + DCSDIR="${LIVECD_PATH}" else eindent einfo "debs, config, scripts are read from $DCSDEVICE." ; eend 0 @@ -1592,7 +1677,7 @@ else fi fi -if [ -n "$DCSDIR" -a "$DCSDIR" != "/live/image" ] ; then +if [ -n "$DCSDIR" -a "$DCSDIR" != "${LIVECD_PATH}" ] ; then einfo "Debs, config, scripts (if present) will be read from $DCSDIR." ; eend 0 elif checkbootparam 'debs' || checkbootparam 'config' || checkbootparam 'scripts'; then einfo "Debs, config, scripts will be read from the live image directly." ; eend 0 @@ -1636,7 +1721,7 @@ if checkbootparam 'debs' ; then # backwards compatibility: if no path is given get debs from debs/ DEBS="debs/$DEBS" fi - einfo "Tring to install debian package(s) ${DEBS}" + einfo "Trying to install Debian package(s) ${DEBS}" DEBS="$(eval echo ${DCSDIR}/$DEBS)" dpkg -i $DEBS ; eend $? fi @@ -1652,22 +1737,20 @@ if checkbootparam 'scripts' || [ "$DCSMP" = "/mnt/grmlcfg" ]; then # backwards compatibility: if no path is given get scripts from scripts/ SCRIPTS="scripts/$SCRIPTS" fi - if [ "$DCSMP" = "/mnt/grmlcfg" ]; then - # we are executing from a GRMLCFG labeled fs - # kick everything we have done before and start over - SCRIPTS="$(cd ${DCSDIR}; /bin/ls -1d [Gg][Rr][Mm][Ll].[Ss][Hh] 2>>$DEBUG)" - fi if [ -n "$SCRIPTS" ]; then SCRIPTS="${DCSDIR}/$SCRIPTS" if [ "$DCSMP" = "/mnt/grmlcfg" ]; then einfo "Trying to execute ${SCRIPTS}" sh -c $SCRIPTS + eend $? elif [ -d "$SCRIPTS" ]; then einfo "Bootparameter scripts found. Trying to execute from directory ${SCRIPTS}:" - run-parts $SCRIPTS + run-parts --regex '.*' $SCRIPTS + eend $? else einfo "Bootparameter scripts found. Trying to execute ${SCRIPTS}:" sh -c $SCRIPTS + eend $? fi fi fi @@ -2042,7 +2125,7 @@ config_tohd() if mount -o rw "$TARGET" "$MOUNTDIR" ; then einfo "Copyring live system to $TARGET - this might take a while" - rsync -a --progress /live/image/live $MOUNTDIR + rsync -a --progress ${LIVECD_PATH}/live $MOUNTDIR sync umount "$MOUNTDIR" eend $? @@ -2150,9 +2233,9 @@ fi # checkbootparam "BOOT_IMAGE=debian2hd # }}} config_virtualbox_shared_folders() { -if [ -r /proc/acpi/battery/BAT0/info ] && grep -q 'OEM info:.*innotek' /proc/acpi/battery/BAT0/info ; then +if $VIRTUALBOX ; then einfo "VirtualBox detected, trying to set up Shared Folders." - if ! modprobe -l | grep -q vboxsf.ko ; then + if ! modinfo vboxsf &>/dev/null ; then ewarn "vboxsf driver not present, not setting up VirtualBox Shared Folders." eend 0 elif ! [ -x /usr/sbin/VBoxService ] ; then @@ -2177,9 +2260,63 @@ if [ -r /proc/acpi/battery/BAT0/info ] && grep -q 'OEM info:.*innotek' /proc/acp eend $? einfo "Starting VBoxService." - VBoxService >/dev/null & + VBoxService >/dev/null eend $? + local vbautomation='automation' + if checkbootparam 'vbautomation'; then + vbautomation="$(getbootparam 'vbautomation' 2>>$DEBUG)" + fi + + if ! VBoxControl sharedfolder list | egrep -q "^[0-9]+ - ${vbautomation}$" ; then + ewarn "No automount shared folder '$vbautomation' available" + eend 0 + else + einfo "Found automount shared folder '$vbautomation'" + eend 0 + + local distri="$(getbootparam 'distri' 2>>$DEBUG)" + [ -n "$distri" ] || distri='grml' + + local vbox_auto_sf="/media/sf_${vbautomation}" + + sleep 1 # ugly but necessary + + counter=10 + eindent + while ! [ -d "${vbox_auto_sf}" ] && [[ "$counter" != 0 ]]; do + einfo "Waiting another second to retry access to ${vbox_auto_sf}" + sleep 1 + counter=$(( counter-1 )) + eend 0 + done + eoutdent + + if ! [ -d "${vbox_auto_sf}" ] ; then + eerror "Giving up trying to access folder ${vbox_auto_sf} which doesn't seem to exist" + eend 1 + else + einfo "Found shared folders automation directory $vbox_auto_sf" + eend 0 + + eindent + if checkbootparam 'novbautomation' ; then + einfo "Bootoption novbautomation found. Disabling automation script execution." + eend 0 + else + if ! [ -x "${vbox_auto_sf}/${distri}" ] ; then + ewarn "Couldn't find an automation script named ${vbox_auto_sf}/${distri}" + eend 1 + else + einfo "Executing '${vbox_auto_sf}/${distri}' now:" + "${vbox_auto_sf}/${distri}" + eend $? + fi + fi + eoutdent + fi + fi + eoutdent fi fi @@ -2200,4 +2337,4 @@ fi # }}} ## END OF FILE ################################################################# -# vim:foldmethod=marker expandtab ai ft=zsh shiftwidth=3 +# vim:foldmethod=marker expandtab ai ft=zsh shiftwidth=2