Package: ppp
Tags: patch d-i
Severity: important
Hello,
Attached is a patch that closes a few open issues with the ppp-udeb.
The most important are #402450 (not bringing up the interface after
install and not saving a correspondent section in the target
/etc/network/interfaces) and the handling of bad login information
being typed.
Here is the changelog:
+ [ Eddy Petrișor ]
+ * added ${misc:Depends} to ppp-udeb
+ * removed debconf as a dependency of ppp-udeb since such a package does not
+ exist in d-i environment
+ * ppp-udeb: the interface is now raised in the installed system
+ (Closes: #402450)
+ * ppp-udeb: loopback interface snippet is added too, to make sure we have it
+ in the installed system
+ * ppp-udeb: added error handling if the wrong login info is sent or other
+ error is returned while calling the provider
+ * Added myself to Uploades with maintainer's consent.
Issues still open:
- hostname is not set (I think I can force netcfg to run the mandatory
steps, but I didn't had the time to do it during the winter holidays)
and does not yet blend well with netcfg
- finish-install.d was not working at some point in the past, but the
current situation is uncertain
Note that, in spite of the present issues, this release does not bring
any regressions, on the contrary, it just fixes existing issues.
--
Regards,
EddyP
=============================================
"Imagination is more important than knowledge" A.Einstein
diff -ruN official/ppp-2.4.4rel/debian/changelog ppp-eddyp-dev/ppp-2.4.4rel/debian/changelog
--- official/ppp-2.4.4rel/debian/changelog 2007-01-09 19:47:49.000000000 +0200
+++ ppp-eddyp-dev/ppp-2.4.4rel/debian/changelog 2007-01-09 19:43:02.000000000 +0200
@@ -1,3 +1,19 @@
+ppp (2.4.4rel-5) unstable; urgency=low
+
+ [ Eddy PetriÈor ]
+ * added ${misc:Depends} to ppp-udeb
+ * removed debconf as a dependency of ppp-udeb since such a package does not
+ exist in d-i environment
+ * ppp-udeb: the interface is now raised in the installed system
+ (Closes: #402450)
+ * ppp-udeb: loopback interface snippet is added too, to make sure we have it
+ in the installed system
+ * ppp-udeb: added error handling if the wrong login info is sent or other
+ error is returned while calling the provider
+ * Added myself to Uploades with maintainer's consent.
+
+ -- Eddy PetriÈor <[EMAIL PROTECTED]> Sat, 23 Dec 2006 15:27:43 +0200
+
ppp (2.4.4rel-4.1) unstable; urgency=low
* Non-maintainer upload with maintainer's consent.
diff -ruN official/ppp-2.4.4rel/debian/control ppp-eddyp-dev/ppp-2.4.4rel/debian/control
--- official/ppp-2.4.4rel/debian/control 2007-01-09 19:47:49.000000000 +0200
+++ ppp-eddyp-dev/ppp-2.4.4rel/debian/control 2007-01-09 19:43:02.000000000 +0200
@@ -2,6 +2,7 @@
Section: admin
Priority: optional
Maintainer: Marco d'Itri <[EMAIL PROTECTED]>
+Uploaders: Eddy PetriÈor <[EMAIL PROTECTED]>
Build-Depends: debhelper (>> 4.1.17), libpcap0.8-dev, libpam0g-dev, zlib1g-dev
Standards-Version: 3.7.2.2
@@ -24,7 +25,7 @@
XC-Package-Type: udeb
Section: debian-installer
Architecture: any
-Depends: ${shlibs:Depends}, ethernet-card-detection, ppp-modules, di-utils, debconf
+Depends: ${shlibs:Depends}, ${misc:Depends}, ethernet-card-detection, ppp-modules, di-utils
Provides: configured-network
XB-Installer-Menu-Item: 17
Description: Point-to-Point Protocol (PPP) daemon
diff -ruN official/ppp-2.4.4rel/debian/ppp-udeb.postinst ppp-eddyp-dev/ppp-2.4.4rel/debian/ppp-udeb.postinst
--- official/ppp-2.4.4rel/debian/ppp-udeb.postinst 2007-01-09 19:47:49.000000000 +0200
+++ ppp-eddyp-dev/ppp-2.4.4rel/debian/ppp-udeb.postinst 2007-01-09 19:43:02.000000000 +0200
@@ -207,7 +207,20 @@
log-output -t depmod
log-output -t ppp-udeb modprobe pppoe
-log-output -t ppp-udeb pppd call provider || true
+RET=
+log-output -t ppp-udeb pppd call provider || RET=$?
+
+if [ 0$RET -eq 19 ]; then
+ fail "wrong login info detected"
+ db_input critical ppp/wrong_login || true
+ db_go || true
+ exit 1
+elif [ 0$RET -ge 1 ]; then
+ fail "unhandled error detected"
+ db_input critical ppp/unhanled || true
+ db_go || true
+ exit 1
+fi
log-output apt-install ppp || true
diff -ruN official/ppp-2.4.4rel/debian/ppp-udeb.templates ppp-eddyp-dev/ppp-2.4.4rel/debian/ppp-udeb.templates
--- official/ppp-2.4.4rel/debian/ppp-udeb.templates 2007-01-09 19:47:49.000000000 +0200
+++ ppp-eddyp-dev/ppp-2.4.4rel/debian/ppp-udeb.templates 2007-01-09 19:43:02.000000000 +0200
@@ -47,3 +47,24 @@
Template: ppp/detect_progress
Type: progress
_Description: Searching for concentrators on ${IFACE}...
+
+Template: ppp/wrong_login
+Type: error
+_Description: Failed authentication
+ A PPPoE connection was attempted, but the provided login information was
+ incorrect. Because of this the authentication failed.
+ .
+ Please make sure you type the correct username and password.
+ .
+ The configuration of PPPoE is aborted. It can be attempted again by
+ selecting the relevant menu entry.
+
+Template: ppp/unhanled
+Type: error
+_Description: Unhandled error
+ It seems that the attempt to create a connection resulted in an unhandled
+ error. Probably there is some exceptional situation which prevents
+ establishing the connection.
+ .
+ The configuration of PPPoE is aborted. It can be attempted again by
+ selecting the relevant menu entry.
diff -ruN official/ppp-2.4.4rel/debian/ppp-udeb.todo ppp-eddyp-dev/ppp-2.4.4rel/debian/ppp-udeb.todo
--- official/ppp-2.4.4rel/debian/ppp-udeb.todo 2007-01-09 19:47:49.000000000 +0200
+++ ppp-eddyp-dev/ppp-2.4.4rel/debian/ppp-udeb.todo 2007-01-09 20:00:31.000000000 +0200
@@ -1,4 +1,3 @@
-- wrong authentication must be treated, not ignored
- how to blend well with netcfg?
- the new patch proposes assigning menu order 17 to ppp-udeb, so
is ran before netcfg
diff -ruN official/ppp-2.4.4rel/extra/50config-target-ppp ppp-eddyp-dev/ppp-2.4.4rel/extra/50config-target-ppp
--- official/ppp-2.4.4rel/extra/50config-target-ppp 2007-01-09 19:47:49.000000000 +0200
+++ ppp-eddyp-dev/ppp-2.4.4rel/extra/50config-target-ppp 2007-01-09 19:43:02.000000000 +0200
@@ -1,6 +1,28 @@
#!/bin/sh -e
# Copy the ppp configuration to the target system.
+. /usr/share/debconf/confmodule
+
mkdir -p /target/etc/ppp
cp /etc/ppp/*-secrets /target/etc/ppp/
cp -a /etc/ppp/peers /target/etc/ppp/
+
+db_get ppp/interface
+ETH="$RET"
+mkdir -p /target/etc/network/
+# FIXME: lo snippet should not be ppp-udeb's job
+cat >> /target/etc/network/interfaces <<EOPPP
+
+# PPPoE configuration
+# added by Debian Installer
+auto lo
+iface lo inet loopback
+
+auto provider
+iface provider inet ppp
+ pre-up /sbin/ifconfig $ETH up
+ provider provider
+# end of PPPoE configuration
+
+EOPPP
+
