From 724713da63a47e2dd8aa7e7a180ae9d2d891b672 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Fri, 20 Feb 2009 18:44:37 +0100 Subject: [PATCH 1/1] drop check for /etc/grml/autoconfig.small --- autoconfig.small | 116 --------------------------------------------------- sbin/grml-autoconfig | 8 +--- 2 files changed, 1 insertion(+), 123 deletions(-) delete mode 100644 autoconfig.small diff --git a/autoconfig.small b/autoconfig.small deleted file mode 100644 index 176b1ae..0000000 --- a/autoconfig.small +++ /dev/null @@ -1,116 +0,0 @@ -# Filename: /etc/grml/autoconfig.small -# Purpose: configuration for grml-autoconfig on grml-small-system -# Authors: grml-team (grml.org), (c) Michael Prokop -# Bug-Reports: see http://grml.org/bugs/ -# License: This file is licensed under the GPL v2. -################################################################################ - -################################################################################ -# Notice: you can configure grml-autoconfig via adjusting the following values. -# Set them to 'yes' to activate them and to 'no' to deactivate them. -# But please notice that some options might require an additional bootparam -# ("cheatcode") anyway, some options just de-/activate a check! -# -# Take a look at the script 'grml-autoconfig' as well! -################################################################################ - -## These are the options you might want to adjust: ############################# - -# set console font, default: Lat15-Terminus16 -# CONSOLEFONT='iso15graf-16' - -# check for network devices and run pump for every present network device? -# use script grml-network for interactive configuration and -# /etc/network/interfaces for persistent configuration -# default: yes -CONFIG_DHCP='yes' - -# check for frequency-scalable CPU and activate cpydyn/powernowd (default: no) -CONFIG_CPU='no' - -# create/regenerate /etc/fstab using [grml-]rebuildfstab? -CONFIG_FSTAB='yes' -# define uid for rebuildfstab used in /etc/fstab (default: grml): -CONFIG_FSTAB_USER='grml' -# define guid for rebuildfstab used in /etc/fstab (default: users): -CONFIG_FSTAB_GROUP='users' - -# load ACPI/APM modules (default: yes) -CONFIG_ACPI_APM='yes' - -# start syslog-ng (default: yes) -CONFIG_SYSLOG='yes' - -# start gpm (default: yes) -CONFIG_GPM='yes' - -################################################################################ -# Notice! Do not touch the following options except you really know -# what you are doing! -CONFIG_915RESOLUTION='no' # run 915resolution with specified options for adjusting resolution -CONFIG_AGP='yes' # check for bootparam forceagp -CONFIG_AUTOMOUNTER='no' # activate automounter -CONFIG_AUTOMOUNT='yes' # automounting of device labeled GRMLCFG -CONFIG_BLANKING='yes' # check for bootoption noblank to disable console blanking -CONFIG_BLINDSOUND='yes' # play 'beep' and play welcome message -CONFIG_BLIND='yes' # check for blind option or brltty -CONFIG_CDROM_PERM='yes' # for burning on IDE-CD-Roms, k3b (and others) check for special permissions -CONFIG_CDROM_SCRIPTS='yes' # run scripts from /cdrom/scripts -CONFIG_CONSOLE='yes' # activate mgetty when using console=... as bootparam -CONFIG_CREATE_MNT_DIRS='no' # create /mnt-directories -CONFIG_DEBOOTSTRAP='yes' # support automatic installation of Debian via grml-deboostrap -CONFIG_DEBNET='yes' # search for /etc/network/interfaces on partitions and set up network afterwards -CONFIG_DEBS='yes' # check for bootoption debs for installing .debs -CONFIG_DEBUG='yes' # activate start of shells during startup at several stages -CONFIG_DISCOVER='no' # use discover for hardware detection -CONFIG_DISTCC='no' # activate and setup distcc through bootparam distcc=$NETWORK,$INTERFACE -CONFIG_DISTRI='yes' # support some customization via bootoption distri -CONFIG_DMA='yes' # Enable DMA for all IDE drives -CONFIG_EXTRACT='yes' # specify which (only in combination with bootparam myconfig/netconfig useful) -CONFIG_FAST='yes' # skip startup of w3m on tty1 -CONFIG_FIREWIRE_DEV='no' # bugfix for kernel >=2.6.11 - create some firewire-devices -CONFIG_FIX_PASSWD='yes' # fix unionfs-problem with passwd -CONFIG_FIX_UNIONFS='yes' # fix/workaround for unionfs -CONFIG_FWTIMEOUT='yes' # set timeout for firmware loading -CONFIG_GRML2HD='yes' # check for 'grml2hd' bootoption -CONFIG_HOMEDIR='yes' # check for persistent homedir option -CONFIG_HOSTNAME='yes' # set hostname to 'grml' on systems running from CD -CONFIG_HOTPLUG_AGENT='no' # deactivate specific hotplug agent(s) via bootparam -CONFIG_HOTPLUG_BLACKLIST='no' # check for blacklist bootparam -CONFIG_HOTPLUG_MAIN='no' # start hotplug system [should be handled by udev now] -CONFIG_HWINFO='no' # run hwinfo for module-detection (requires bootparam 'hwinfo'!) -CONFIG_HWSPEAK='no' # support for hardware synthesizer via speakup -CONFIG_IPW3945='yes' # check for broken ipw3945 module -CONFIG_KERNEL='yes' # display information on running kernel -CONFIG_LANGUAGE='yes' # allow language specification via commandline -CONFIG_LD_MOD='yes' # run ldconfig and depmod on systems running from harddisk; remove /etc/grml.first.boot for forcing -CONFIG_LOCAL_NET='yes' # bring up loopback interface -CONFIG_LOG='yes' # DEBUG=/dev/null or logfile int /tmp/... -CONFIG_LVM='yes' # logical volume setup -CONFIG_MIXER='no' # set audio volumes [only in live-cd mode relevant, except for bootoption nosound] -CONFIG_MODEM='yes' # check for AC'97 Modem Controller modem -CONFIG_MODULES='yes' # load modules specified in /etc/grml/modules -CONFIG_MOUSE='yes' # show mouse information (expert-mode) -CONFIG_MYCONFIG='yes' # check if we want the config floppy -CONFIG_MYPATH='yes' # provide setting additional paths via bootoption mypath -CONFIG_NETCONFIG='yes' # download configuration archive provided by bootoption netconfig=... -CONFIG_NETIPV6='yes' # check for bootparam ipv6 -CONFIG_PASSWD='yes' # set password via bootparam passwd -CONFIG_PCMCIA='no' # check for pcmcia and start cardmgr -CONFIG_QEMU='no' # qemu specific stuff -CONFIG_SERVICES='yes' # check for services to run, provided via bootparam -CONFIG_SETKEYCODES='yes' # run setkeycodes when bootoption setkeycodes found -CONFIG_SMALL='yes' # use a less "bloat" /etc/inittab for small computer with less RAM -CONFIG_SSH='yes' # check for bootparam ssh -CONFIG_SWRAID='yes' # check for software raid devices [only in live-mode] -CONFIG_SWSPEAK='no' # run software synthesizer via speakup -CONFIG_TESTCD='yes' # CD checker -CONFIG_TIME='yes' # set clock, check for bootparam utc/gmt [only in live-mode] -CONFIG_TIMEZONE='yes' # get bootparam 'tz' and set it as /etc/localtime [only in live-mode] -CONFIG_TOHD='yes' # bootoption tohd=... -CONFIG_USERFSTAB='yes' # check for username of uid 1000 -CONFIG_VMWARE='no' # vmware specific stuff (use xorg.conf.vmware) -CONFIG_WELCOME='yes' # play welcome sound (audio) -CONFIG_WONDERSHAPER='yes' # start wondershaper with options provided via bootparam -CONFIG_XSTARTUP='no' # start X window system via grml-x -## END OF FILE ################################################################# diff --git a/sbin/grml-autoconfig b/sbin/grml-autoconfig index 26f8cd7..0abc8f8 100755 --- a/sbin/grml-autoconfig +++ b/sbin/grml-autoconfig @@ -4,7 +4,6 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2. -# Latest change: Sam Jän 19 23:02:56 CET 2008 [mika] ################################################################################ if [ "$UID" != 0 ]; then @@ -16,12 +15,7 @@ LC_ALL=C PN="$(basename $0)" TMPFILE="$(mktemp)" -if grep -q small /etc/grml_version 2>/dev/null ; then - AUTOCONFIG=/etc/grml/autoconfig.small -else - AUTOCONFIG=/etc/grml/autoconfig -fi - +AUTOCONFIG=/etc/grml/autoconfig [ -r $AUTOCONFIG ] || exit 1 # helper functions -- 2.1.4