From: Christian Hofstaedtler Date: Sat, 6 Nov 2010 16:53:15 +0000 (+0100) Subject: Remove mgetty support. X-Git-Tag: v1.2.3~2 X-Git-Url: http://git.grml.org/?p=grml-etc.git;a=commitdiff_plain;h=b2fecd0c540fa361acf131dc05efda3a280b65f1 Remove mgetty support. --- diff --git a/debian/overrides b/debian/overrides index 7ce1e0d..d17aebc 100644 --- a/debian/overrides +++ b/debian/overrides @@ -30,7 +30,6 @@ grml-etc: init.d-script-missing-lsb-section /etc/init.d/grml-home grml-etc: init.d-script-missing-lsb-section /etc/init.d/grml-misc grml-etc: init.d-script-missing-lsb-section /etc/init.d/grml-reboot grml-etc: init.d-script-possible-missing-stop /etc/init.d/ssh 0 6 -grml-etc: non-standard-file-perm etc/mgetty/login.config 0600 != 0644 grml-etc: package-installs-into-etc-rc.d etc/rc0.d/important_notice grml-etc: package-installs-into-etc-rc.d etc/rc1.d/important_notice grml-etc: package-installs-into-etc-rc.d etc/rc2.d/important_notice diff --git a/debian/postrm b/debian/postrm index 65322a1..6ca2472 100755 --- a/debian/postrm +++ b/debian/postrm @@ -8,11 +8,10 @@ set -e -TO_UNDIVERT1="login.config mgetty.config" -TO_UNDIVERT2="ssh" -TO_UNDIVERT3="kismet.conf" -TO_UNDIVERT4="wlan-ng.conf" -TO_UNDIVERT5="smb.conf" +TO_UNDIVERT1="ssh" +TO_UNDIVERT2="kismet.conf" +TO_UNDIVERT3="wlan-ng.conf" +TO_UNDIVERT4="smb.conf" undivert_gen() { DEXT=${3:-original} @@ -33,18 +32,15 @@ replace_grml_with_orig_inittab() { case "$1" in purge) for cmd in $TO_UNDIVERT1; do - undivert_gen $cmd /etc/mgetty - done - for cmd in $TO_UNDIVERT2; do undivert_gen $cmd /etc/init.d done - for cmd in $TO_UNDIVERT3; do + for cmd in $TO_UNDIVERT2; do undivert_gen $cmd /etc/kismet done - for cmd in $TO_UNDIVERT4; do + for cmd in $TO_UNDIVERT3; do undivert_gen $cmd /etc/pcmcia done - for cmd in $TO_UNDIVERT5; do + for cmd in $TO_UNDIVERT4; do undivert_gen $cmd /etc/samba done diff --git a/debian/preinst b/debian/preinst index 013cd6c..b9f4279 100755 --- a/debian/preinst +++ b/debian/preinst @@ -9,10 +9,9 @@ set -e -TO_DIVERT1="login.config mgetty.config" -TO_DIVERT2="ssh" -TO_DIVERT3="kismet.conf" -TO_DIVERT4="wlan-ng.conf" +TO_DIVERT1="ssh" +TO_DIVERT2="kismet.conf" +TO_DIVERT3="wlan-ng.conf" divert_gen() { DEXT=${3:-original} @@ -39,18 +38,14 @@ rm_conffile() { case "$1" in install|upgrade) for cmd in $TO_DIVERT1; do - divert_gen $cmd /etc/mgetty - done - - for cmd in $TO_DIVERT2; do divert_gen $cmd /etc/init.d done - for cmd in $TO_DIVERT3; do + for cmd in $TO_DIVERT2; do divert_gen $cmd /etc/kismet done - for cmd in $TO_DIVERT4; do + for cmd in $TO_DIVERT3; do divert_gen $cmd /etc/pcmcia done diff --git a/debian/rules b/debian/rules index a1efbb6..0a1e085 100755 --- a/debian/rules +++ b/debian/rules @@ -52,7 +52,6 @@ binary-indep: build install mkdir -p debian/grml-etc/usr/share/lintian/overrides/ cp -av debian/overrides debian/grml-etc/usr/share/lintian/overrides/grml-etc dh_fixperms - chmod 0600 debian/grml-etc/etc/mgetty/login.config chmod 0755 debian/grml-etc/etc/skel/.config/rox.sourceforge.net/MIME-types/image dh_installdeb find debian/grml-etc/etc -type f ! -name \*.xpm ! -name \*.png -print | \ diff --git a/etc/inittab.grml b/etc/inittab.grml index c6ab590..19a2123 100644 --- a/etc/inittab.grml +++ b/etc/inittab.grml @@ -75,11 +75,6 @@ po::powerokwait:/etc/init.d/powerfail stop # T1:23:respawn:/bin/bash -c "/sbin/getty -L ttyS1 -l /usr/bin/zsh-login 9600 vt100 || sleep 30" # T0:23:respawn:/sbin/getty -L ttyS0 9600 vt100 # T1:23:respawn:/sbin/getty -L ttyS1 9600 vt100 -# T0:2345:respawn:/bin/bash -c "/sbin/mgetty ttyS0 || sleep 30" -# T1:2345:respawn:/bin/bash -c "/sbin/mgetty ttyS1 || sleep 30" - -# Example how to put a getty on a modem line. -#T3:23:respawn:/sbin/mgetty -x0 -s 57600 ttyS3 #-- isdnutils begin # Change the lines below for your local setup and uncomment them. diff --git a/etc/inittab.small b/etc/inittab.small index e34321e..611a316 100644 --- a/etc/inittab.small +++ b/etc/inittab.small @@ -75,11 +75,6 @@ po::powerokwait:/etc/init.d/powerfail stop # T1:23:respawn:/bin/bash -c "/sbin/getty -L ttyS1 -l /usr/bin/zsh-login 9600 vt100 || sleep 30" # T0:23:respawn:/sbin/getty -L ttyS0 9600 vt100 # T1:23:respawn:/sbin/getty -L ttyS1 9600 vt100 -# T0:2345:respawn:/bin/bash -c "/sbin/mgetty ttyS0 || sleep 30" -# T1:2345:respawn:/bin/bash -c "/sbin/mgetty ttyS1 || sleep 30" - -# Example how to put a getty on a modem line. -#T3:23:respawn:/sbin/mgetty -x0 -s 57600 ttyS3 #-- isdnutils begin # Change the lines below for your local setup and uncomment them. diff --git a/etc/mgetty/login.config b/etc/mgetty/login.config deleted file mode 100644 index eb193d8..0000000 --- a/etc/mgetty/login.config +++ /dev/null @@ -1,76 +0,0 @@ -# login.config -# -# This is a sample "login dispatcher" configuration file for mgetty -# -# Format: -# username userid utmp_entry login_program [arguments] -# -# Meaning: -# for a "username" entered at mgettys login: prompt, call -# "login_program" with [arguments], with the uid set to "userid", -# and a USER_PROCESS utmp entry with ut_user = "utmp_entry" -# -# username may be prefixed / suffixed by "*" (wildcard) -# -# userid is a valid user name from /etc/passwd, or "-" to not set -# a login user id and keep the uid/euid root (needed for /bin/login) -# -# utmp_entry is what will appear in the "who" listing. Use "-" to not -# set an utmp entry (a must for /bin/login), use "@" to set it to the -# username entered. Maximum length is 8 characters. -# -# login_program is the program that will be exec()ed, with the arguments -# passed in [arguments]. A "@" in the arguments will be replaced with the -# username entered. Warning: if no "@" is given, the login_program has -# no way to know what user name the user entered. -# -# -# SAMPLES: -# Use this one with my Taylor-UUCP and Taylor-UUCP passwd files. -# (Big advantage: tuucp can use the same passwd file for serial dial-in -# and tcp dial-in [uucico running as in.uucpd]). Works from 1.05 up. -# -#U* uucp @ /usr/sbin/uucico -l -u @ - -# -# Use this one for fido calls (login name /FIDO/ is handled specially) -# -# You need Eugene Crosser's "ifmail" package for this to work. -# mgetty has to be compiled with "-DFIDO", otherwise a fido call won't -# be detected. -# -#/FIDO/ uucp fido /usr/lib/fnet/ifcico @ - -# -# Automatic PPP startup on receipt of LCP configure request (AutoPPP). -# mgetty has to be compiled with "-DAUTO_PPP" for this to work. -# Warning: Case is significant, AUTOPPP or autoppp won't work! -# Consult the "pppd" man page to find pppd options that work for you. -# -# NOTE: for *some* users, the "-detach" option has been necessary, for -# others, not at all. If your pppd doesn't die after hangup, try it. -# -# NOTE2: "debug" creates lots of debugging info. LOOK AT IT if things -# do not work out of the box, most likely it's a ppp problem! -# -# NOTE3: "man pppd" is your friend! -# -# NOTE4: max. 9 arguments allowed. -# -#/AutoPPP/ - a_ppp /usr/sbin/pppd auth -chap +pap login debug - -# -# -# An example where no login name in the argument list is desired: -# automatically telnetting to machine "smarty" for a given login name -# -#telnet-smarty gast telnet /usr/bin/telnet -8 smarty -# -# This is the "standard" behaviour - *dont* set a userid or utmp -# entry here, otherwise /bin/login will fail! -# This entry isn't really necessary: if it's missing, the built-in -# default will do exactly this. -# -#* - - /bin/login @ -#root root root /bin/bash -l -root root root /bin/zsh -l diff --git a/etc/mgetty/mgetty.config b/etc/mgetty/mgetty.config deleted file mode 100644 index 7eb20a6..0000000 --- a/etc/mgetty/mgetty.config +++ /dev/null @@ -1,72 +0,0 @@ -# -# mgetty configuration file -# -# this is a sample configuration file, see mgetty.info for details -# -# comment lines start with a "#", empty lines are ignored - - -# ----- global section ----- -# -# In this section, you put the global defaults, per-port stuff is below - - -# set the global debug level to "4" (default from policy.h) -debug 0 - -# set the local fax station id -fax-id - -# access the modem(s) with 38400 bps -speed 9600 - -# use an alternate issue file, to avoid being bitten by linuxlogo -issue-file /etc/issue.mgetty - -# use these options to make the /dev/tty-device owned by "uucp.uucp" -# and mode "rw-rw-r--" (0664). *LEADING ZERO NEEDED!* -#port-owner uucp -#port-group uucp -#port-mode 0664 - -# use these options to make incoming faxes owned by "root.uucp" -# and mode "rw-r-----" (0640). *LEADING ZERO NEEDED!* -#fax-owner root -#fax-group uucp -#fax-mode 0640 - - -# ----- port specific section ----- -# -# Here you can put things that are valid only for one line, not the others -# - -# Zoom V.FX 28.8, connected to ttyS0: don't do fax, less logging -# -#port ttyS0 -# debug 3 -# data-only y - -# some other Rockwell modem, needs "switchbd 19200" to receive faxes -# properly (otherwise it will fail with "timeout"). -# -#port ttyS1 -# speed 38400 -# switchbd 19200 - -# ZyXEL 2864, connected to ttyS2: maximum debugging, grab statistics -# -#port ttyS2 -# debug 8 -# init-chat "" \d\d\d+++\d\d\dAT&FS2=255 OK ATN3S0=0S13.2=1 OK -# statistics-chat "" AT OK ATI2 OK -# statistics-file /var/log/statistics.ttyS2 -# modem-type cls2 - -# direct connection of a VT100 terminal which doesn't like DTR drops -# ("direct" meaning "*no* *modem*". NEVER enable "direct yes" on modem lines!) -# -port ttyS0 - direct y - speed 9600 - toggle-dtr n