From 9970706b78b9ec4fbdb06baa722aa674c349f68b Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Fri, 29 May 2009 11:03:16 +0200 Subject: [PATCH] Use /etc/modprobe.d/grml.conf; use config.tbz as default filename --- autoconfig.functions | 14 ++++++++------ debian/changelog | 9 +++++++++ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/autoconfig.functions b/autoconfig.functions index 8761936..c1bc848 100755 --- a/autoconfig.functions +++ b/autoconfig.functions @@ -739,13 +739,14 @@ if checkbootparam "blacklist" ; then if [ -z "$INSTALLED" ]; then einfo "Bootoption blacklist found." BLACK="$(getbootparam 'blacklist' 2>>$DEBUG)" + BLACKLIST_FILE='/etc/modprobe.d/grml.conf' if [ -n "$BLACK" ] ; then for module in $(echo ${BLACK//,/ }) ; do - einfo "Blacklisting module ${module} via /etc/modprobe.d/grml." - echo "# begin entry generated by config_blacklist of grml-autoconfig" >> /etc/modprobe.d/grml - echo "blacklist $module" >> /etc/modprobe.d/grml - echo "alias $module off" >> /etc/modprobe.d/grml - echo "# end entry generated by config_blacklist of grml-autoconfig" >> /etc/modprobe.d/grml ; eend $? + einfo "Blacklisting module ${module} via ${BLACKLIST_FILE}." + echo "# begin entry generated by config_blacklist of grml-autoconfig" >> "$BLACKLIST_FILE" + echo "blacklist $module" >> "$BLACKLIST_FILE" + echo "alias $module off" >> "$BLACKLIST_FILE" + echo "# end entry generated by config_blacklist of grml-autoconfig" >> "$BLACKLIST_FILE" ; eend $? done else eerror "No given module for blacklist found. Blacklisting will not work therefore." @@ -1934,8 +1935,9 @@ if [[ $RC == 0 ]]; then CONFIG="/mnt/grml/${FILENAME}" fi else - FILENAME="$(basename $CONFIG)" + [ -n "$CONFIG" ] && FILENAME="$(basename $CONFIG)" || FILENAME="config.tbz" fi + if [ -n "$CONFIG" ]; then einfo "Found file ${WHITE}${CONFIG}${NORMAL} - trying to extract it." cd / diff --git a/debian/changelog b/debian/changelog index dcba68f..fbe829e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +grml-autoconfig (0.8.23) unstable; urgency=low + + * Use /etc/modprobe.d/grml.conf as blacklist file (thanks to + Christian Hofstaedtler for the report!). + * Use 'config.tbz' as default filename if not overriden by + bootoption config. + + -- Michael Prokop Fri, 29 May 2009 10:59:55 +0200 + grml-autoconfig (0.8.22) unstable; urgency=low * Fix bootoption "ssh": current versions of chpasswd don't support -- 2.1.4