From ee3b7f73eb8f11257297d008e9a9a091f1d8a16e Mon Sep 17 00:00:00 2001
From: Colin Guthrie <colin@mageia.org>
Date: Thu, 11 Sep 2014 14:31:26 +0100
Subject: [PATCH 103/103] Kill off supermount.

This has been dead for some time I believe. All desktops these days utilise
udisks for automounting and such like with proper ACL and access control
to the active user of the seat that the device/port belongs to.
---
 man/cs/supermount.8   |  40 ---------------
 man/et/supermount.8   |  36 -------------
 man/fi/supermount.8   |  36 -------------
 man/fr/supermount.8   |  42 ---------------
 man/it/supermount.8   |  45 ----------------
 man/ru/supermount.8   |  34 -------------
 man/uk/supermount.8   |  47 -----------------
 mandriva/Makefile     |   6 ---
 mandriva/supermount   | 138 --------------------------------------------------
 mandriva/supermount.8 |  46 -----------------
 sysctl.conf           |   2 -
 11 files changed, 472 deletions(-)
 delete mode 100644 man/cs/supermount.8
 delete mode 100644 man/et/supermount.8
 delete mode 100644 man/fi/supermount.8
 delete mode 100644 man/fr/supermount.8
 delete mode 100644 man/it/supermount.8
 delete mode 100644 man/ru/supermount.8
 delete mode 100644 man/uk/supermount.8
 delete mode 100644 mandriva/supermount
 delete mode 100644 mandriva/supermount.8

