Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=23771fe539345062a33798a4a4683a3c43a2fef6
commit 23771fe539345062a33798a4a4683a3c43a2fef6 Author: Miklos Vajna <[email protected]> Date: Wed Apr 6 00:25:21 2011 +0200 util-linux-2.19-3-i686 - drop no longer necessary rc.bootclean diff --git a/source/base/util-linux/FrugalBuild b/source/base/util-linux/FrugalBuild index d96c4bd..3bb0aa0 100644 --- a/source/base/util-linux/FrugalBuild +++ b/source/base/util-linux/FrugalBuild @@ -3,7 +3,7 @@ pkgname=util-linux pkgver=2.19 -pkgrel=2 +pkgrel=3 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux"; backup=('etc/sysconfig/console' 'etc/sysconfig/numlock') @@ -17,11 +17,11 @@ archs=('i686' 'x86_64' 'ppc' 'arm') up2date="lynx -dump 'http://git.kernel.org/?p=utils/util-linux/util-linux.git' |grep 'release v'|sed 's/.* .*v\(.*\) .*release .*/\1/'|grep -m1 -v 'rc'" # see bzr for more description on ${pkgver%%.?} source=($url/v${pkgver%%.?}/util-linux-$pkgver.tar.bz2 \ - frugalwaregetty numlock rc.{bootclean,console,mount,rmount,swap,time} \ - rc.bootclean-{de,hu}.po rc.mount-{de,hu}.po rc.rmount-{de,hu}.po \ + frugalwaregetty numlock rc.{console,mount,rmount,swap,time} \ + rc.mount-{de,hu}.po rc.rmount-{de,hu}.po \ rc.swap-{de,hu}.po rc.time-{de,hu}.po \ README.Frugalware) -signatures=($source.sign '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '') +signatures=($source.sign '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '') subpkgs=("${subpkgs[@]}" "libblkid") subdescs=("${subdescs[@]}" 'Block device id library') @@ -60,7 +60,7 @@ build() { Fmv /sbin/raw /usr/bin/raw # Init scripts. - for i in bootclean mount rmount swap + for i in mount rmount swap do Frcd2 $i done diff --git a/source/base/util-linux/pot/rc.bootclean.pot b/source/base/util-linux/pot/rc.bootclean.pot deleted file mode 100644 index 8442311..0000000 --- a/source/base/util-linux/pot/rc.bootclean.pot +++ /dev/null @@ -1,21 +0,0 @@ -# rc.bootclean. -# Copyright (C) YEAR THE rc.bootclean'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.bootclean package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: rc.bootclean\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-14 19:25+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <[email protected]>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: rc.bootclean:18 -msgid "Cleaning /tmp, /var/lock, /var/run" -msgstr "" diff --git a/source/base/util-linux/rc.bootclean b/source/base/util-linux/rc.bootclean deleted file mode 100644 index 7b1c04c..0000000 --- a/source/base/util-linux/rc.bootclean +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/bash -### BEGIN INIT INFO -# Default-Start: S -### END INIT INFO - -# (c) 2005 Marcus Habermehl <[email protected]> -# (c) 2005 Laszlo Dvornik <[email protected]> -# rc.bootclean for Frugalware -# distributed under GPL License - -# chkconfig: - 00 00 -# description: Clean /tmp, /var/run and /var/lock. - -source /lib/initscripts/functions -TEXTDOMAIN=bootclean -TEXTDOMAINDIR=/lib/initscripts/messages - -actions=(start stop) - -rc_start() -{ - msg $"Cleaning /tmp, /var/lock, /var/run" - if grep -q 'tmpfs /tmp' /proc/mounts; then - # /tmp is tmpfs, then we need to create two special dirs for X - install -d -m1777 /tmp/.ICE-unix - install -d -m1777 /tmp/.X11-unix - else - EXCEPT='! -name . - ! ( -path ./lost+found -uid 0 ) - ! ( -path ./quota.user -uid 0 ) - ! ( -path ./aquota.user -uid 0 ) - ! ( -path ./quota.group -uid 0 ) - ! ( -path ./aquota.group -uid 0 ) - ! ( -path ./.journal -uid 0 ) - ! ( -path ./.clean -uid 0 ) - ! ( -path ./.ICE-unix -uid 0 ) - ! ( -path ./.X11-unix -uid 0 ) - ! ( -path './...security*' -uid 0 )' - - ( if cd /tmp && [ "`find . -maxdepth 0 -perm -002`" = "." ]; then - # First remove all old files. - find . -depth -xdev $EXCEPT \ - ! -type d -print0 | xargs -0r rm -f - # And then all empty directories. - find . -depth -xdev $EXCEPT \ - -type d -empty -exec rmdir \{\} \; - rm -f .X*-lock - fi ) - fi - - ( cd /var/lock && find . ! -type d -exec rm -f -- {} \; ) - - ( cd /var/run && \ - find . ! -type d ! -name utmp ! -name innd.pid \ - -exec rm -f -- {} \; ) - ok $? -} - -rc_stop() -{ - /bin/true -} - -rc_exec $1 - -# vim: ft=sh diff --git a/source/base/util-linux/rc.bootclean-de.po b/source/base/util-linux/rc.bootclean-de.po deleted file mode 100644 index 56fb468..0000000 --- a/source/base/util-linux/rc.bootclean-de.po +++ /dev/null @@ -1,21 +0,0 @@ -# rc.bootclean. -# Copyright (C) 2005 THE rc.bootclean'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.bootclean package. -# Marcus Habermehl <[email protected]>, 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: rc.bootclean\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-14 19:25+0100\n" -"PO-Revision-Date: 2005-11-14 19:28+0100\n" -"Last-Translator: Marcus Habermehl <[email protected]>\n" -"Language-Team: German <[email protected]>\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.bootclean:18 -msgid "Cleaning /tmp, /var/lock, /var/run" -msgstr "Leere /tmp, /var/lock und /var/run" diff --git a/source/base/util-linux/rc.bootclean-hu.po b/source/base/util-linux/rc.bootclean-hu.po deleted file mode 100644 index 288c8ff..0000000 --- a/source/base/util-linux/rc.bootclean-hu.po +++ /dev/null @@ -1,21 +0,0 @@ -# rc.bootclean. -# Copyright (C) 2005 THE rc.bootclean'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.bootclean package. -# Marcus Habermehl <[email protected]>, 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: rc.bootclean\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-14 19:25+0100\n" -"PO-Revision-Date: 2005-11-14 19:28+0100\n" -"Last-Translator: Marcus Habermehl <[email protected]>\n" -"Language-Team: Hungarian <[email protected]>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-2\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: rc.bootclean:18 -msgid "Cleaning /tmp, /var/lock, /var/run" -msgstr "A /tmp, /var/lock, /var/run tisztítása" diff --git a/source/base/util-linux/util-linux.install b/source/base/util-linux/util-linux.install index 89bd4dd..07252f3 100644 --- a/source/base/util-linux/util-linux.install +++ b/source/base/util-linux/util-linux.install @@ -4,7 +4,6 @@ post_install() { ln -sf ../rc.mount S16rc.mount ln -sf ../rc.swap S17rc.swap [ "`uname -m`" != "ppc" ] && ln -sf ../rc.time S18rc.time - ln -sf ../rc.bootclean S19rc.bootclean [ "`type -p chkconfig`" ] && chkconfig --add rc.console [ "`type -p chkconfig`" ] && chkconfig --add rc.rmount [ "`type -p chkconfig`" ] && chkconfig --add rc.swap @@ -19,6 +18,7 @@ post_upgrade() { echo -n "generating the top-level Info node... " mkinfodir /usr/share/info > /usr/share/info/dir 2> /dev/null echo "done." + rm -f /etc/rc.d/rcS.d/S19rc.bootclean } pre_remove() {
_______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
