X-Git-Url: http://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=autoconfig.functions;h=5a250405cff26fd958822d875bd3433bb3e8592d;hp=61f4266415a94d2ee13d1a46df7956d9b9a2db2b;hb=122114fc5d2828993afc44c17b5c5f5069b44cff;hpb=df29c9febe86bbc6bfcd8fd20da28b7bad86307e diff --git a/autoconfig.functions b/autoconfig.functions index 61f4266..5a25040 100755 --- a/autoconfig.functions +++ b/autoconfig.functions @@ -117,10 +117,6 @@ mount_sys(){ # {{{ Check if we are running in live mode or from HD INSTALLED="" [ -e /etc/grml_cd ] || INSTALLED="yes" - -# testcd -TESTCD="" -checkbootparam 'testcd' >>$DEBUG 2>&1 && TESTCD="yes" # }}} # {{{ source lsb-functions , color handling @@ -193,7 +189,7 @@ config_fwtimeout(){ fi if [ -f /sys/class/firmware/timeout ] ; then einfo "Setting timeout for firmware loading to ${TIMEOUT}." - echo 100 > /sys/class/firmware/timeout ; eend $? + echo $TIMEOUT > /sys/class/firmware/timeout ; eend $? fi } # }}} @@ -399,6 +395,23 @@ config_userfstab(){ } # }}} +# {{{ mount configfs +config_configfs() { + einfo "Mounting configfs" + CONFIGFS_DIR=/sys/kernel/config/ + modprobe configfs 2>/dev/null 1>&2 + if ! [ -d "$CONFIGFS_DIR" ] ; then + eindent + einfo "$CONFIGFS_DIR does not exist, can't mount directory" + eend 1 + eoutdent + else + mount -t configfs configfs "$CONFIGFS_DIR" 2>/dev/null 1>&2 + eend $? + fi +} +# }}} + # {{{ Set clock (Local time is more often used than GMT, so it is default) config_time(){ # don't touch the files if running from harddisk: @@ -613,18 +626,6 @@ fi } # }}} -# {{{ Bring up loopback interface now -config_local_net(){ - if [ -z "$INSTALLED" ] ; then - 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 -} -# }}} - # {{{ copy passwd-lockfile to ramdisk (fix unionfs-behaviour) # otherwise we will get: passwd: Authentication token lock busy config_fix_passwd(){ @@ -636,18 +637,30 @@ config_fix_passwd(){ # {{{ CD Checker config_testcd(){ -if [ -n "$TESTCD" ]; then +if checkbootparam 'testcd' ; then einfo "Checking CD data integrity as requested by '${WHITE}testcd${NORMAL}' boot option." - einfo "Reading files and checking against GRML/md5sums, this may take a while..." - echo -n "${RED}" - if [ -n "${LIVECD_PATH}"/GRML ] ; then - ( cd "${LIVECD_PATH}"/GRML ; rm -f /tmp/md5sum.log ; md5sum -c md5sums 2>&1 | tee /tmp/md5sum.log ; RC=$? ) - else + ERROR=0 + FOUND_FILE=0 + + rm -f /tmp/md5sum.log + for md5 in $(find "${LIVECD_PATH}" -name md5sums) ; do + einfo "Checking files against $md5, this may take a while..." + + FOUND_FILE=1 + ( cd $(dirname "$md5") && md5sum -c $(basename "$md5") ; RC=$?) |& tee -a /tmp/md5sum.log + + if [ $RC -ne 0 ] ; then + ERROR=1 + fi + done + + if [ $FOUND_FILE -eq 0 ] ; then echo "${RED} *** Error: Could not find md5sum file. ***" + return fi - if [ "$RC" = "0" ]; then + if [ "$ERROR" -eq 0 ]; then einfo "Everything looks OK" ; eend 0 else eerror 'Checksum failed for theses files:' ; eend 1 @@ -749,6 +762,14 @@ EOT check_partitions >/dev/null 2>&1 # avoid output "check_partitions:3: read-only file system" # }}} +# {{{ Start brltty +config_brltty() { + if checkbootparam 'brltty' ; then + [ -x /lib/brltty/brltty.sh ] && /lib/brltty/brltty.sh + fi +} +# }}} + # {{{ Enable DMA for all IDE drives now if not disabled # Notice: Already done by linuxrc, but make sure it's done also on harddisk-installed systems config_dma(){ @@ -972,14 +993,18 @@ if [ -x /etc/init.d/loadcpufreq ] ; then rm -f $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 + if grep -vq ondemand /sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors; then + einfo "Loading cpufreq_ondemand" + modprobe cpufreq_ondemand + eend $? + fi + + einfo "Setting ondemand governor" + RC=0 + for file in $(find /sys/devices/system/cpu/ -name scaling_governor 2>/dev/null) ; do + echo ondemand > $file || RC=1 + done + eend $RC fi # cpu-governor eoutdent @@ -1157,22 +1182,36 @@ config_mixer () { if checkbootparam 'micvol' ; then MICVOL="$(getbootparam 'micvol' 2>>$DEBUG)" + einfo "Setting microphone to ${WHITE}${MICVOL}${NORMAL}." else MICVOL=0 fi - for CONTROL in Master PCM ; do - if amixer -q | grep -q "Simple mixer control '$CONTROL'" ; then - amixer -q set "${CONTROL}" "${VOL}"% + CONTROLS=$(amixer -c $card scontrols | awk -F"Simple mixer control " '{print $2}') + IFSOLD=${IFS:-} + IFS=' +' + for CONTROL in ${=CONTROLS} ; do + 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 + fi + if amixer -c $card sget "${CONTROL}" | grep -q -P 'Capabilities:.*(pvolume| volume)' ; then + amixer -c $card -q set "${CONTROL}" "${VOL}"% + fi + fi + + if [ ${MICVOL} -ne 0 ] ; then + if amixer -c $card sget "${CONTROL}" | grep -q 'Capabilities:.*cswitch' ; then + amixer -c $card -q set "${CONTROL}" unmute + fi + if amixer -c $card sget "${CONTROL}" | grep -q 'Capabilities:.*cvolume' ; then + amixer -c $card -q set "${CONTROL}" $MICVOL% + fi eend $? fi done - - if [ ${MICVOL} -ne 0 ] ; then - einfo "Setting microphone to ${WHITE}${MICVOL}${NORMAL}." - amixer -q set "Mic" $MICVOL &> /dev/null - eend $? - fi + IFS=$IFSOLD fi # checkbootparam 'nosound' eoutdent done @@ -1359,16 +1398,16 @@ config_stats() { [ -e /etc/grml_version ] && VERSION=$(cat /etc/grml_version) || \ VERSION=$(lsb_release -d | awk -F: '{gsub(/^[ \t]+/, "", $2); print $2}') - PARAMS="$( echo "$CMDLINE" | sed -e 's/=[^ ]*/=VALUE/g' | tr " " "\n"|sort|tr "\n" " " )" + PARAMS="$( echo "$CMDLINE" | sed -e 's/=[^ ]*/=x/g' | tr " " "\n"|sort|tr "\n" " " )" - echo "$CMDLINE" | grep -q -e "fetch|nfsroot" && BOOT="remote" + echo "$CMDLINE" | grep -q -e "fetch" -e "nfsroot" && BOOT="remote" [ -z "$BOOT" ] && BOOT="local" ADDITIONAL_PARAMS="" ( [ -n "$COLUMNS" ] && [ -n "$LINES" ] ) && \ ADDITIONAL_PARAMS="$ADDITIONAL_PARAMS&res=$((COLUMNS * 8))x$((LINES * 16))" - URI='$BASE_URL?action=${ACTION_NAME}\&$DATE_STRING\&unique_id=${HOST_ID}\&support_64bit=$HAS_64BIT\&version=$version\&bootup=$BOOT\¶ms=$PARAMS$ADDITIONAL_PARAMS' + URI='$BASE_URL?action=${ACTION_NAME}\&$DATE_STRING\&unique_id=${HOST_ID}\&support_64bit=$HAS_64BIT\&version=$VERSION\&bootup=$BOOT\¶ms=$PARAMS$ADDITIONAL_PARAMS' get_remote_file "$URI" "/dev/null" >/dev/null 2>&1 &! fi @@ -1391,8 +1430,7 @@ if checkbootparam 'startx' && ! echo "$CMDLINE" | grep -q 'startx.*nostartx' ; t if [ -z "$INSTALLED" ] ; then WINDOWMANAGER="$(getbootparam 'startx' 2>>$DEBUG)" if [ -z "$WINDOWMANAGER" ] ; then - einfo "No window manager specified. Taking ${WHITE}wm-ng${NORMAL} as default." && eend 0 - WINDOWMANAGER="wm-ng" + einfo "No window manager specified. Using default one." && eend 0 else einfo "Window manager ${WHITE}${WINDOWMANAGER}${NORMAL} found as bootoption." && eend 0 fi @@ -1400,7 +1438,7 @@ if checkbootparam 'startx' && ! echo "$CMDLINE" | grep -q 'startx.*nostartx' ; t config_userfstab || fstabuser='grml' cat>|/etc/init.d/xstartup</dev/null || true + if [ -z "$DCSDEVICE" ] && grep -q 9p /proc/filesystems ; then + if grep -q "$GRMLCFG" /sys/bus/virtio/devices/*/mount_tag 2>/dev/null ; then + einfo "Found 9p-virtio fs with mount_tag $GRMLCFG" + DCSDEVICE="$GRMLCFG" + MOUNTOPTIONS="ro,trans=virtio" + DCSFS="9p" + fi + fi + if [ -n "$DCSDEVICE" ]; then DCSMP="/mnt/grmlcfg" fi @@ -1492,7 +1541,7 @@ else else [ -d $DCSMP ] || mkdir $DCSMP umount $DCSMP >>$DEBUG 2>&1 # make sure it is not mounted - mount -o ro -t auto $DCSDEVICE $DCSMP ; RC="$?" + mount -o ${MOUNTOPTIONS:-ro} -t ${DCSFS:-auto} $DCSDEVICE $DCSMP ; RC="$?" if [[ $RC == 0 ]]; then einfo "Successfully mounted $DCSDEVICE to $DCSMP (readonly)." ; eend 0 else