From: Michael Prokop Date: Sat, 28 Sep 2013 10:08:11 +0000 (+0200) Subject: Drop stats feature [Closes: issue1194] X-Git-Url: http://git.grml.org/?p=grml-autoconfig.git;a=commitdiff_plain;h=d6130873676a8b49f398ceb396b52335dff50ea2 Drop stats feature [Closes: issue1194] --- diff --git a/autoconfig b/autoconfig index f024154..005d8a2 100644 --- a/autoconfig +++ b/autoconfig @@ -89,7 +89,6 @@ CONFIG_PASSWD='yes' # set password via bootparam passwd CONFIG_SCRIPTS='yes' # execute scripts from the scripts option CONFIG_SERVICES='yes' # check for services to run, provided via bootparam CONFIG_SMALL='yes' # use a less "bloat" /etc/inittab for small computer with less RAM -CONFIG_STATS='yes' # Report stats to stats server CONFIG_SSH='yes' # check for bootparam ssh CONFIG_SWRAID='yes' # check for software raid devices [only in live-mode] CONFIG_TESTCD='yes' # CD checker diff --git a/autoconfig.functions b/autoconfig.functions index 22abae3..85bee61 100755 --- a/autoconfig.functions +++ b/autoconfig.functions @@ -1510,35 +1510,6 @@ config_netscript() { } # }}} -# {{{ stats -config_stats() { - if ! checkbootparam 'nostats' ; then - BASE_URL="http://stats.grml.org/report/" - ACTION_NAME=Boot - - HOST_ID=$(cat /proc/sys/kernel/random/boot_id) - - grep -q " lm " /proc/cpuinfo && HAS_64BIT="1" || HAS_64BIT="0" - DATE_STRING=$(date +'h=%H&m=%M&s=%S') - [ -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/=[^ ]*/=x/g' | tr " " "\n"|sort|tr "\n" " " )" - - 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' - - get_remote_file "$URI" "/dev/null" >/dev/null 2>&1 &! - fi -} -# }}} - # {{{ fix/workaround for unionfs fix_unionfs(){ if [ -z "$INSTALLED" ]; then diff --git a/grml-autoconfig b/grml-autoconfig index c0c1d47..86490ba 100755 --- a/grml-autoconfig +++ b/grml-autoconfig @@ -169,8 +169,6 @@ checkvalue $CONFIG_NETSCRIPT && config_netscript checkvalue $CONFIG_NETIPV6 && config_ipv6 -checkvalue $CONFIG_STATS && config_stats - checkvalue $CONFIG_CONSOLE && config_console checkvalue $CONFIG_FIX_UNIONFS && fix_unionfs