Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4aa11c70a9fdca4ca3571cbaf48f17800d3e1b5b
commit 4aa11c70a9fdca4ca3571cbaf48f17800d3e1b5b Author: Miklos Vajna <vmik...@frugalware.org> Date: Tue Aug 23 13:04:18 2011 +0200 util-linux-2.19.1-3-i686 - drop no longer needed rc.{mount,rmount,swap} diff --git a/source/base/util-linux/FrugalBuild b/source/base/util-linux/FrugalBuild index cc6994a..c729a31 100644 --- a/source/base/util-linux/FrugalBuild +++ b/source/base/util-linux/FrugalBuild @@ -3,7 +3,7 @@ pkgname=util-linux pkgver=2.19.1 -pkgrel=2 +pkgrel=3 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux" backup=('etc/sysconfig/numlock') @@ -17,11 +17,9 @@ 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.{mount,rmount,swap} \ - rc.mount-{de,hu}.po rc.rmount-{de,hu}.po \ - rc.swap-{de,hu}.po \ + frugalwaregetty numlock \ README.Frugalware) -signatures=($source.sign '' '' '' '' '' '' '' '' '' '' '' '') +signatures=($source.sign '' '' '') subpkgs=("${subpkgs[@]}" "libblkid") subdescs=("${subdescs[@]}" 'Block device id library') @@ -55,21 +53,9 @@ build() { Fln /proc/self/mounts /etc/mtab - # Move stuff to the right location (where util-linux had them, maybe - # remove later). + # Move stuff to the right location (maybe remove later). Fmv /sbin/raw /usr/bin/raw - # Init scripts. - for i in mount rmount swap - do - Frcd2 $i - done - # don't run old sysv init script with different name when using systemd - Fmkdir /lib/systemd/system - Fln remount-rootfs.service /lib/systemd/system/mount.service - Fln remount-rootfs.service /lib/systemd/system/rmount.service - Fln remount-rootfs.service /lib/systemd/system/swap.service - # Our getty. Fexe /sbin/frugalwaregetty Ffile /etc/sysconfig/numlock diff --git a/source/base/util-linux/pot/rc.mount.pot b/source/base/util-linux/pot/rc.mount.pot deleted file mode 100644 index dbf1eb0..0000000 --- a/source/base/util-linux/pot/rc.mount.pot +++ /dev/null @@ -1,37 +0,0 @@ -# rc.mount. -# Copyright (C) YEAR THE rc.mount'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.mount package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -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: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <l...@li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: rc.mount:32 -msgid "Checking non-root filesystems" -msgstr "" - -#: rc.mount:39 -msgid "Mounting local filesystems" -msgstr "" - -#: rc.mount:56 -msgid "Synchronizing UMSDOS directory structure" -msgstr "" - -#: rc.mount:65 -msgid "Unmounting local filesystems" -msgstr "" - -#: rc.mount:71 -msgid "Remounting root filesystem read-only" -msgstr "" diff --git a/source/base/util-linux/pot/rc.rmount.pot b/source/base/util-linux/pot/rc.rmount.pot deleted file mode 100644 index b381881..0000000 --- a/source/base/util-linux/pot/rc.rmount.pot +++ /dev/null @@ -1,25 +0,0 @@ -# rc.rmount. -# Copyright (C) YEAR THE rc.rmount'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.rmount package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: rc.rmount\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-14 19:53+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <l...@li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: rc.rmount:18 -msgid "Mounting remote (NFS, SMB) filesystems" -msgstr "" - -#: rc.rmount:25 -msgid "Unmounting remote (NFS, SMB) filesystems" -msgstr "" diff --git a/source/base/util-linux/pot/rc.swap.pot b/source/base/util-linux/pot/rc.swap.pot deleted file mode 100644 index cfe81f9..0000000 --- a/source/base/util-linux/pot/rc.swap.pot +++ /dev/null @@ -1,25 +0,0 @@ -# rc.swap. -# Copyright (C) YEAR THE rc.swap'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.swap package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -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: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <l...@li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: rc.swap:24 -msgid "Activating swap" -msgstr "" - -#: rc.swap:31 -msgid "Turning off swap" -msgstr "" diff --git a/source/base/util-linux/pot/rc.time.pot b/source/base/util-linux/pot/rc.time.pot deleted file mode 100644 index d631339..0000000 --- a/source/base/util-linux/pot/rc.time.pot +++ /dev/null @@ -1,33 +0,0 @@ -# rc.time. -# Copyright (C) YEAR THE rc.time'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.time package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -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: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <l...@li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: rc.time:26 -msgid "Setting system time from the hardware clock" -msgstr "" - -#: rc.time:30 rc.time:45 -msgid "Using UTC" -msgstr "" - -#: rc.time:34 rc.time:49 -msgid "Using localtime" -msgstr "" - -#: rc.time:40 -msgid "Saving the system time to the hardware clock" -msgstr "" diff --git a/source/base/util-linux/rc.mount b/source/base/util-linux/rc.mount deleted file mode 100644 index 09228d9..0000000 --- a/source/base/util-linux/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/rc.mount-de.po b/source/base/util-linux/rc.mount-de.po deleted file mode 100644 index 93ff122..0000000 --- a/source/base/util-linux/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/rc.mount-hu.po b/source/base/util-linux/rc.mount-hu.po deleted file mode 100644 index 101b974..0000000 --- a/source/base/util-linux/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/rc.rmount b/source/base/util-linux/rc.rmount deleted file mode 100644 index ba2bd7b..0000000 --- a/source/base/util-linux/rc.rmount +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -# (c) 2005 Marcus Habermehl <bmh198...@yahoo.de> -# (c) 2003-2005 Vajna Miklos <vmik...@frugalware.org> -# rc.rmount for Frugalware -# distributed under GPL License - -# chkconfig: 2345 19 90 -# description: Mounts or umounts remote (NFS, SMB) filesystems. - -source /lib/initscripts/functions -TEXTDOMAIN=rmount -TEXTDOMAINDIR=/lib/initscripts/messages -actions=(restart start stop) - -rc_start() -{ - msg $"Mounting remote (NFS, SMB) filesystems" - mount -a -t nfs,smbfs,fuse,ntfs-3g - ok $? -} - -rc_stop() -{ - msg $"Unmounting remote (NFS, SMB) filesystems" - umount -a -r -t nfs,smbfs,fuse,fuseblk - ok $? -} - -rc_exec $1 - -# vim: ft=sh diff --git a/source/base/util-linux/rc.rmount-de.po b/source/base/util-linux/rc.rmount-de.po deleted file mode 100644 index d804149..0000000 --- a/source/base/util-linux/rc.rmount-de.po +++ /dev/null @@ -1,25 +0,0 @@ -# rc.rmount. -# Copyright (C) 2005 THE rc.rmount'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.rmount package. -# Marcus Habermehl <bmh198...@yahoo.de>, 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: rc.rmount\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-14 19:53+0100\n" -"PO-Revision-Date: 2005-11-14 19:54+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.rmount:18 -msgid "Mounting remote (NFS, SMB) filesystems" -msgstr "Hänge entfernte (NFS, SMB) Dateisysteme ein" - -#: rc.rmount:25 -msgid "Unmounting remote (NFS, SMB) filesystems" -msgstr "Hänge entfernte (NFS, SMB) Dateisysteme aus" diff --git a/source/base/util-linux/rc.rmount-hu.po b/source/base/util-linux/rc.rmount-hu.po deleted file mode 100644 index 42f66df..0000000 --- a/source/base/util-linux/rc.rmount-hu.po +++ /dev/null @@ -1,25 +0,0 @@ -# rc.rmount. -# Copyright (C) 2005 THE rc.rmount'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.rmount package. -# Marcus Habermehl <bmh198...@yahoo.de>, 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: rc.rmount\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-14 19:53+0100\n" -"PO-Revision-Date: 2005-11-14 19:54+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.rmount:18 -msgid "Mounting remote (NFS, SMB) filesystems" -msgstr "Távoli fájlrendszerek (NFS, SMB) csatolása" - -#: rc.rmount:25 -msgid "Unmounting remote (NFS, SMB) filesystems" -msgstr "Távoli fájlrendszerek (NFS, SMB) lecsatolása" diff --git a/source/base/util-linux/rc.swap b/source/base/util-linux/rc.swap deleted file mode 100644 index c83a54b..0000000 --- a/source/base/util-linux/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/rc.swap-de.po b/source/base/util-linux/rc.swap-de.po deleted file mode 100644 index a06129b..0000000 --- a/source/base/util-linux/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/rc.swap-hu.po b/source/base/util-linux/rc.swap-hu.po deleted file mode 100644 index dfc1358..0000000 --- a/source/base/util-linux/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 <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.swap:24 -msgid "Activating swap" -msgstr "A swap bekapcsolása" - -#: rc.swap:31 -msgid "Turning off swap" -msgstr "A swap kikapcsolása" diff --git a/source/base/util-linux/rc.time b/source/base/util-linux/rc.time deleted file mode 100644 index 77a15e0..0000000 --- a/source/base/util-linux/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/rc.time-de.po b/source/base/util-linux/rc.time-de.po deleted file mode 100644 index a0df3ea..0000000 --- a/source/base/util-linux/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/rc.time-hu.po b/source/base/util-linux/rc.time-hu.po deleted file mode 100644 index c554c8c..0000000 --- a/source/base/util-linux/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" diff --git a/source/base/util-linux/util-linux.install b/source/base/util-linux/util-linux.install index 019136f..66e3e7d9 100644 --- a/source/base/util-linux/util-linux.install +++ b/source/base/util-linux/util-linux.install @@ -1,32 +1,25 @@ post_install() { - [ -h /etc/rc.d/rcS.d/S10rc.swap ] && rm /etc/rc.d/rcS.d/S10rc.swap - cd /etc/rc.d/rcS.d - ln -sf ../rc.mount S16rc.mount - ln -sf ../rc.swap S17rc.swap - [ "`type -p chkconfig`" ] && chkconfig --add rc.rmount - [ "`type -p chkconfig`" ] && chkconfig --add rc.swap - [ "`type -p chkconfig`" ] && chkconfig --add rc.mount echo -n "generating the top-level Info node... " mkinfodir /usr/share/info > /usr/share/info/dir 2> /dev/null echo "done." } +pre_upgrade() { + # these can go after Frugalware-1.6 + chkconfig --del rc.time >/dev/null 2>&1 + chkconfig --del rc.mount >/dev/null 2>&1 + chkconfig --del rc.rmount >/dev/null 2>&1 + chkconfig --del rc.swap >/dev/null 2>&1 +} + post_upgrade() { echo -n "generating the top-level Info node... " mkinfodir /usr/share/info > /usr/share/info/dir 2> /dev/null echo "done." - # can be removed after Frugalware-1.5 - rm -f /etc/rc.d/rcS.d/S19rc.bootclean - chkconfig --del rc.console >/dev/null 2>&1 + # these can go after Frugalware-1.6 rm -f /etc/rc.d/rcS.d/S18rc.time - chkconfig --del rc.time >/dev/null 2>&1 -} - -pre_remove() { - rm -f /etc/rc.d/rcS.d/S{16rc.mount,17rc.swap} - [ "`type -p chkconfig`" ] && chkconfig --del rc.rmount - [ "`type -p chkconfig`" ] && chkconfig --del rc.swap - [ "`type -p chkconfig`" ] && chkconfig --del rc.mount + rm -f /etc/rc.d/rcS.d/S16rc.mount + rm -f /etc/rc.d/rcS.d/S17rc.swap } post_remove() {
_______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git