summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2004-02-01 01:04:52 +0000
committerLennart Poettering <lennart@poettering.net>2004-02-01 01:04:52 +0000
commitda72e57b4a3b51f31f7e00f167faaf03307118c6 (patch)
tree9f09a89af9fb333892096cf73709099266b5dc78
parent806102792aeaa3e5020908e4d97593b621c9f543 (diff)
several fixes
rename ifstatus git-svn-id: file:///home/lennart/svn/public/ifplugd/trunk@96 2bf48fe7-cfc1-0310-909f-d9042e1e0fef
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac2
-rw-r--r--doc/README.html.in8
-rw-r--r--ifplugd.spec.in4
-rw-r--r--man/Makefile.am12
-rw-r--r--man/ifplugd.8.xml.in2
-rw-r--r--man/ifstatus.8.xml.in10
-rw-r--r--src/Makefile.am4
-rw-r--r--src/ifstatus.c6
9 files changed, 27 insertions, 23 deletions
diff --git a/Makefile.am b/Makefile.am
index eae1c32..1fa95d9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,7 +31,7 @@ homepage: all dist
test -d $$HOME/homepage/lennart
mkdir -p $$HOME/homepage/lennart/projects/ifplugd
cp *.tar.gz $$HOME/homepage/lennart/projects/ifplugd
- cp man/ifplugd.8.xml man/ifstatus.8.xml man/ifplugd.conf.5.xml man/xmltoman.css man/xmltoman.xsl man/xmltoman.dtd doc/README.html doc/style.css doc/NEWS $$HOME/homepage/lennart/projects/ifplugd
+ cp man/ifplugd.8.xml man/ifplugstatus.8.xml man/ifplugd.conf.5.xml man/xmltoman.css man/xmltoman.xsl man/xmltoman.dtd doc/README.html doc/style.css doc/NEWS $$HOME/homepage/lennart/projects/ifplugd
cp $$HOME/homepage/lennart/projects/ifplugd/README.html $$HOME/homepage/lennart/projects/ifplugd/index.html
diff --git a/configure.ac b/configure.ac
index f7f2c28..c04ee40 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
AC_PREREQ(2.59)
-AC_INIT([ifplugd],[0.21b],[mzvscyhtq (at) 0pointer (dot) de])
+AC_INIT([ifplugd],[0.22],[mzvscyhtq (at) 0pointer (dot) de])
AC_CONFIG_SRCDIR([src/ifplugd.c])
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([foreign -Wall])
diff --git a/doc/README.html.in b/doc/README.html.in
index 5d76d1a..a7b3175 100644
--- a/doc/README.html.in
+++ b/doc/README.html.in
@@ -43,6 +43,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</p>
<h2><a name="news">News</a></h2>
<div class="news-date">Mon Jan 26 2003: </div> <p class="news-text"><a
+href="@PACKAGE_URL@ifplugd-0.22.tar.gz">Version
+0.22</a> released, changes include: rename <tt>ifstatus</tt> to <tt>ifplugstatus</tt> due to namespace collision</p>
+
+<div class="news-date">Mon Jan 26 2003: </div> <p class="news-text"><a
href="@PACKAGE_URL@ifplugd-0.21b.tar.gz">Version
0.21b</a> released, added missing file.</p>
@@ -131,7 +135,7 @@ if you need a facility to configure WEP keys before AP associations succeed.</li
<h2><a name="documentation">Documentation</a></h2>
-<p>Have a look on the man pages <a href="@PACKAGE_URL@ifplugd.8.xml"><tt>ifplugd(8)</tt></a>, <a href="@PACKAGE_URL@ifstatus.8.xml"><tt>ifstatus(8)</tt></a>, <a href="@PACKAGE_URL@ifplugd.conf.5.xml"><tt>ifplugd.conf(5)</tt></a>. (An XSLT capable browser is required)</p>
+<p>Have a look on the man pages <a href="@PACKAGE_URL@ifplugd.8.xml"><tt>ifplugd(8)</tt></a>, <a href="@PACKAGE_URL@ifplugstatus.8.xml"><tt>ifplugstatus(8)</tt></a>, <a href="@PACKAGE_URL@ifplugd.conf.5.xml"><tt>ifplugd.conf(5)</tt></a>. (An XSLT capable browser is required)</p>
<h3>Configuration</h3>
@@ -291,7 +295,7 @@ on their source codes for learning how to use the link beat ioctls.</p>
<p>Oliver Kurth for packaging <tt>ifplugd</tt> for Debian and <tt>ifplugd</tt>'s
manpage</p>
-<p>Thomas Hood, Asgeir Nilsen, Sean Reifschneider, R. Steve McKown, David Mitchell, Norbert Preining for patches</p>
+<p>Thomas Hood, Asgeir Nilsen, Sean Reifschneider, R. Steve McKown, David Mitchell, Norbert Preining, Herbert Graeber for patches</p>
<p>Frederic Lepied for integrating <tt>ifplugd</tt> into Mandrake Linux</p>
diff --git a/ifplugd.spec.in b/ifplugd.spec.in
index 848d49d..d0533be 100644
--- a/ifplugd.spec.in
+++ b/ifplugd.spec.in
@@ -47,9 +47,9 @@ make DESTDIR=$RPM_BUILD_ROOT PREFIX=%{prefix} install
%doc LICENSE README
%doc doc/README.html doc/style.css
%{_sbindir}/ifplugd
-%{_sbindir}/ifstatus
+%{_sbindir}/ifplugstatus
%{_mandir}/man?/ifplugd*
-%{_mandir}/man?/ifstatus*
+%{_mandir}/man?/ifplugstatus*
%{_sysconfdir}/init.d/ifplugd
%config %{_sysconfdir}/ifplugd/ifplugd.conf
%config %{_sysconfdir}/ifplugd/ifplugd.action
diff --git a/man/Makefile.am b/man/Makefile.am
index 182f02a..aa145da 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -16,13 +16,13 @@
# along with ifplugd; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-man_MANS = ifplugd.8 ifplugd.conf.5 ifstatus.8
+man_MANS = ifplugd.8 ifplugd.conf.5 ifplugstatus.8
-noinst_DATA = ifplugd.8.xml ifplugd.conf.5.xml ifstatus.8.xml
+noinst_DATA = ifplugd.8.xml ifplugd.conf.5.xml ifplugstatus.8.xml
-EXTRA_DIST = $(man_MANS) ifplugd.8.xml.in ifplugd.conf.5.xml.in ifstatus.8.xml.in xmltoman.css xmltoman.xsl xmltoman.dtd
+EXTRA_DIST = $(man_MANS) ifplugd.8.xml.in ifplugd.conf.5.xml.in ifplugstatus.8.xml.in xmltoman.css xmltoman.xsl xmltoman.dtd
-CLEANFILES = ifplugd.8.xml ifplugd.conf.5.xml ifstatus.8.xml
+CLEANFILES = ifplugd.8.xml ifplugd.conf.5.xml ifplugstatus.8.xml
ifplugd.8.xml: ifplugd.8.xml.in Makefile
sed -e 's,@sysconfdir\@,$(sysconfdir),g' -e 's,@sbindir\@,$(sbindir),g' -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@
@@ -30,7 +30,7 @@ ifplugd.8.xml: ifplugd.8.xml.in Makefile
ifplugd.conf.5.xml: ifplugd.conf.5.xml.in Makefile
sed -e 's,@sysconfdir\@,$(sysconfdir),g' -e 's,@sbindir\@,$(sbindir),g' -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@
-ifstatus.8.xml: ifstatus.8.xml.in Makefile
+ifplugstatus.8.xml: ifplugstatus.8.xml.in Makefile
sed -e 's,@sysconfdir\@,$(sysconfdir),g' -e 's,@sbindir\@,$(sbindir),g' -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@
if USE_XMLTOMAN
@@ -43,7 +43,7 @@ ifplugd.8: ifplugd.8.xml Makefile
ifplugd.conf.5: ifplugd.conf.5.xml Makefile
xmltoman $< > $@
-ifstatus.8: ifstatus.8.xml Makefile
+ifplugstatus.8: ifplugstatus.8.xml Makefile
xmltoman $< > $@
endif
diff --git a/man/ifplugd.8.xml.in b/man/ifplugd.8.xml.in
index a72c9c7..4b57aef 100644
--- a/man/ifplugd.8.xml.in
+++ b/man/ifplugd.8.xml.in
@@ -280,7 +280,7 @@
<section name="See also">
<p>
<manref name="ifplugd.conf" section="5"/>, <manref name="ifup" section="8"/>, <manref name="interfaces"
- section="5"/>, <manref name="ifconfig" section="8"/>
+ section="5"/>, <manref name="ifconfig" section="8"/>, <manref name="ifplugstatus" section="8"/>
</p>
</section>
diff --git a/man/ifstatus.8.xml.in b/man/ifstatus.8.xml.in
index bbcf14b..f7bb62a 100644
--- a/man/ifstatus.8.xml.in
+++ b/man/ifstatus.8.xml.in
@@ -22,14 +22,14 @@
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-->
- <manpage name="ifstatus" section="8" desc="A link beat detection tool">
+ <manpage name="ifplugstatus" section="8" desc="A link beat detection tool">
<synopsis>
- <cmd>ifstatus [<arg>options</arg>] [<arg>INTERFACE</arg>]</cmd>
+ <cmd>ifplugstatus [<arg>options</arg>] [<arg>INTERFACE</arg>]</cmd>
</synopsis>
<description>
- <p>ifstatus is an utility which may be used to detect the link
+ <p>ifplugstatus is an utility which may be used to detect the link
status of a local Linux ethernet device, much in the same way
mii-diag, mii-tool and ethtool work. In fact it supports all
three different APIs these three tools use. Thus, it provides
@@ -44,7 +44,7 @@
<options>
<p>You may speicify an ethernet device on the command
- line. Otherwise ifstatus will check for eth0..eth9
+ line. Otherwise ifplugstatus will check for eth0..eth9
automatically.</p>
<option>
@@ -105,7 +105,7 @@
<section name="See also">
<p>
<manref name="mii-diag" section="8"/>, <manref name="mii-tool"
- section="8"/>, <manref name="ethtool" section="8"/>
+ section="8"/>, <manref name="ethtool" section="8"/>, <manref name="ifplugd" section="8"/>
</p>
</section>
diff --git a/src/Makefile.am b/src/Makefile.am
index bf439ae..6e36a96 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,7 +19,7 @@
AM_CFLAGS = $(LIBDAEMON_CFLAGS) -DSYSCONFDIR="\"$(sysconfdir)\""
LDADD = $(LIBDAEMON_LIBS)
-sbin_PROGRAMS = ifplugd ifstatus
+sbin_PROGRAMS = ifplugd ifplugstatus
ifplugd_SOURCES = ifplugd.c \
interface.c interface.h \
@@ -29,7 +29,7 @@ ifplugd_SOURCES = ifplugd.c \
nlapi.h nlapi.c \
svn-revision.h
-ifstatus_SOURCES = ifstatus.c \
+ifplugstatus_SOURCES = ifplugstatus.c \
interface.c interface.h \
ethtool-kernel.h ethtool-local.h \
wireless.h wireless.15.h wireless.16.h \
diff --git a/src/ifstatus.c b/src/ifstatus.c
index c409672..12cdd89 100644
--- a/src/ifstatus.c
+++ b/src/ifstatus.c
@@ -93,7 +93,7 @@ int handle(char *iface) {
default:
if (!verbose)
- printf("%s: not supported\n", iface);
+ printf("%s: not supported%s\n", iface, getuid() != 0 ? " (Retry as root?)" : "");
r = -1;
break;
@@ -152,9 +152,9 @@ void parse(int argc, char *argv[]) {
break;
case 'V':
#ifdef SVN_REVISION
- printf("ifstatus "VERSION" (SVN: "SVN_REVISION")\n");
+ printf("ifplugstatus "VERSION" (SVN: "SVN_REVISION")\n");
#else
- printf("ifstatus "VERSION"\n");
+ printf("ifplugstatus "VERSION"\n");
#endif
exit(0);
default: