Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=600a6290a52f9cce9222a758f000cb57de5eed95

commit 600a6290a52f9cce9222a758f000cb57de5eed95
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Thu Sep 17 11:15:34 2009 +0200

util-linux-ng-2.16.1-2-i686

- fix warnings in the scriptlet

diff --git a/source/base/util-linux-ng/FrugalBuild 
b/source/base/util-linux-ng/FrugalBuild
index 030e52b..e5ebd57 100644
--- a/source/base/util-linux-ng/FrugalBuild
+++ b/source/base/util-linux-ng/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=util-linux-ng
pkgver=2.16.1
-pkgrel=1
+pkgrel=2
pkgdesc="Miscellaneous system utilities for Linux"
url="http://www.kernel.org/pub/linux/utils/util-linux-ng";
backup=('etc/sysconfig/console' 'etc/sysconfig/numlock')
diff --git a/source/base/util-linux-ng/util-linux-ng.install 
b/source/base/util-linux-ng/util-linux-ng.install
index 6652b52..d14d0b7 100644
--- a/source/base/util-linux-ng/util-linux-ng.install
+++ b/source/base/util-linux-ng/util-linux-ng.install
@@ -5,11 +5,11 @@ post_install() {
ln -sf ../rc.swap S17rc.swap
[ "`uname -m`" != "ppc" ] && ln -sf ../rc.time S18rc.time
ln -sf ../rc.bootclean S19rc.bootclean
-       chkconfig --add rc.console
-       chkconfig --add rc.rmount
-       chkconfig --add rc.swap
-       chkconfig --add rc.mount
-       [ "`uname -m`" != "ppc" ] && chkconfig --add rc.time
+       [ "`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."
@@ -21,11 +21,11 @@ post_upgrade() {

pre_remove() {
rm -f /etc/rc.d/rcS.d/S{16rc.mount,17rc.swap,18rc.time}
-       chkconfig --del rc.console
-       chkconfig --del rc.rmount
-       chkconfig --del rc.swap
-       chkconfig --del rc.mount
-       [ "`uname -m`" != "ppc" ] && chkconfig --del rc.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
}

post_remove() {
@@ -38,5 +38,3 @@ op=$1
shift

$op $*
-
-# vim: ft=sh
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to