From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 11 Oct 2011 13:53:58 +0000 (+0200)
Subject: udev: Remove console_init.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58397358aa377dcbf2b74bc078a3ffab1bfddea8;p=ipfire-3.x.git

udev: Remove console_init.
---

diff --git a/udev/console_init b/udev/console_init
deleted file mode 100644
index 1aaaf4df8..000000000
--- a/udev/console_init
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/bash
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2008  Michael Tremer & Christian Schmidt                      #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-is_true() {
-	[ "$1" = "1" ] || [ "$1" = "yes" ] || [ "$1" = "true" ]
-}
-
-# Native English speakers probably don't have /etc/sysconfig/console at all
-if [ -f /etc/sysconfig/console ]; then
-	. /etc/sysconfig/console
-fi
-
-# Setting default values
-[ -z "$UNICODE" ] && UNICODE=1
-[ -z "$FONT" ] && FONT="LatArCyrHeb-16"
-
-device="/dev/$1"
-
-# Figure out the mode to set the console into
-if is_true "${UNICODE}"; then
-	echo -en '\033%G' > $device
-else
-	echo -en '\033%@' > $device
-fi
-
-# Setting font
-setfont ${FONT} -C $device
-
-# Setting up keyboard
-if [ -n "$KEYMAP" ]; then
-	if is_true "${UNICODE}"; then
-		loadkeys -u $KEYMAP >/dev/null
-	else
-		loadkeys $KEYMAP >/dev/null
-	fi
-	[ -n "$KEYMAP_CORRECTIONS" ] && \
-		loadkeys $KEYMAP_CORRECTIONS >/dev/null
-fi
diff --git a/udev/rules/10-console.rules b/udev/rules/10-console.rules
deleted file mode 100644
index 6e8c45876..000000000
--- a/udev/rules/10-console.rules
+++ /dev/null
@@ -1,9 +0,0 @@
-# Console initialization - keyboard, font, etc.
-KERNEL=="tty0",		RUN+="/lib/udev/console_init %k"
-
-# Check and set up serial and serial-like consoles if necessary
-KERNEL=="console",	RUN+="/lib/udev/console_check %k"
-KERNEL=="ttySG*",	RUN+="/lib/udev/console_check %k"
-KERNEL=="xvc*",		RUN+="/lib/udev/console_check %k"
-KERNEL=="hvsi*",	RUN+="/lib/udev/console_check %k"
-KERNEL=="hvc*",		RUN+="/lib/udev/console_check %k"
diff --git a/udev/udev.nm b/udev/udev.nm
index d7176ff32..9e9416e27 100644
--- a/udev/udev.nm
+++ b/udev/udev.nm
@@ -5,7 +5,7 @@
 
 name       = udev
 version    = 172
-release    = 2
+release    = 3
 
 groups     = Base System/Base
 url        = ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/
@@ -45,10 +45,6 @@ build
 		--with-systemdsystemunitdir=/lib/systemd/system
 
 	install_cmds
-		# Install rules
-		mkdir -pv %{BUILDROOT}/lib/udev/rules.d/
-		install -m644 -v %{DIR_SOURCE}/rules/*.rules %{BUILDROOT}/lib/udev/rules.d/
-
 		# Install pkg-config files correctly
 		mv -v %{BUILDROOT}/lib/pkgconfig %{BUILDROOT}/usr/lib
 
@@ -59,8 +55,6 @@ build
 		ln -svf ../../../../lib/udev/udev-acl \
 			%{BUILDROOT}/usr/lib/ConsoleKit/run-seat.d/udev-acl.ck
 
-		install -m 755 %{DIR_SOURCE}/console_init %{BUILDROOT}/lib/udev/
-
 		# Remove network rules. We have our own in the network package.
 		rm -v %{BUILDROOT}/lib/udev/{write_net_rules,rules.d/75-persistent-net-generator.rules}
 	end
@@ -68,12 +62,11 @@ end
 
 packages
 	package %{name}
-	end
-	
+
 	package lib%{name}
 		template LIBS
 	end
-	
+
 	package lib%{name}-devel
 		template DEVEL
 	end