Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=5ba654d50e58fca6703d278c954a12cfa18a1065
commit 5ba654d50e58fca6703d278c954a12cfa18a1065
Author: Michel Hermier herm...@frugalware.org
Date: Wed Dec 1 14:24:14 2010 +0100
util-linux-ng-2.18.g07b336c-1-i686
* Remove rc.console and rc.swap. systemd provides support for that.
diff --git a/source/base/util-linux-ng/FrugalBuild
b/source/base/util-linux-ng/FrugalBuild
index 2a3f541..073a8a0 100644
--- a/source/base/util-linux-ng/FrugalBuild
+++ b/source/base/util-linux-ng/FrugalBuild
@@ -5,7 +5,7 @@ USE_DEVEL=${USE_DEVEL:-y}
pkgname=util-linux-ng
pkgver=2.18
-pkgrel=2
+pkgrel=3
pkgdesc=Miscellaneous system utilities for Linux
url=http://www.kernel.org/pub/linux/utils/util-linux-ng;
backup=('etc/sysconfig/console' 'etc/sysconfig/numlock')
@@ -31,11 +31,11 @@ else
Finclude scm
fi
source=(${sour...@]} \
- frugalwaregetty numlock rc.{bootclean,console,mount,rmount,swap,time} \
+ frugalwaregetty numlock rc.{bootclean,mount,rmount,time} \
rc.bootclean-{de,hu}.po rc.mount-{de,hu}.po rc.rmount-{de,hu}.po \
rc.swap-{de,hu}.po rc.time-{de,hu}.po \
README.Frugalware)
-signatures=(${signatur...@]} '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' ''
'' '' '')
+signatures=(${signatur...@]} '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' ''
'')
subpkgs=(${subpk...@]} libblkid)
subdescs=(${subdes...@]} 'Block device id library')
@@ -81,12 +81,11 @@ build() {
Fmv /sbin/raw /usr/bin/raw
# Init scripts.
- for i in bootclean mount rmount swap
+ for i in bootclean mount rmount
do
Frcd2 $i
done
[ $CARCH != ppc ] Frcd2 time
- Fexe /etc/rc.d/rc.console
# Our getty.
Fexe /sbin/frugalwaregetty
diff --git a/source/base/util-linux-ng/rc.console
b/source/base/util-linux-ng/rc.console
deleted file mode 100644
index 63a7ee2..000
--- a/source/base/util-linux-ng/rc.console
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-# (c) 2005 Marcus Habermehl bmh19...@yahoo.de
-# (c) 2003-2005 Vajna Miklos vmik...@frugalware.org
-# rc.console for Frugalware
-# distributed under GPL License
-
-# chkconfig: 2345 00 98
-# description: Screen blanks after n minutes idle time.
-
-source /lib/initscripts/functions
-
-actions=(start stop)
-
-rc_start()
-{
- if [ -e /etc/sysconfig/console ] ; then
- source /etc/sysconfig/console
- setterm -blank $idle
- fi
-}
-
-rc_stop()
-{
- /bin/true
-}
-
-rc_exec $1
-
-# vim: ft=sh
diff --git a/source/base/util-linux-ng/rc.swap
b/source/base/util-linux-ng/rc.swap
deleted file mode 100644
index c83a54b..000
--- a/source/base/util-linux-ng/rc.swap
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-# (c) 2005 Marcus Habermehl bmh198...@yahoo.de
-# (c) 2003-2005 Vajna Miklos vmik...@frugalware.org
-# rc.swap for Frugalware
-# distributed under GPL License
-
-# chkconfig: - 00 96
-# description: Turn on/off swap.
-
-source /lib/initscripts/functions
-TEXTDOMAIN=swap
-TEXTDOMAINDIR=/lib/initscripts/messages
-actions=(start stop)
-
-if [ -z $2 ] ; then
- rl=4
-else
- rl=$2
-fi
-
-rc_start()
-{
- msg $Activating swap
- /sbin/swapon -a
- ok $?
-}
-
-rc_stop()
-{
- msg $Turning off swap
- if (( ${rl} == 0 )) || (( ${rl} == 6 )) ; then
- /sbin/swapoff -a
- ok $?
- else
- ok 999
- fi
-}
-
-rc_exec $1
-
-# vim: ft=sh
diff --git a/source/base/util-linux-ng/rc.swap-de.po
b/source/base/util-linux-ng/rc.swap-de.po
deleted file mode 100644
index a06129b..000
--- a/source/base/util-linux-ng/rc.swap-de.po
+++ /dev/null
@@ -1,25 +0,0 @@
-# rc.swap.
-# Copyright (C) 2005 THE rc.swap'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the rc.swap package.
-# Marcus Habermehl bmh198...@yahoo.de, 2005.
-#
-msgid
-msgstr
-Project-Id-Version: rc.swap\n
-Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2005-11-14 20:02+0100\n
-PO-Revision-Date: 2005-11-14 20:03+0100\n
-Last-Translator: Marcus Habermehl bmh198...@yahoo.de\n
-Language-Team: German translation-team...@lists.sourceforge.net\n
-MIME-Version: 1.0\n
-Content-Type: text/plain; charset=ISO-8859-1\n
-Content-Transfer-Encoding: 8bit\n
-Plural-Forms: nplurals=2; plural=(n != 1);\n
-
-#: rc.swap:24
-msgid Activating swap
-msgstr Aktiviere swap
-
-#: rc.swap:31
-msgid Turning off swap
-msgstr Deaktiviere swap
diff --git a/source/base/util-linux-ng/rc.swap-hu.po
b/source/base/util-linux-ng/rc.swap-hu.po
deleted file mode 100644
index dfc1358..000
--- a/source/base/util-linux-ng/rc.swap-hu.po
+++ /dev/null
@@ -1,25 +0,0 @@
-# rc.swap.
-# Copyright (C) 2005 THE rc.swap'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the rc.swap package.
-# Marcus Habermehl bmh198...@yahoo.de, 2005.
-#
-msgid
-msgstr
-Project-Id-Version: rc.swap\n
-Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2005-11-14 20:02+0100\n
-PO-Revision-Date: 2005-11-14 20:03+0100\n
-Last-Translator: Marcus Habermehl
