Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=93ec7559cbcb9afb1b10dcb4a945e8a1879df5a2
commit 93ec7559cbcb9afb1b10dcb4a945e8a1879df5a2
Author: Michel Hermier <herm...@frugalware.org>
Date: Wed Dec 1 22:33:17 2010 +0100
util-linux-ng-2.18.ga4f4cc7-2-i686
* Attempting to make rc service removal more clean.
diff --git a/source/base/util-linux-ng/FrugalBuild
b/source/base/util-linux-ng/FrugalBuild
index d4835d2..be72644 100644
--- a/source/base/util-linux-ng/FrugalBuild
+++ b/source/base/util-linux-ng/FrugalBuild
@@ -25,7 +25,7 @@ if ! Fuse $USE_DEVEL; then
else
_F_scm_type="git"
pkgver="$pkgver.ga4f4cc7"
- pkgrel=1
+ pkgrel=2
_F_scm_url="git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git"
options=("${optio...@]}" 'force')
Finclude scm
diff --git a/source/base/util-linux-ng/pot/rc.bootclean.pot
b/source/base/util-linux-ng/pot/rc.bootclean.pot
deleted file mode 100644
index 8442311..0000000
--- a/source/base/util-linux-ng/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 <em...@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 <em...@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.bootclean:18
-msgid "Cleaning /tmp, /var/lock, /var/run"
-msgstr ""
diff --git a/source/base/util-linux-ng/pot/rc.mount.pot
b/source/base/util-linux-ng/pot/rc.mount.pot
deleted file mode 100644
index dbf1eb0..0000000
--- a/source/base/util-linux-ng/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 <em...@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 <em...@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-ng/pot/rc.swap.pot
b/source/base/util-linux-ng/pot/rc.swap.pot
deleted file mode 100644
index cfe81f9..0000000
--- a/source/base/util-linux-ng/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 <em...@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 <em...@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-ng/pot/rc.time.pot
b/source/base/util-linux-ng/pot/rc.time.pot
deleted file mode 100644
index d631339..0000000
--- a/source/base/util-linux-ng/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 <em...@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 <em...@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-ng/util-linux-ng.install
b/source/base/util-linux-ng/util-linux-ng.install
index d14d0b7..0165892 100644
--- a/source/base/util-linux-ng/util-linux-ng.install
+++ b/source/base/util-linux-ng/util-linux-ng.install
@@ -1,31 +1,20 @@
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
- [ "`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
- [ "`type -p chkconfig`" ] && chkconfig --add rc.mount
- [ "`uname -m`" != "ppc" -a "`type -p chkconfig`" ] && chkconfig --add
rc.time
echo -n "generating the top-level Info node... "
mkinfodir /usr/share/info > /usr/share/info/dir 2> /dev/null
echo "done."
}
-post_upgrade() {
- post_install $1
+pre_upgrade() {
+ pre_remove $1
}
pre_remove() {
- rm -f /etc/rc.d/rcS.d/S{16rc.mount,17rc.swap,18rc.time}
- [ "`type -p chkconfig`" ] && chkconfig --del rc.console
- [ "`type -p chkconfig`" ] && chkconfig --del rc.rmount
- [ "`type -p chkconfig`" ] && chkconfig --del rc.swap
- [ "`type -p chkconfig`" ] && chkconfig --del rc.mount
- [ "`uname -m`" != "ppc" -a "`type -p chkconfig`" ] && chkconfig --del
rc.time
+ rm -f /etc/rc.d/rcS.d/S{16rc.mount,17rc.swap,18rc.time,19rc.bootclean}
+ service bootclean del 2&>/dev/null
+ service mount del 2&>/dev/null
+# service rmount del 2&>/dev/null
+ service swap del 2&>/dev/null
+ service time del 2&>/dev/null
}
post_remove() {
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