diff --git a/man/cs/supermount.8 b/man/cs/supermount.8
deleted file mode 100644
index 1d5e3f3..0000000
--- a/man/cs/supermount.8
+++ /dev/null
@@ -1,40 +0,0 @@
-.TH SUPERMOUNT 8 "Pro 1999" "initscripts" "MandrakeSoft"
-.SH NÁZEV
-supermount \- Vypne nebo zapne vlastnost supermount
-.SH SYNAPSE
-.B supermount 
-[\fIVOLBY\fR]... <\fIdisable | enable\fR>
-.SH POPIS
-.PP
-Program \fBsupermount\fR umožní správci systému zapnout nebo vypnout vlastnost
-\fBsupermount\fR, která je k dispozici v novějších jádrech distribucí Mandrake Linux.
-Tato vlastnost automaticky spravuje připojení a odpojení vyměnitelných médií
-podle potřeby. Tento skript zjednodušuje přidání nebo odebrání volby \fBsupermount\fR
-z položek v souboru \fI/etc/fstab\fR. Bez volby \fB\-i\fR je upravený soubor
-pouze vypsán na standardní výstup.
-.PP 
-Program \fBsupermount\fR musí být spuštěn s jedním z následujících parametrů:
-.TP
-\fBenable\fR pokud chcete povolit vlastnost supermount na odpovídajících zařízeních
-(CDROM a pružné disky),
-.TP
-\fBdisable\fR pokud chcete vypnout vlastnost \fBsupermount\fR na všech zařízeních.
-.SH VOLBY
-.TP
-\fB\-f=SOUBOR\fR, \fB\-\-file=SOUBOR\fR Určí alternativní soubor, na kterém mají být provedeny
-úpravy. Výchozí je soubor \fI/etc/fstab\fR.
-.TP
-\fB\-i\fR, \fB\-\-infile\fR Úpravy jsou provedeny přímo na souboru \fI/etc/fstab\fR nebo
- SOUBORU zadaném pomocí volby \fB\-f\fR, a ne pouze vypsány na standardní výstup.
-.TP
-\fB\-h\fR, \fB\-\-help\fR, \fB\-?\fR zobrazí krátkou zprávu s nápovědou.
-.SH "VIZ TAKÉ"
-\fIfstab\fR(5), \fImount\fR(8), \fIumount\fR(8),
-.SH AUTOR
-Chmouel Boudjnah  - chmouel@mandrakesoft.com
-.SH COPYRIGHT
-Copyright \(co 1999/2000 MandrakeSoft.
-.br
-Toto je volně šiřitelný software; viz zdrojový kód s podmínkami kopírování.
-Je dodáván BEZ záruk; není zaručena ani OBCHODOVATELNOST, ani VHODNOST PRO
-POUŽITÍ za nějakým účelem.
diff --git a/man/et/supermount.8 b/man/et/supermount.8
deleted file mode 100644
index ee87ca8..0000000
--- a/man/et/supermount.8
+++ /dev/null
@@ -1,36 +0,0 @@
-.TH "SUPERMOUNT" "8" "Dets. 1999" "initscripts" "MandrakeSoft"
-.SH "NIMI"
-supermount \- Võimaluse Supermount sisse\- või väljalülitamine
-.SH "KOKKUVÕTE"
-.B supermount 
-[\fIVÕTI\fR]... <\fIdisable | enable\fR>
-.SH "KIRJELDUS"
-.PP 
-\fBsupermount\fR võimaldab administraatoril lubada või tühistada võimaluse \fBsupermount\fR, mida pakuvad viimased mandrake kernelid. See võimalus haagib ja lahutab vajaduse korral automaatselt eemaldatavaid andmekandjaid. Skript lihtsalt lisab või eemaldab võtme \fBsupermount\fR faili \fI/etc/fstab\fR kirjetes. Ilma võtmeta \fB\-i\fR näidatakse muudetud faili standardväljundis.
-.PP 
-\fBsupermount\fR tuleb käivitada ühega järgmistest argumentidest:
-.TP 
-\fBenable\fR lubab selle vastavatel ketastel (cdrom\- ja flopikettad),
-.TP 
-\fBdisable\fR tühistab selle kõigil ketastel.
-.SH "VÕTMED"
-.TP 
-\fB\-f=FAIL\fR, \fB\-\-file=FAIL\fR Osutab alternatiivsele failile, kust võtta muudatused. Vaikimisi on selleks \fI/etc/fstab\fR.
-.TP 
-\fB\-i\fR, \fB\-\-infile\fR Muudatused tehakse otse faili \fI/etc/fstab\fR või FAILI, mis on määratud võtmega \fB\-f\fR, mitte aga ei väljastata standardväljundisse.
-.TP 
-\fB\-h\fR, \fB\-\-help\fR, \fB\-?\fR näitab abiteadet.
-.SH "VAATA KA"
-\fIfstab\fR(5), \fImount\fR(8), \fIumount\fR(8),
-.SH "AUTOR"
-Chmouel Boudjnah  \- chmouel@mandrakesoft.com
-.br 
-
-.br 
-Tõlge eesti keelde 2002: Marek Laane
-.br 
-bald@online.ee
-.SH "AUTORIÕIGUS"
-Copyright \(co 1999/2000 MandrakeSoft.
-.br 
-See on vaba tarkvara; kopeerimistingimusi vaadake lähtetekstist. Sellega ei kaasne MINGIT garantiid, isegi mitte KESKMISE/TAVALISE KVALITEEDI või TEATUD EESMÄRGIKS SOBIVUSE garantiid.
diff --git a/man/fi/supermount.8 b/man/fi/supermount.8
deleted file mode 100644
index 8ef4ca5..0000000
--- a/man/fi/supermount.8
+++ /dev/null
@@ -1,36 +0,0 @@
-.TH SUPERMOUNT 8 "Dec 1999" "initscripts" "MandrakeSoft"
-.SH NIMI
-supermount \-  Ota käyttöön/poista käytöstä supermount ominaisuus
-.SH YLEISKATSAUS
-.B supermount 
-[\fIOPTIO\fR]... <\fIdisable | enable\fR>
-.SH KUVAUS
-.PP
-\fBsupermount\fR sallii järjestelmän ylläpitäjää ottaa käyttöön/poistaa
-käytöstä \fBsupermount\fR ominaisuutta joka löytyy uudemmissa mandrake
-ytimissä. Tämä ominaisuus hallitsee automaattisesti siirrettävien medioiden
-littäminen ja irottaminen tarvittaessa. Tämä skripti yksinkertaisesti
-lisää tai poistaa \fBsupermount\fR optiota tietueista \fI/etc/fstab\fR 
-tiedostossa. Ilman \fB\-i\fR optiota muokattu tiedosto tulostetaan
-näytölle.
-.PP 
-\fBsupermount\fR pitää suorittaa yksi seuravien argumenttien kanssa:
-.TP
-\fBenable\fR ottaaksesi \fBsupermount\fR ominaisuutta käyttöön siirrettävissä
-medioissa (cd/dvd asemat ja levykeasemat),
-.TP
-\fBdisable\fR poistaaksesi \fBsupermount\fR ominaisuutta kaikissa asemissa.
-.SH OPTIOT
-.TP
-\fB\-f=tiedosto\fR, \fB\-\-file=tiedosto\fR Määrittää vaihtoehtoista tiedostoa
-johon tehdään muutoksia. Oletus on \fI/etc/fstab\fR.
-.TP
-\fB\-i\fR, \fB\-\-infile\fR Muutokset tehdään suoraan \fI/etc/fstab\fR 
-tiedostoon tai \fB\-f\fR optiolla määritettyyn tiedostoon, näytölle 
-tulostamiseen sijasta.
-.TP
-\fB\-h\fR, \fB\-\-help\fR, \fB\-?\fR tulostaa lyhyen apuviestin.
-.SH "KATSO MYÖS"
-\fIfstab\fR(5), \fImount\fR(8), \fIumount\fR(8),
-.SH TEKIJÄ
-Chmouel Boudjnah  - chmouel@mandrakesoft.com
diff --git a/man/fr/supermount.8 b/man/fr/supermount.8
deleted file mode 100644
index 8f98f60..0000000
--- a/man/fr/supermount.8
+++ /dev/null
@@ -1,42 +0,0 @@
-.TH SUPERMOUNT 8 "Dec 1999" "initscripts" "MandrakeSoft"
-.SH NOM
-supermount \- Active ou désactive la fonction supermount
-.SH SYNOPSIS
-.B supermount 
-[\fIOPTION\fR]... <\fIdisable | enable\fR>
-.SH DESCRIPTION
-.PP
-\fBsupermount\fR permet à l'administrateur système d'activer ou non la
-fonction \fBsupermount\fR des noyaux Mandrake récents.  Cette fonction
-monte et démonte automatiquement les médias amovibles quand nécessaire.
-Le script ajoute ou retire l'option \fBsupermount\fR des entrées du
-fichier \fI/etc/fstab\fR.  Sans l'option \fB\-i\fR le fichier modifié
-est affiché sur la sortie standard.
-.PP 
-\fBsupermount\fR doit être lancé avec l'un des arguments suivants :
-.TP
-\fBenable\fR pour activer la fonction \fBsupermount\fR sur les lecteurs qui
-l'autorisent (lecteurs de cédéroms et de disquettes),
-.TP
-\fBdisable\fR pour désactiver la fonction \fBsupermount\fR sur tous les
-lecteurs.
-.SH OPTIONS
-.TP
-\fB\-f=FICHIER\fR, \fB\-\-file=FICHIER\fR Indique le fichier où effectuer
-les modifications. Le fichier par défaut est \fI/etc/fstab\fR.
-.TP
-\fB\-i\fR, \fB\-\-infile\fR Les modifications sont effectuées directement
-dans \fI/etc/fstab\fR our le FICHIER spécifié par l'option \fB\-f\fR, au
-lieu d'être affichées vers la sortie standard.
-.TP
-\fB\-h\fR, \fB\-\-help\fR, \fB\-?\fR affiche un court message d'aide.
-.SH "VOIR AUSSI"
-\fIfstab\fR(5), \fImount\fR(8), \fIumount\fR(8),
-.SH AUTEUR
-Chmouel Boudjnah  - chmouel@mandrakesoft.com
-.SH COPYRIGHT
-Copyright \(co 1999/2000 MandrakeSoft.
-.br
-This is free software; see the source for copying conditions.  There
-is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE.
diff --git a/man/it/supermount.8 b/man/it/supermount.8
deleted file mode 100644
index 312345c..0000000
--- a/man/it/supermount.8
+++ /dev/null
@@ -1,45 +0,0 @@
-.TH SUPERMOUNT 8 "Dec 1999" "initscripts" "MandrakeSoft"
-.SH NOME
-supermount \- Abilita o disabilita la funzione supermount
-.SH SINTASSI
-.B supermount 
-[\fIOPZIONE\fR]... <\fIdisable | enable\fR>
-.SH DESCRIZIONE
-.PP
-\fBsupermount\fR permette all' amministratore di sistema di abilitare 
-o disabilitare la funzione \fBsupermount\fR offerta nei recenti kernel 
-Mandrake. Questa funzione gestisce automaticamente il montaggio e lo 
-smontaggio dei supporti rimovibili quando serve. 
-Lo script semplicemente aggiunge o rimuove l'opzione \fBsupermount\fR
-dalle voci del file \fI/etc/fstab\fR . Senza l'opzione \fB\-i\fR 
-il file modificato è stampato su stdout.
-.PP 
-\fBsupermount\fR deve essere lanciato con uno dei seguenti argomenti:
-.TP
-\fBenable\fR per abilitare la funzione supermount su particolari dispositivi
-(cdrom e floppy drives),
-.TP
-\fBdisable\fR per disabilitare la funzione \fBsupermount\fR su tutti i drives.
-.SH OPZIONI
-.TP
-\fB\-f=FILE\fR, \fB\-\-file=FILE\fR Indica un file alternativo in cui
-fare le modifiche. Quello di default è \fI/etc/fstab\fR.
-.TP
-\fB\-i\fR, \fB\-\-infile\fR Le modifiche vengono fatte direttamente in 
-\fI/etc/fstab\fR o nel FILE specificato attraverso l' opzione \fB\-f\fR, 
-invece di essere mostrate nello stdout.
-.TP
-\fB\-h\fR, \fB\-\-help\fR, \fB\-?\fR stampa un breve messaggio di aiuto.
-.SH "VEDI ANCHE"
-\fIfstab\fR(5), \fImount\fR(8), \fIumount\fR(8),
-.SH AUTORE
-Chmouel Boudjnah  - chmouel@mandrakesoft.com
-.SH TRADUTTORE
-Salvatore Di Pietro - salvuz78@virgilio.it
-
-.SH COPYRIGHT
-Copyright \(co 1999/2000 MandrakeSoft.
-.br
-This is free software; see the source for copying conditions.  There
-is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE.
diff --git a/man/ru/supermount.8 b/man/ru/supermount.8
deleted file mode 100644
index 37b3931..0000000
--- a/man/ru/supermount.8
+++ /dev/null
@@ -1,34 +0,0 @@
-.TH SUPERMOUNT 8 "Декабрь 1999" "initscripts" "MandrakeSoft"
-.SH НАЗВАНИЕ
-supermount \- включает или отключает модуль supermount 
-.SH СИНТАКСИС
-.B supermount 
-[\fIОПЦИЯ\fR]... <\fIdisable | enable\fR>
-.SH ОПИСАНИЕ
-.PP
-\fBsupermount\fR позволяет системному администратору  включать или отключать модуль \fBsupermount\fR, предлагаемый в последних версиях ядра Mandrake. Этот модуль автоматически управляет монтированием и размонтированием съемных носителей, когда в этом есть необходимость. Скрипт просто добавляет/удаляет опцию \fBsupermount\fR в/из параметры(ов) файла \fI/etc/fstab\fR. Без опции \fB\-i\fR измененный файл выводится на stdout. 
-.PP 
-\fBsupermount\fR должен быть запущен с одним из следующих аргументов:
-.TP
-\fBenable\fR, чтобы включить модуль supermount на соответствующих приводах (накопители cdrom и floppy),
-.TP
-\fBdisable\fR, чтобы отключить модуль \fBsupermount\fR на всех приводах.
-.SH ОПЦИИ
-.TP
-\fB\-f=ФАЙЛ\fR, \fB\-\-file=ФАЙЛ\fR Представляет альтернативный файл, в котором проводятся изменения. По умолчанию это файл \fI/etc/fstab\fR.
-.TP
-\fB\-i\fR, \fB\-\-infile\fR Изменения проводятся непосредственно в \fI/etc/fstab\fR или ФАЙЛЕ, заданном в опции \fB\-f\fR, вместо того, чтобы выводиться на stdout.
-.TP
-\fB\-h\fR, \fB\-\-help\fR, \fB\-?\fR выводит короткое сообщение справки.
-.SH "СМ. ТАКЖЕ"
-\fIfstab\fR(5), \fImount\fR(8), \fIumount\fR(8),
-.SH АВТОР
-Chmouel Boudjnah  - chmouel@mandrakesoft.com
-.SH COPYRIGHT
-Copyright \(co 1999/2000 MandrakeSoft.
-.br
-Это открытое программное обеспечение; условия копирования смотрите в исходных текстах. Ничего НЕ гарантируется; даже РАБОТОСПОСОБНОСТЬ или ПРИГОДНОСТЬ ДЛЯ ЛИЧНЫХ ЦЕЛЕЙ.
-.SH ПЕРЕВОД
-Павел Марьянов  - acid_jack@ukr.net
-
-
diff --git a/man/uk/supermount.8 b/man/uk/supermount.8
deleted file mode 100644
index f5b4f3d..0000000
--- a/man/uk/supermount.8
+++ /dev/null
@@ -1,47 +0,0 @@
-.TH SUPERMOUNT 8 "Dec 1999" "initscripts" "MandrakeSoft"
-.SH НАЗВА
-supermount \- дозволяє чи забороняє роботу  supermount 
-.SH ВИКОРИСТАННЯ
-.B supermount 
-[\fIOPTION\fR]... <\fIdisable | enable\fR>
-.SH ОПИС
-.PP
-\fBsupermount\fR allows system administrator to enable or disable the
-\fBsupermount\fR feature offered in recent mandrake kernels.  This
-feature automatically manages mounting and unmounting removable medias
-when needed.  The script simply adds or remove the \fBsupermount\fR
-option from within the entries of the \fI/etc/fstab\fR file.  Without
-option \fB\-i\fR the modified file is printed to stdout.
-.PP 
-\fBsupermount\fR has to be launched with one of the following
-arguments:
-.TP
-\fBenable\fR in order to enable supermount feature on relevant drives
-(cdrom and floppy drives),
-.TP
-\fBdisable\fR in order to disable the \fBsupermount\fR feature on all
-drives.
-.SH ПАРАМЕТРИ
-.TP
-\fB\-f=FILE\fR, \fB\-\-file=FILE\fR Indicates an alternate file where
-to make modifications. The default is \fI/etc/fstab\fR.
-.TP
-\fB\-i\fR, \fB\-\-infile\fR Modifications are made directly to
-\fI/etc/fstab\fR or FILE specified through \fB\-f\fR option, instead
-of being outputted to stdout.
-.TP
-\fB\-h\fR, \fB\-\-help\fR, \fB\-?\fR print a short help message.
-.SH "ДИВ. ТАКОЖ"
-\fIfstab\fR(5), \fImount\fR(8), \fIumount\fR(8),
-.SH АВТОР
-Chmouel Boudjnah  - chmouel@mandrakesoft.com
-.SH COPYRIGHT
-Copyright \(co 1999/2000 MandrakeSoft.
-.br
-This is free software; see the source for copying conditions.  There
-is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE.
-.SH
-ПЕРЕКЛАД
-.br
-Дмитро Ковальов, <kov@tokyo.emai.ne.jp>
diff --git a/mandriva/Makefile b/mandriva/Makefile
index d2a295f..1b7e941 100644
--- a/mandriva/Makefile
+++ b/mandriva/Makefile
@@ -7,7 +7,6 @@ ROOT=/
 LOCALSRPM=/SRPMS/main/release
 ARCH := $(shell uname -m)
 SH := $(shell echo *.sh) listhome $(shell echo mandrake_*) rc.modules lookupdm mdv-network-event network-up
-PL = supermount
 mandir=/usr/share
 VERSION:=$(shell rpm -q --qf '%{VERSION}\n' --specfile ../$(NAME).spec | head -n 1)
 RELEASE:=$(shell rpm -q --qf '%{RELEASE}\n' --specfile ../$(NAME).spec | head -n 1)
@@ -24,7 +23,6 @@ all:
 
 check:
 	@for i in $(SH);do /bin/bash -n $$i || exit 1;echo $$i syntax OK;done
-	@for i in $(PL);do perl -c $$i ||exit 1;done
 	@for i in $(SUBDIRS);do	make -C $$i check;done
 
 clean:
@@ -57,10 +55,6 @@ install: all check
 	install -m755 hibernate-cleanup.sh $(ROOT)/usr/sbin/
 	install -m755 lsb-init-functions $(ROOT)/usr/lib/lsb/init-functions
 	install -m755 mdv-network-event $(ROOT)/usr/sbin/
-ifneq ($(shell if echo $(ARCH)|grep -q 'sparc';then echo sparc;fi),sparc)
-	install -m755 supermount $(ROOT)/usr/sbin/
-	install -m644 supermount.8 $(ROOT)$(mandir)/man8/
-endif
 # For Netscrape
 ifeq ($(ARCH), alpha)
 	@echo -e '\nbinfmt_aout' >> $(ROOT)/etc/modules
diff --git a/mandriva/supermount b/mandriva/supermount
deleted file mode 100644
index cf8a862..0000000
--- a/mandriva/supermount
+++ /dev/null
@@ -1,138 +0,0 @@
-#!/usr/bin/perl
-# (c) 1999/2000/2001,2002,2003 Mandriva, 
-# Chmouel Boudjnah <chmouel@mandriva.com>, Denis HAVLIK <denis@mandriva.com>
-# And others Coooker contributor.
-# See http://www.gnu.org for license.
-## Enable or disable supermount.
-# $Id$
-
-my $file = $ENV{FSTAB} || '/etc/fstab';
-my ($ofile, $mpoint);
-
-#"bad" or "nessesary" options for "normal" and "supermount" entry
-# "bad" options can be regexp.
-my @normal_bad = qw ( fs=\S+ dev=\S+ --);
-my @super_bad = qw (sync user noauto);
-my @normal_must = qw (user noauto nodev nosuid);
-my @super_must = qw (nodev nosuid);
-my $fs_ok = '(auto|vfat|iso9660)';
-my $dev_ok = '(fd|floppy|zip|cdrom)\d*';
-my $mnt_ok = '(floppy|zip|cdrom)\d*';
-my ($enable, $disable, $infile);
-
-while ($ARGV[0] =~ /^--/ || $ARGV[0] =~ /^-/) {
-  $_ = shift;
-  if (/^--file=([^ \t]+)/ || /^-f=([^ \t]+)/) {
-    $file = $1;
-  } elsif (/^--mountpoint=([^ \t]+)/ || /^-m=([^ \t]+)/) {
-    $mpoint = $1;
-  } elsif (/^--infile/ || /^-i/) {
-    $infile++;
-  } elsif (/^--help/ || /^-h/ || /^-\?/) {
-    usage(0);
-  } else {
-    print STDERR "Unrecognized switch: $_\n";
-    usage(1);
-  }
-}
-
-if    ($ARGV[0] =~ /enable/) { $enable++; }
-elsif ( $ARGV[0] =~ /disable/ ) { $disable++; }
-else { usage(1); }
-
-open FH, $file or die "Can't open $file\n";
-if ($infile) {
-  $ofile = `mktemp /tmp/fstab.XXXXXX` || die "Can't create temporary file\n"; chomp $ofile;
-  open OU, ">$ofile" or die "Can't write to $ofile\n"; select OU;
-}
-
-while (<FH>) {
-  my ($dev, $point, $fs, $opt, $d1, $d2) = split;
-  my @opt = split (',', $opt);
-  if ( $disable && ($fs eq "supermount") && (!defined($mpoint) || $point eq $mpoint) && $_ !~ /^#/ ) {
-    my @must;
-    map { m/^fs=(\S+)/ && ($fs = $1);
-	  m/dev=(\S+)/ && ($dev= $1); } @opt;
-    $fs = 'auto' if $fs =~ /:/;
-    &clean_options(\@opt,\@normal_must,\@normal_bad);
-    if ($dev =~ /^\/dev\/(fd[0-1]|floppy$)/ ) {
-      @must = qw (sync);
-      &clean_options(\@opt,\@must, []);
-    } elsif (($dev =~ /^\/dev\/cdrom\d*$/) || ($fs eq "iso9660" )) {
-      @must = qw (ro exec);
-      &clean_options(\@opt,\@must, []);
-    }
-    $opt = join (',' , @opt); 
-    print "$dev\t$point\t$fs $opt\t$d1 $d2\n";
-    next;
-} elsif ( $enable && (!defined($mpoint) || $point eq $mpoint) &&
-            ( $fs eq "iso9660" || 
-			  ( $_ !~ /^#/ && $fs =~ m/$fs_ok/ &&
-			    ( $dev =~ /^\/dev\/($dev_ok)$/ || $point =~ m|^/mnt/($mnt_ok)$| )
-			  )
-	        ) &&
-			 ($opt =~ m/(^|.*,)user.*/)
-	    ) {
-    if ($fs eq "auto") {
-	if ($point =~ m,.*/cdrom\d*$, or $dev =~ m,.*/cdrom\d*$,) {
-	    $fs = "udf:iso9660";
-	} else {
-	    $fs = "ext2:vfat";
-	}
-    }
-    &clean_options(\@opt,\@super_must, \@super_bad);
-    $opt = join (',' , @opt); 
-    print "none\t$point\tsupermount\tfs=$fs,dev=$dev,--,$opt 0 0\n";
-    next;
-  }
-  print;
-}
-
-close FH;
-
-if ($infile) { close OU; 
-	       system("cp -f", $file, "$file.old");
-	       system("mv", $ofile, $file);chmod 0644, $file; }
-
-sub clean_options {
-  my ($ap_opt, $ap_must, $ap_bad) = @_;
-  my $o; my %union; my @opt = @$ap_bad;
-  foreach $o (@$ap_bad) {@$ap_opt = grep ( !/^$o$/ ,@$ap_opt);}
-  foreach my $o (@$ap_opt, @$ap_must) { $union{$o}++;}
-  @$ap_opt=keys %union;
-}
-
-sub usage {
-  my $e = shift @_;
-  $0 =~ s|.*/||;
-  print {  $e ? STDERR : STDOUT } << "EOF";
-Usage: $0 [OPTION]... <disable | enable>
-Enable or disable supermount in fstab. 
-
-  -m=DIR, --mountpoint=DIR: Specifiy single mount point to enable/disable.
-			    (default: all)
-  -f=FILE, --file=FILE:	    Specify an alternarte fstab file .
-			    (default: /etc/fstab).
-  -i,	      --infile:     Make modification directly in the file.
-
-EOF
-  exit($e);
-}
-__END__
- CHANGELOG:
-Thu Feb 25 2001 Andrej Borsenkow <Andrej.Borsenkow@mow.siemens.ru>
-- added ``--'' as delimiter for supermount fs options to avoid mount errors on fs-specific options
-- added --mountpoint option to operate on single mount point
-- changed condition to enable supermount to (($fs eq iso9660) || (($fs =~ m/$fs_ok) &&
- ($dev =~ /^\/dev\/($dev_ok)$/))) && ($opt =~ m/(^|.*,)user.*/ ) 
-Before it tried to supermount Windows vfat partitions that were defined with user option.
-
-Thu Apr 13 2000 Denis Havlik <denis@mandriva.com>
-- moved definitions of "good" and "bad" fs-options, "allowed fs-s" and "good devices" to top of the script for easier maintainance.
--  added &clean_options(\@opt,\@must, \@bad) function, which parses the @opt
-  array, adds the "must" options and removes the "bad" ones, and re-wrote the 
-  while (<FH>) {} loop to take advantage of this functions.
-- simplified the fstab parsing (split instead of regexp-s)
-- changed the rules used to decide which mount points are going to be 
-supermounted to: ($fs eq "iso9660") || (( $fs =~ m/$fs_ok/ ) &&
- (($dev =~ /^\/dev\/($dev_ok)$/) || ($opt =~ m/(^|.*,)user.*/ )) )
diff --git a/mandriva/supermount.8 b/mandriva/supermount.8
deleted file mode 100644
index de78042..0000000
--- a/mandriva/supermount.8
+++ /dev/null
@@ -1,46 +0,0 @@
-.TH SUPERMOUNT 8 "Dec 1999" "initscripts" "Mageia"
-.SH NAME
-supermount \- Enable or disable supermount feature
-.SH SYNOPSIS
-.B supermount 
-[\fIOPTION\fR]... <\fIdisable | enable\fR>
-.SH DESCRIPTION
-.PP
-\fBsupermount\fR allows system administrator to enable or disable the
-\fBsupermount\fR feature offered in recent Mageia kernels.  This
-feature automatically manages mounting and unmounting removable medias
-when needed.  The script simply adds or remove the \fBsupermount\fR
-option from within the entries of the \fI/etc/fstab\fR file.  Without
-option \fB\-i\fR the modified file is printed to stdout.
-.PP 
-\fBsupermount\fR has to be launched with one of the following
-arguments:
-.TP
-\fBenable\fR in order to enable supermount feature on relevant drives
-(cdrom and floppy drives),
-.TP
-\fBdisable\fR in order to disable the \fBsupermount\fR feature on all
-drives.
-.SH OPTIONS
-.TP
-\fB\-f=FILE\fR, \fB\-\-file=FILE\fR Indicates an alternate file where
-to make modifications. The default is \fI/etc/fstab\fR.
-.TP
-\fB\-m=FILE\fR, \fB\-\-mountpoint=FILE\fR Specify a specificall mountpoint to 
-enable.
-.TP
-\fB\-i\fR, \fB\-\-infile\fR Modifications are made directly to
-\fI/etc/fstab\fR or FILE specified through \fB\-f\fR option, instead
-of being outputted to stdout.
-.TP
-\fB\-h\fR, \fB\-\-help\fR, \fB\-?\fR print a short help message.
-.SH "SEE ALSO"
-\fIfstab\fR(5), \fImount\fR(8), \fIumount\fR(8),
-.SH AUTHOR
-Chmouel Boudjnah  - chmouel@mandriva.com and others.
-.SH COPYRIGHT
-Copyright \(co 1999/2000/2001 Mandriva.
-.br
-This is free software; see the source for copying conditions.  There
-is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE.
diff --git a/sysctl.conf b/sysctl.conf
index ca9ad12..0e05868 100644
--- a/sysctl.conf
+++ b/sysctl.conf
@@ -22,8 +22,6 @@ kernel.core_uses_pid = 1
 
 # If you set this variable to 1 then cd tray will close automatically when the 
 # cd drive is being accessed.
-# Setting this to 1 is not advised when supermount is enabled
-# (as it has been known to cause problems)
 dev.cdrom.autoclose=1
 # removed to fix some digital extraction problems 
 # dev.cdrom.check_media=1
-- 
2.1.0