Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=ab3dec8989c6fa70774212cd10dd0d4dd8fd247b
commit ab3dec8989c6fa70774212cd10dd0d4dd8fd247b Author: Michel Hermier <herm...@frugalware.org> Date: Wed Dec 1 21:51:35 2010 +0100 util-linux-ng-2.18.ga4f4cc7-1-i686 * Remove rc.bootclean, rc.mount, rc.time. systemd provides support for this. diff --git a/source/base/util-linux-ng/FrugalBuild b/source/base/util-linux-ng/FrugalBuild index f0de6db..d4835d2 100644 --- a/source/base/util-linux-ng/FrugalBuild +++ b/source/base/util-linux-ng/FrugalBuild @@ -24,18 +24,16 @@ if ! Fuse $USE_DEVEL; then signatures=("${source[0]}.sign") else _F_scm_type="git" - pkgver="$pkgver.g07b336c" - pkgrel=2 + pkgver="$pkgver.ga4f4cc7" + pkgrel=1 _F_scm_url="git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git" options=("${optio...@]}" 'force') Finclude scm fi source=("${sour...@]}" \ - frugalwaregetty numlock rc.{bootclean,mount,rmount,time} \ - rc.bootclean-{de,hu}.po rc.mount-{de,hu}.po rc.rmount-{de,hu}.po \ - rc.time-{de,hu}.po \ - README.Frugalware) -signatures=("${signatur...@]}" '' '' '' '' '' '' '' '' '' '' '' '' '' '' '') + frugalwaregetty numlock rc.rmount \ + rc.rmount-{de,hu}.po README.Frugalware) +signatures=("${signatur...@]}" '' '' '' '' '' '') subpkgs=("${subpk...@]}" "libblkid") subdescs=("${subdes...@]}" 'Block device id library') @@ -81,11 +79,7 @@ build() { Fmv /sbin/raw /usr/bin/raw # Init scripts. - for i in bootclean mount rmount - do - Frcd2 $i - done - [ "$CARCH" != "ppc" ] && Frcd2 time + Frcd2 rmount # Our getty. Fexe /sbin/frugalwaregetty diff --git a/source/base/util-linux-ng/rc.bootclean b/source/base/util-linux-ng/rc.bootclean deleted file mode 100644 index a38e360..0000000 --- a/source/base/util-linux-ng/rc.bootclean +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/bash - -# (c) 2005 Marcus Habermehl <bmh198...@yahoo.de> -# (c) 2005 Laszlo Dvornik <dvor...@gnome.hu> -# 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-ng/rc.bootclean-de.po b/source/base/util-linux-ng/rc.bootclean-de.po deleted file mode 100644 index 56fb468..0000000 --- a/source/base/util-linux-ng/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 <bmh198...@yahoo.de>, 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 <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.bootclean:18 -msgid "Cleaning /tmp, /var/lock, /var/run" -msgstr "Leere /tmp, /var/lock und /var/run" diff --git a/source/base/util-linux-ng/rc.bootclean-hu.po b/source/base/util-linux-ng/rc.bootclean-hu.po deleted file mode 100644 index 288c8ff..0000000 --- a/source/base/util-linux-ng/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 <bmh198...@yahoo.de>, 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 <bmh198...@yahoo.de>\n" -"Language-Team: Hungarian <translation-team...@lists.sourceforge.net>\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-ng/rc.mount b/source/base/util-linux-ng/rc.mount deleted file mode 100644 index 09228d9..0000000 --- a/source/base/util-linux-ng/rc.mount +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/bash - -# (c) 2005 Marcus Habermehl <bmh198...@yahoo.de> -# (c) 2003-2005 Vajna Miklos <vmik...@frugalware.org> -# (c) Patrick J. Volkerding, <volke...@slackware.com> -# rc.mount for Frugalware -# distributed under GPL License - -# chkconfig: - 00 97 -# description: Mount/umount local filesystems. - -source /lib/initscripts/functions -TEXTDOMAIN=mount -TEXTDOMAINDIR=/lib/initscripts/messages - -actions=(start stop) - -if [ -z $2 ] ; then - rl=4 -else - rl=$2 -fi - -rc_start() -{ - # See if a forced filesystem check was requested at shutdown. - if [ -r /etc/forcefsck ]; then - ffsck="-f" - fi - - # Check all the non-root filesystems. - if ! [ -r /etc/fastboot ]; then - msg $"Checking non-root filesystems" - /sbin/fsck $ffsck -T -C -R -A -a - ok $? - fi - - # Mount non-root file systems in fstab (but not NFS or SMB - # because TCP/IP is not yet configured). - msg $"Mounting local filesystems" - mount -a -t nonfs,nosmbfs,noproc,nosysfs,nofuse,nontfs-3g - ok $? - - # Clean up some temporary files. - /bin/rm -f /var/run/utmp /var/run/*pid /etc/nologin /var/run/lpd* \ - /var/run/ppp* /etc/dhcpc/dhcpcd-eth*.pid /etc/forcefsck \ - /etc/fastboot - - # Create a fresh utmp file. - cat /dev/null > /var/run/utmp - - if cat /etc/fstab | grep ' / ' | grep -q umsdos ; then - rfstype="umsdos" - fi - if [ "$rfstype" = "umsdos" ]; then - # We need to update any files added in DOS. - msg $"Synchronizing UMSDOS directory structure" - umssync -r99 -v- / - ok $? - fi -} - -rc_stop() -{ - if (( ${rl} == 0 )) || (( ${rl} == 6 )) ; then - msg $"Unmounting local filesystems" - umount -a -r -t nonfs,noumsdos,nosmbfs,noproc,nofuse,nofuseblk - ok $? - - # Don't remount UMSDOS root volumes. - if [ ! "`mount | head -n 1 | cut -d ' ' -f 5`" = "umsdos" ]; then - msg $"Remounting root filesystem read-only" - mount -n -o remount,ro / - ok $? - fi - fi - # This never hurts. :) - sync -} - -rc_exec $1 - -# vim: ft=sh diff --git a/source/base/util-linux-ng/rc.mount-de.po b/source/base/util-linux-ng/rc.mount-de.po deleted file mode 100644 index 93ff122..0000000 --- a/source/base/util-linux-ng/rc.mount-de.po +++ /dev/null @@ -1,37 +0,0 @@ -# rc.mount. -# Copyright (C) 2005 THE rc.mount'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.mount package. -# Marcus Habermehl <bmh198...@yahoo.de>, 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: rc.mount\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-14 19:47+0100\n" -"PO-Revision-Date: 2005-11-14 19:48+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.mount:32 -msgid "Checking non-root filesystems" -msgstr "Prüfe non-root Dateisysteme" - -#: rc.mount:39 -msgid "Mounting local filesystems" -msgstr "Hänge lokale Dateisysteme ein" - -#: rc.mount:56 -msgid "Synchronizing UMSDOS directory structure" -msgstr "Synchronisiere UMSDOS Verzeichnisstruktur" - -#: rc.mount:65 -msgid "Unmounting local filesystems" -msgstr "Hänge lokale Dateisysteme aus" - -#: rc.mount:71 -msgid "Remounting root filesystem read-only" -msgstr "Hänge Wurzeldateisystem mit Schreibschutz wieder ein" diff --git a/source/base/util-linux-ng/rc.mount-hu.po b/source/base/util-linux-ng/rc.mount-hu.po deleted file mode 100644 index 101b974..0000000 --- a/source/base/util-linux-ng/rc.mount-hu.po +++ /dev/null @@ -1,37 +0,0 @@ -# rc.mount. -# Copyright (C) 2005 THE rc.mount'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.mount package. -# Marcus Habermehl <bmh198...@yahoo.de>, 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: rc.mount\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-14 19:47+0100\n" -"PO-Revision-Date: 2005-11-14 19:48+0100\n" -"Last-Translator: Marcus Habermehl <bmh198...@yahoo.de>\n" -"Language-Team: Hungarian <translation-team...@lists.sourceforge.net>\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.mount:32 -msgid "Checking non-root filesystems" -msgstr "A nem root-fájlrendszerek vizsgálata" - -#: rc.mount:39 -msgid "Mounting local filesystems" -msgstr "A helyi fájlrendszerek csatolása" - -#: rc.mount:56 -msgid "Synchronizing UMSDOS directory structure" -msgstr "Az UMSDOS könyvtárrendszer struktúrájának szinkronizálása" - -#: rc.mount:65 -msgid "Unmounting local filesystems" -msgstr "A helyi fájlrendszerek lecsatolása" - -#: rc.mount:71 -msgid "Remounting root filesystem read-only" -msgstr "A root fájlrendszer újracsatolása csak írható módban" diff --git a/source/base/util-linux-ng/rc.time b/source/base/util-linux-ng/rc.time deleted file mode 100644 index 77a15e0..0000000 --- a/source/base/util-linux-ng/rc.time +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/bash - -# (c) 2005 Marcus Habermehl <bmh198...@yahoo.de> -# (c) 2003-2005 Vajna Miklos <vmik...@frugalware.org> -# (c) Patrick J. Volkerding, <volke...@slackware.com> -# rc.time for Frugalware -# distributed under GPL License - -# chkconfig: - 00 05 -# description: Set/save the system time to/from the hardware clock using \ -# hwclock. - -source /lib/initscripts/functions -TEXTDOMAIN=time -TEXTDOMAINDIR=/lib/initscripts/messages - -actions=(restart start stop) - -if [ -z $2 ] ; then - rl=4 -else - rl=$2 -fi - -rc_start() -{ - msg $"Setting system time from the hardware clock" - if grep -q "^UTC" /etc/hardwareclock ; then - /sbin/hwclock --utc --hctosys - ok $? - hint $"Using UTC" - else - /sbin/hwclock --localtime --hctosys - ok $? - hint $"Using localtime" - fi -} - -rc_stop() -{ - msg $"Saving the system time to the hardware clock" - if (( ${rl} == 0 )) || (( ${rl} == 6 )) ; then - if grep -q "^UTC" /etc/hardwareclock ; then - /sbin/hwclock --utc --systohc - ok $? - hint $"Using UTC" - else - /sbin/hwclock --localtime --systohc - ok $? - hint $"Using localtime" - fi - else - ok 999 - fi -} - -rc_exec $1 - -# vim: ft=sh diff --git a/source/base/util-linux-ng/rc.time-de.po b/source/base/util-linux-ng/rc.time-de.po deleted file mode 100644 index a0df3ea..0000000 --- a/source/base/util-linux-ng/rc.time-de.po +++ /dev/null @@ -1,33 +0,0 @@ -# rc.time. -# Copyright (C) 2005 THE rc.time'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.time package. -# Marcus Habermehl <bmh198...@yahoo.de>, 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: rc.time\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-14 20:11+0100\n" -"PO-Revision-Date: 2005-11-14 20:12+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.time:26 -msgid "Setting system time from the hardware clock" -msgstr "Lade Systemzeit aus der Hardwareuhr" - -#: rc.time:30 rc.time:45 -msgid "Using UTC" -msgstr "Benutze UTC" - -#: rc.time:34 rc.time:49 -msgid "Using localtime" -msgstr "Benutze localtime" - -#: rc.time:40 -msgid "Saving the system time to the hardware clock" -msgstr "Sichere die Systemzeit in der Hardwareuhr" diff --git a/source/base/util-linux-ng/rc.time-hu.po b/source/base/util-linux-ng/rc.time-hu.po deleted file mode 100644 index c554c8c..0000000 --- a/source/base/util-linux-ng/rc.time-hu.po +++ /dev/null @@ -1,33 +0,0 @@ -# rc.time. -# Copyright (C) 2005 THE rc.time'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.time package. -# Marcus Habermehl <bmh198...@yahoo.de>, 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: rc.time\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-14 20:11+0100\n" -"PO-Revision-Date: 2005-11-14 20:12+0100\n" -"Last-Translator: Marcus Habermehl <bmh198...@yahoo.de>\n" -"Language-Team: Hungarian <translation-team...@lists.sourceforge.net>\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.time:26 -msgid "Setting system time from the hardware clock" -msgstr "Az idõ beállítása" - -#: rc.time:30 rc.time:45 -msgid "Using UTC" -msgstr "UTC idõ beállítása" - -#: rc.time:34 rc.time:49 -msgid "Using localtime" -msgstr "Helyi idõ használata" - -#: rc.time:40 -msgid "Saving the system time to the hardware clock" -msgstr "Az idõ elmentése"
_______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git