From b4e2826b9b5ba086d294caca298736a7468b74c1 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Thu, 7 Jul 2011 00:19:00 +0200 Subject: [PATCH] Drop deprecated config_cdrom_perm(). IDE devices aren't common anymore nowadays and udev should take care of it instead, so let's get rid of it. --- autoconfig | 1 - autoconfig.functions | 10 ---------- grml-autoconfig | 2 -- 3 files changed, 13 deletions(-) diff --git a/autoconfig b/autoconfig index 8011f29..d31e709 100644 --- a/autoconfig +++ b/autoconfig @@ -54,7 +54,6 @@ 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_CONFIG='yes' # do we want config unpacking to work? CONFIG_CONSOLE='yes' # activate mgetty when using console=... as bootparam CONFIG_CREATE_MNT_DIRS='no' # create /mnt-directories diff --git a/autoconfig.functions b/autoconfig.functions index 01350dd..e813921 100755 --- a/autoconfig.functions +++ b/autoconfig.functions @@ -617,16 +617,6 @@ fi } # }}} -# For burning on IDE-CD-Roms, k3b (and others) check for special permissions {{{ -config_cdrom_perm(){ -CDROMS="" -for DEVICE in /proc/ide/hd?; do - [ "$(cat $DEVICE/media 2>/dev/null)" = "cdrom" ] && CDROMS="$CDROMS /dev/${DEVICE##*/}" -done -[ -n "$CDROMS" ] && { chown root.cdrom $CDROMS; chmod 666 $CDROMS; } 2>/dev/null -} -# }}} - # {{{ Bring up loopback interface now config_local_net(){ if [ -z "$INSTALLED" ] ; then diff --git a/grml-autoconfig b/grml-autoconfig index fadb9d6..0fb2806 100755 --- a/grml-autoconfig +++ b/grml-autoconfig @@ -136,8 +136,6 @@ checkvalue $CONFIG_LVM && config_lvm # No kernel messages while probing modules echo "0" > /proc/sys/kernel/printk -checkvalue $CONFIG_CDROM_PERM && config_cdrom_perm - checkvalue $CONFIG_LOCAL_NET && config_local_net checkvalue $CONFIG_FIREWIRE_DEV && config_firewire_dev -- 2.1.4