X-Git-Url: http://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=autoconfig.functions;h=97debc0ddb8d1059a94db4c1b14e74028dc3cae1;hp=5a250405cff26fd958822d875bd3433bb3e8592d;hb=7ce3406250811932eaba5e0fd486fe6ed1d2cde5;hpb=122114fc5d2828993afc44c17b5c5f5069b44cff diff --git a/autoconfig.functions b/autoconfig.functions index 5a25040..97debc0 100755 --- a/autoconfig.functions +++ b/autoconfig.functions @@ -40,6 +40,17 @@ if [ -z "$CMDLINE" ]; then 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' ' ')" + modprobe 9p 2>/dev/null || true + if grep -q 9p /proc/filesystems ; then + local TAG="grml-parameters" + if grep -q "$TAG" /sys/bus/virtio/devices/*/mount_tag 2>/dev/null ; then + local MOUNTDIR="$(mktemp -d)" + mount -t 9p -o trans=virtio,ro "$TAG" "$MOUNTDIR" + CMDLINE="$CMDLINE $(cat "$MOUNTDIR"/* 2>/dev/null | tr '\n' ' ')" + umount "$MOUNTDIR" + rmdir "$MOUNTDIR" + fi + fi fi # }}} @@ -119,6 +130,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 @@ -215,10 +243,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 @@ -237,12 +265,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 @@ -365,33 +389,57 @@ 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 $? } # }}} # fstabuser (needed when running from harddisk with username != grml {{{ config_userfstab(){ + # force load of build-in and local config [ -r /etc/grml/autoconfig ] && . /etc/grml/autoconfig + [ -r /etc/grml/autoconfig ] && . /etc/grml/autoconfig.local + + # 1st. try configured fstab user if [ -n "$CONFIG_FSTAB_USER" ] ; then - fstabuser="$CONFIG_FSTAB_USER" - else - fstabuser=$(getent passwd 1000 | cut -d: -f1) + fstabuser=$(getent passwd $CONFIG_FSTAB_USER | cut -d: -f1) fi - # if not yet set fall back to default 'grml' user - [ -n "$fstabuser" ] || fstabuser='grml' + + # 2nd. use standard user id + [ -n "$fstabuser" ] || fstabuser=$(getent passwd 1000 | cut -d: -f1) + + # 3rd. use standard user name + [ -n "$fstabuser" ] || fstabuser=$(getent passwd grml | cut -d: -f1) + + # if not yet set fall back to 'root' user, avoid bad /etc/fstab + [ -n "$fstabuser" ] || fstabuser='root' +} +# }}} + +# local_user (needed when running with username != grml {{{ +config_userlocal() { + + # force load of build-in and local config + [ -r /etc/grml/autoconfig ] && . /etc/grml/autoconfig + [ -r /etc/grml/autoconfig ] && . /etc/grml/autoconfig.local + + # 1st. try id of primary user + localuser=$(getent passwd 1000 | cut -d: -f1) + + # 2nd. use name standard user + [ -n "$localuser" ] || localuser=$(getent passwd grml | cut -d: -f1) } # }}} @@ -452,20 +500,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 ; then + einfo "Running Linux Kernel $KERNEL $VMWARE" ; eend 0 + else + einfo "Running Linux Kernel $KERNEL inside $VIRTUAL_ENV" ; 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 } # }}} @@ -638,40 +690,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 } # }}} @@ -958,7 +1014,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 @@ -1017,7 +1073,9 @@ config_ssh(){ if checkbootparam 'ssh' ; then SSH_PASSWD='' SSH_PASSWD="$(getbootparam 'ssh' 2>>$DEBUG)" - einfo "Bootoption ssh found, trying to set password for user grml." + 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 @@ -1045,33 +1103,49 @@ if checkbootparam 'ssh' ; then # finally check if we have a password we can use: if [ -n "$SSH_PASSWD" ] ; then # chpasswd sucks, seriously. + chpass_options="" if chpasswd --help 2>&1 | grep -q -- '-m,' ; then - echo "grml:$SSH_PASSWD" | chpasswd -m - else - echo "grml:$SSH_PASSWD" | chpasswd + chpass_options="-m" fi + echo "$localuser:$SSH_PASSWD" | chpasswd $chpass_options + echo "root:$SSH_PASSWD" | chpasswd $chpass_options fi - einfo 'Starting secure shell server in background.' + 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 grml as soon as possible!' + ewarn "Warning: please change the password for root and user $localuser as soon as possible!" eoutdent fi } + +# }}} + +# {{{ display hostkeys of SSH server +config_display_ssh_fingerprints() { + if ! find /etc/ssh/ -name 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(){ - -USER=grml # TODO: make it dynamically configurable if checkbootparam 'vnc' ; then + config_userlocal VNC_PASSWD='' VNC_PASSWD="$(getbootparam 'vnc' 2>>$DEBUG)" - einfo "Bootoption vnc found, trying to set password for user $USER." + einfo "Bootoption vnc found, trying to set password for user $localuser." eindent if [ -z "$VNC_PASSWD" ] ; then if [ -x /usr/bin/apg ] ; then @@ -1083,7 +1157,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." @@ -1099,7 +1173,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 @@ -1107,7 +1181,7 @@ if checkbootparam 'vnc' ; then eend 1 else /usr/bin/x11vnc -storepasswd "$VNC_PASSWD" "$VNCDIR"/passwd ; eend $? - /bin/chown -R "$USER": "$VNCDIR" + /bin/chown -R "$localuser": "$VNCDIR" fi fi if checkbootparam 'vnc_connect' ; then @@ -1115,7 +1189,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 @@ -1123,13 +1197,15 @@ fi } # }}} -# {{{ set password for user grml +# {{{ set password for default user config_passwd(){ if checkbootparam 'passwd' >>$DEBUG 2>&1; then - einfo "Bootoption passwd found." PASSWD="$(getbootparam 'passwd' 2>>$DEBUG)" + config_userlocal + einfo "Bootoption passwd found, change password for user '$localuser'." + [ -z "$localuser" ] && eend 1 if [ -n "$PASSWD" ] ; then - echo "grml:$PASSWD" | chpasswd -m ; eend $? + echo "$localuser:$PASSWD" | chpasswd -m ; eend $? else eerror "No given password for ssh found. Autostart of SSH will not work." ; eend 1 fi @@ -1413,6 +1489,7 @@ config_stats() { fi } # }}} + # {{{ fix/workaround for unionfs fix_unionfs(){ if [ -z "$INSTALLED" ]; then @@ -1435,10 +1512,10 @@ if checkbootparam 'startx' && ! echo "$CMDLINE" | grep -q 'startx.*nostartx' ; t einfo "Window manager ${WHITE}${WINDOWMANAGER}${NORMAL} found as bootoption." && eend 0 fi einfo "Setting up and invoking grml-x ${WINDOWMANAGER}. Just exit X windows system to get full featured consoles." - config_userfstab || fstabuser='grml' + config_userlocal cat>|/etc/init.d/xstartup</dev/null ; then ewarn "vboxsf driver not present, not setting up VirtualBox Shared Folders." eend 0 elif ! [ -x /usr/sbin/VBoxService ] ; then @@ -2132,11 +2209,8 @@ if [ -r /proc/acpi/battery/BAT0/info ] && grep -q 'OEM info:.*innotek' /proc/acp chmod 660 /dev/vboxguest eend $? - if [ -n "$CONFIG_FSTAB_USER" ] ; then - fstabuser="$CONFIG_FSTAB_USER" - else - fstabuser=$(getent passwd 1000 | cut -d: -f1) - fi + config_userfstab + einfo "Adding $fstabuser to group vboxsf." adduser grml vboxsf &>/dev/null eend $? @@ -2165,4 +2239,4 @@ fi # }}} ## END OF FILE ################################################################# -# vim:foldmethod=marker expandtab ai ft=zsh shiftwidth=3 +# vim:foldmethod=marker expandtab ai ft=zsh shiftwidth=2