Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=e5c9c8b0d20dfbfa5fa06101aac6c9282da6163d
commit e5c9c8b0d20dfbfa5fa06101aac6c9282da6163d Author: Michel Hermier <herm...@frugalware.org> Date: Wed Dec 1 22:07:31 2010 +0100 net-tools-1.60-28-i686 * Remove rc.hostname. * Attempt to make .install cleaning the service registration of rc.hostname and rc.interfaces. diff --git a/source/base/net-tools/FrugalBuild b/source/base/net-tools/FrugalBuild index f08269e..7b172fc 100644 --- a/source/base/net-tools/FrugalBuild +++ b/source/base/net-tools/FrugalBuild @@ -3,7 +3,7 @@ pkgname=net-tools pkgver=1.60 -pkgrel=27 +pkgrel=28 pkgdesc="Important tools for controlling the network subsystem" url="http://www.tazenda.demon.co.uk/phil/net-tools/"; depends=('mktemp>=1.5-3' 'chkconfig>=1.3.30c-2') @@ -13,16 +13,14 @@ archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump $url |tail -n 1|tr '-' '\n'|sed 's/.tar.bz2//'|tail -n 1" source=($url/$pkgname-$pkgver.tar.bz2 \ $pkgname-$pkgver-configure.diff $pkgname-$pkgver-gcc34.diff \ - $pkgname-$pkgver-i18n.diff rc.hostname \ - net-tools.install \ + $pkgname-$pkgver-i18n.diff net-tools.install \ $pkgname-$pkgver-kernel26.diff \ net-tools-1.60-mii-tool-obsolete.patch) sha1sums=('944fb70641505d5d1139dba3aeb81ba124574b83' \ 'ffc3cd8044f83af7f0dd544d767d5d7623b91093' \ 'ff8daa4d48f867679d9feab2123cea4838684f79' \ '8dd9e07f99356870104dc4c168746055e78b03f1' \ - '168330ad740abdeaf79dac58e682f73110454969' \ - 'b9b541809ad26ee12b18ba088981468953eeadb2' \ + '4cdc2d9fc22363e776f2df494cdcc3833a342596' \ '448f5da06b9936c0c0e7ccf38cc36aa3ca5bd9f8' \ 'fe9c2e8248920f0c8c6fb0214f19eef1f8e6e77a') @@ -39,7 +37,6 @@ build() make BASEDIR=$Fdestdir update Fln ../../bin/hostname /usr/bin/hostname - Frcd hostname } # optimization OK diff --git a/source/base/net-tools/net-tools.install b/source/base/net-tools/net-tools.install index db27ca7..e286592 100644 --- a/source/base/net-tools/net-tools.install +++ b/source/base/net-tools/net-tools.install @@ -4,14 +4,9 @@ is_wireless_device() return 0 } -post_install() -{ - chkconfig --add rc.hostname -} - post_upgrade() { - post_install + pre_remove if [ -f /etc/sysconfig/interfaces -a ! -f /etc/sysconfig/network/default ]; then . /etc/sysconfig/interfaces [ -f /etc/sysconfig/wireless ] && . /etc/sysconfig/wireless @@ -53,7 +48,8 @@ post_upgrade() pre_remove() { - chkconfig --del rc.hostname + service hostname del + service interfaces del } op=$1 diff --git a/source/base/net-tools/rc.hostname b/source/base/net-tools/rc.hostname deleted file mode 100644 index c63c387..0000000 --- a/source/base/net-tools/rc.hostname +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -# (c) 2003 Vajna Miklos <vmik...@frugalware.org> -# rc.hostname for FrugalWare -# distributed under GPL License - -. /etc/rc.d/rc.functions - -# chkconfig: 2345 02 98 -# description: hostname - set the system's host name - -if [ "$1" = "start" ]; then - # create missing /etc/HOSTNAME if needed - if ! [ -r /etc/HOSTNAME ]; then - echo "frugalware.local" >/etc/HOSTNAME - fi - hostname=`cat /etc/HOSTNAME | cut -f1 -d .` - start "$sethostname ($hostname)" - /bin/hostname "$hostname" - ok $? -fi _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
