From cd1b0e9a8f0c323def3cae4b88f81d23df960229 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 20 Feb 2023 12:34:04 +0100 Subject: [PATCH] Drop deprecated /etc/inittab configuration files Those configuration files are no longer relevant for us with systemd, so let's drop those. --- debian/grml-live.maintscript | 2 + etc/grml/fai/config/files/etc/inittab/GRMLBASE | 96 ------------------------ etc/grml/fai/config/files/etc/inittab/GRML_SMALL | 96 ------------------------ 3 files changed, 2 insertions(+), 192 deletions(-) delete mode 100644 etc/grml/fai/config/files/etc/inittab/GRMLBASE delete mode 100644 etc/grml/fai/config/files/etc/inittab/GRML_SMALL diff --git a/debian/grml-live.maintscript b/debian/grml-live.maintscript index 8b464d7..8e029f0 100644 --- a/debian/grml-live.maintscript +++ b/debian/grml-live.maintscript @@ -1,4 +1,6 @@ rm_conffile /etc/grml/fai/config/files/etc/apt/grml.key/GRMLBASE 0.32.3~ +rm_conffile /etc/grml/fai/config/files/etc/inittab/GRMLBASE 0.43.0~ +rm_conffile /etc/grml/fai/config/files/etc/inittab/GRML_SMALL 0.43.0~ rm_conffile /etc/grml/fai/config/files/etc/lsb-base-logging.sh/GRMLBASE 0.42.3~ rm_conffile /etc/grml/fai/config/files/etc/systemd/system/serial-getty@ttyS0.service.d/override.conf/GRMLBASE 0.33.2~ rm_conffile /etc/grml/fai/config/scripts/GRMLBASE/36-cpufrequtils 0.33.0~ diff --git a/etc/grml/fai/config/files/etc/inittab/GRMLBASE b/etc/grml/fai/config/files/etc/inittab/GRMLBASE deleted file mode 100644 index 7e49dba..0000000 --- a/etc/grml/fai/config/files/etc/inittab/GRMLBASE +++ /dev/null @@ -1,96 +0,0 @@ -# This file was deployed via grml-live's -# ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/15-initsetup script, using -# ${GRML_FAI_CONFIG}/config/files/etc/inittab/GRMLBASE -################################################################################ -# Filename: inittab -# Purpose: init(8) configuration. -# Authors: grml-team (grml.org), (c) Michael Prokop -# Bug-Reports: see http://grml.org/bugs/ -# License: This file is licensed under the GPL v2. -################################################################################ - -# The default runlevel. -id:2:initdefault: - -# Boot-time system configuration/initialization script. -# This is run first except when booting in emergency (-b) mode. -si::sysinit:/etc/init.d/rcS - -# What to do in single-user mode. -~~:S:respawn:/bin/zsh --login >/dev/tty1 2>&1 ::: -# 4 virtual consoles with immortal shells -# Note that on most Debian systems tty7 is used by the X Window System. -# Use tty8 a second xserver. -1:12345:respawn:/sbin/grml-runtty /dev/tty1 /usr/share/grml-scripts/run-welcome root -2:2345:respawn:/sbin/grml-runtty /dev/tty2 /usr/share/grml-scripts/run-screen root -3:2345:respawn:/sbin/grml-runtty /dev/tty3 /usr/share/grml-scripts/run-screen root -4:2345:respawn:/sbin/grml-runtty /dev/tty4 /usr/share/grml-scripts/run-screen $USERNAME -5:2345:respawn:/sbin/grml-runtty /dev/tty5 /bin/zsh $USERNAME -6:2345:respawn:/sbin/grml-runtty /dev/tty6 /bin/zsh $USERNAME -9:2345:respawn:/sbin/getty 38400 tty9 -#10:2345:respawn:/sbin/grml-runtty /dev/tty10 /usr/sbin/grml-iptstate root -11:2345:respawn:/sbin/grml-runtty /dev/tty11 /usr/bin/htop root -12:2345:respawn:/sbin/grml-runtty /dev/tty12 /usr/share/grml-scripts/run-multitail root - -################################################################################ -# Please do NOT remove the line with the marker as it is important for the -# bootoption serial/console. line(s) will be inserted here according to the -# provided kernel command line: -#grmlserial# is a marker, important for the bootoption serial/console -################################################################################ - -# Example how to put a getty on a serial line (for a terminal) -# T0:23:respawn:/sbin/getty -L ttyS0 9600 vt100 -# T1:23:respawn:/sbin/getty -L ttyS1 9600 vt100 - -#-- isdnutils begin -# Change the lines below for your local setup and uncomment them. -# Use "init q" to reread inittab. -# look at the vboxgetty / mgetty manpage for more information (mgetty isn't -# standard!) -# -#I0:2345:respawn:/usr/sbin/vboxgetty -d /dev/ttyI0 -#I1:2345:respawn:/sbin/mgetty -D -m '"" ATZ OK AT&Eyourmsnhere OK AT&B512 OK' -s 38400 ttyI1 -#-- isdnutils end - -# Run X Window session from CDROM in runlevel 5 -#w5:5:wait:/bin/sleep 2 -#x5:5:wait:/etc/init.d/xsession start - -# Use line below to use secvpnmon. Use init q to reread inittab. -# SVPN:2345:respawn:/usr/sbin/secvpnmon diff --git a/etc/grml/fai/config/files/etc/inittab/GRML_SMALL b/etc/grml/fai/config/files/etc/inittab/GRML_SMALL deleted file mode 100644 index 09f48eb..0000000 --- a/etc/grml/fai/config/files/etc/inittab/GRML_SMALL +++ /dev/null @@ -1,96 +0,0 @@ -# This file was deployed via grml-live's -# ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/15-initsetup script, using -# ${GRML_FAI_CONFIG}/config/files/etc/inittab/GRML_SMALL -################################################################################ -# Filename: inittab.small -# Purpose: init(8) configuration for grml-small -# Authors: grml-team (grml.org), (c) Michael Prokop -# Bug-Reports: see http://grml.org/bugs/ -# License: This file is licensed under the GPL v2. -################################################################################ - -# The default runlevel. -id:2:initdefault: - -# Boot-time system configuration/initialization script. -# This is run first except when booting in emergency (-b) mode. -si::sysinit:/etc/init.d/rcS - -# What to do in single-user mode. -~~:S:respawn:/bin/zsh --login >/dev/tty1 2>&1 ::: -# 4 virtual consoles with immortal shells -# Note that on most Debian systems tty7 is used by the X Window System. -# Use tty8 a second xserver. -1:12345:respawn:/sbin/grml-runtty /dev/tty1 /usr/share/grml-scripts/run-welcome root -2:2345:respawn:/sbin/grml-runtty /dev/tty2 /usr/share/grml-scripts/run-screen root -3:2345:respawn:/sbin/grml-runtty /dev/tty3 /usr/share/grml-scripts/run-screen root -#4:2345:respawn:/sbin/grml-runtty /dev/tty4 /usr/share/grml-scripts/run-screen $USERNAME -#5:2345:respawn:/sbin/grml-runtty /dev/tty5 /bin/zsh $USERNAME -#6:2345:respawn:/sbin/grml-runtty /dev/tty6 /bin/zsh $USERNAME -#9:2345:respawn:/sbin/getty 38400 tty9 -#10:2345:respawn:/sbin/grml-runtty /dev/tty10 /usr/sbin/grml-iptstate root -#11:2345:respawn:/sbin/grml-runtty /dev/tty11 /usr/bin/htop root -#12:2345:respawn:/sbin/grml-runtty /dev/tty12 /usr/share/grml-scripts/run-multitail root - -################################################################################ -# Please do NOT remove the line with the marker as it is important for the -# bootoption serial/console. line(s) will be inserted here according to the -# provided kernel command line: -#grmlserial# is a marker, important for the bootoption serial/console -################################################################################ - -# Example how to put a getty on a serial line (for a terminal) -# T0:23:respawn:/sbin/getty -L ttyS0 9600 vt100 -# T1:23:respawn:/sbin/getty -L ttyS1 9600 vt100 - -#-- isdnutils begin -# Change the lines below for your local setup and uncomment them. -# Use "init q" to reread inittab. -# look at the vboxgetty / mgetty manpage for more information (mgetty isn't -# standard!) -# -#I0:2345:respawn:/usr/sbin/vboxgetty -d /dev/ttyI0 -#I1:2345:respawn:/sbin/mgetty -D -m '"" ATZ OK AT&Eyourmsnhere OK AT&B512 OK' -s 38400 ttyI1 -#-- isdnutils end - -# Run X Window session from CDROM in runlevel 5 -#w5:5:wait:/bin/sleep 2 -#x5:5:wait:/etc/init.d/xsession start - -# Use line below to use secvpnmon. Use init q to reread inittab. -# SVPN:2345:respawn:/usr/sbin/secvpnmon -- 2.1.4