[RP-PPPoE] Mostly cosmetic changes, a warning, and reproducibility for 3.13-BETA-1
наб
nabijaczleweli at gmail.com
Mon May 4 16:24:49 EDT 2020
Hello again, and thank you, Dianne, for your swift response!
I have prepared another patchset[1] based on 3.14-BETA-1 ‒
no major changes, just some things I noticed when reading the diffs;
this time some (0003, a bit of 0004) are sourced from Debian;
0005 fixes a warning and potential truncation (which, considering
the string ends in "-S '%s'", could potentially be pretty ugly).
During the course of writing 0004, I noticed that it references
"http://www.scyld.com", the name of which resolves, but with nothing
responding at those IPs anymore; a quick search led me to a
notice of acquisition of Scyld by Penguin Computing[3] from 2003;
Linux, e.g., removed printed links to scyld.com[4] in 2007,
and the last commit CCing @scyld.com was in 2011.
Removing this would probably be for the best,
but I prefer to ask first; you might remember why this came to be,
and if that issue can be reproduced nowadays.
scripts/pppoe-init-turbolinux.in has also caught my attention, as it only
differs by whitespace and punctuation, and turbolinux having an
underscore in its sysvinit functions:
-- >8 --
diff --git a/scripts/pppoe-init.in b/scripts/pppoe-init-turbolinux.in
index 8314c3e..d35c801 100755
--- a/scripts/pppoe-init.in
+++ b/scripts/pppoe-init-turbolinux.in
@@ -1,16 +1,15 @@
#!/bin/sh
#
-# pppoe This script starts or stops a PPPoE connection
+# pppoe This script starts or stops a PPPoE connection
#
# chkconfig: 2345 99 01
# description: Connects to PPPoE provider
#
# LIC: GPL
#
-# Copyright (C) 2000 Roaring Penguin Software Inc.
-# Copyright (C) 2018 Dianne Skoll
-# This software may be distributed under the terms of the GNU General
-# Public License, version 2 or any later version.
+# Copyright (C) 2000 Roaring Penguin Software Inc. This software may
+# be distributed under the terms of the GNU General Public License, version
+# 2 or any later version.
# Source function library if it exists
test -r /etc/rc.d/init.d/functions && . /etc/rc.d/init.d/functions
@@ -25,29 +24,27 @@ STOP=@sbindir@/pppoe-stop
STATUS=@sbindir@/pppoe-status
case "$1" in
start)
- echo -n "Bringing up PPPoE link"
+ echo -n "Bringing up PPPoE link: "
$START
if [ $? = 0 ] ; then
+ echo success
touch /var/lock/subsys/pppoe
- echo_success
else
- echo_failure
+ echo failure
fi
- echo ""
;;
stop)
- echo -n "Shutting down PPPoE link"
+ echo -n "Shutting down PPPoE link: "
$STOP > /dev/null 2>&1
if [ $? = 0 ] ; then
+ echo success
rm -f /var/lock/subsys/pppoe
- echo_success
else
- echo_failure
+ echo failure
fi
- echo ""
;;
restart)
-- >8 --
I'd propose a patch to either bring it in sync with s/pppoe-init.in or
add some detection logic there, but the turbolinux website[4] is now
just some text announcing acquisition and closure as of 2019.12.31.
Distrowatch lists it as discontinued[5], and its links to turbolinux
support pages and mailing lists all 404. The article on japanese
Wikipedia[6] says the Turbolinux company was sold to konekto.
It looks like the Tubolinux distribution soon will be, or already is,
no more, after 22 years. Bit sad, to be sure,
but it also means turbolinux-specific code can likely be safely removed.
In a similar vein, SUSE uses systemd now[7]. Not sure if other inits are
available at the administrator's discretion, as I'm more of a Debian
lass myself, but the paper makes it sound like that's probably a "no".
Only one warning remains when building a default-with-plugin
configuration: that of the VERSION macro in discovery.c being overriden
by that from pppd; indeed, the Makefile defines the version as
RP_VERSION for plugin.c only, to avoid that very same circumstance
there. Would you accept a patch that changed all VERSIONs to
RP_VERSION, in effect making VERSION mean "pppd version" (if present)
and RP_VERSION "rp-pppoe version" across the entire tree?
Best,
наб
[1]: https://github.com/nabijaczleweli/rp-pppoe/tree/patches/0004-mostly-cosmetic-3.14-BETA-1-v1
[2]: https://www.businesswire.com/news/home/20030610005118/en/Linux-Server-Company-Penguin-Computing-Acquire-Scyld
[3]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=2c2a8c531e953c753b06605c8ad6a9161ca527fa
[4]: http://www.turbolinux.com/
[5]: https://distrowatch.com/turbolinux
[6]: https://ja.wikipedia.org/wiki/Turbolinux#歴史
[7]: https://www.suse.com/media/white-paper/systemd_in_suse_linux_enterprise_12_white_paper.pdf
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://dianne.skoll.ca/pipermail/rp-pppoe/attachments/20200504/95ef37dd/attachment.sig>
More information about the RP-PPPoE
mailing list