projects
/
grml-autoconfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Inform users about CONFIG_DHCP=no when running from harddisk
[grml-autoconfig.git]
/
autoconfig.functions
diff --git
a/autoconfig.functions
b/autoconfig.functions
index
9218b7b
..
39b7050
100755
(executable)
--- a/
autoconfig.functions
+++ b/
autoconfig.functions
@@
-700,7
+700,7
@@
if checkbootparam "blacklist" ; then
echo "alias $BLACK off" >> /etc/modprobe.d/grml
echo "# end entry generated by config_blacklist of grml-autoconfig" >> /etc/modprobe.d/grml ; eend $?
else
echo "alias $BLACK off" >> /etc/modprobe.d/grml
echo "# end entry generated by config_blacklist of grml-autoconfig" >> /etc/modprobe.d/grml ; eend $?
else
- eerror "No given module for blacklist found. Blacklisting will not work therefor."
+ eerror "No given module for blacklist found. Blacklisting will not work therefor
e
."
fi
else
ewarn "Backlisting via bootoption does not work on harddisk installations." ; eend 1
fi
else
ewarn "Backlisting via bootoption does not work on harddisk installations." ; eend 1
@@
-1169,6
+1169,10
@@
else
sleep 1
eend 0
done
sleep 1
eend 0
done
+ if [ -n "$INSTALLED" ] ; then
+ ewarn 'If you want to disable automatic DHCP requests set CONFIG_DHCP=no in /etc/grml/autoconfig.'
+ eend 0
+ fi
fi
}
# }}}
fi
}
# }}}
@@
-1466,6
+1470,11
@@
if ! [ -x /usr/bin/aumix ] ; then
eerror "aumix binary not available. Can not set sound volumes therefore." ; eend 1
else
eerror "aumix binary not available. Can not set sound volumes therefore." ; eend 1
else
+ if ! [ -r /proc/asound/cards ] ; then
+ ewarn "No soundcard present, skipping mixer settings therefore." ; eend 0
+ return
+ fi
+
if checkbootparam vol ; then
VOL="$(getbootparam 'vol' 2>>$DEBUG)"
if [ -z "$VOL" ] ; then
if checkbootparam vol ; then
VOL="$(getbootparam 'vol' 2>>$DEBUG)"
if [ -z "$VOL" ] ; then