Browse Source

* Convert to po-debconf, set Build-Depends: debhelper (>= 4.1.13)

to ensure that generated templates are right, and set output encoding
    to UTF-8.
  * Update debian/rules to call po2debconf instead of debconf-mergetemplate.
  * Add debian/netcfg-common.templates, debian/netcfg-dhcp.templates
    and debian/netcfg-static.templates, and remove debian/template/

r1107
master
Denis Barbier 21 years ago
parent
commit
2e55502036
  1. 4
      debian/changelog
  2. 2
      debian/control
  3. 57
      debian/netcfg-common.templates
  4. 27
      debian/netcfg-dhcp.templates
  5. 51
      debian/netcfg-static.templates
  6. 16
      debian/rules

4
debian/changelog

@ -6,6 +6,10 @@ netcfg (0.16) unstable; urgency=low
* kraai: canonicalize ethdetect description capitalization
* waldi: add s390 network types
* kraai: fix handling of empty DHCP hostname
* Convert to po-debconf, set Build-Depends: debhelper (>= 4.1.13)
to ensure that generated templates are right, and set output encoding
to UTF-8. Update debian/rules to call po2debconf instead of
debconf-mergetemplate.
-- Bastian Blank <waldi@debian.org> Thu, 10 Oct 2002 15:48:35 +0000

2
debian/control

@ -3,7 +3,7 @@ Section: debian-installer
Priority: standard
Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
Uploaders: David Kimdon <dwhedon@debian.org>, Tollef Fog Heen <tfheen@debian.org>
Build-Depends: debhelper (>= 2.1.18), dpkg-dev (>= 1.9.0), libcdebconf-dev, libdebian-installer1-dev
Build-Depends: debhelper (>= 4.1.13), dpkg-dev (>= 1.9.0), libcdebconf-dev, libdebian-installer1-dev, po-debconf (>= 0.5.0)
Standards-Version: 3.1.1
Package: netcfg-dhcp

57
debian/netcfg-common.templates

@ -0,0 +1,57 @@
Template: netcfg/get_domain
Type: string
_Description: Choose the domain name.
The domain name is the part of your Internet address to the right of your
host name. It is often something that ends in .com, .net, .edu, or .org.
If you are setting up a home network, you can make something up, but make
sure you use the same domain name on all your computers.
Template: netcfg/get_nameservers
Type: string
_Description: Choose the DNS Server Addresses
Please enter the IP addresses (not host names) of up to 3 name servers,
separated by spaces. Do not use commas. The servers will be queried in the
order in which you enter them. If you don't want to use any name servers
just leave this field blank.
Template: netcfg/choose_interface
Type: select
Choices: ${ifchoices}
_Description: Choose an interface.
The following interfaces were detected. Choose the type of your primary
network interface that you will need for installing the Debian system (via
NFS or HTTP).
Template: netcfg/error_cfg
Type: note
_Description: An error occured.
Something went wrong when I tried to activate your network.
Template: netcfg/get_hostname
Type: string
Default: debian
_Description: Enter the system's hostname.
The hostname is a single word that identifies your system to the network.
If you don't know what your hostname should be, consult your network
administrator. If you are setting up your own home network, you can make
something up here.
Template: netcfg/invalid_hostname
Type: note
_Description: The hostname "${hostname}" is invalid.
A valid hostname may contain only alphanumeric characters and the minus
sign, be between 2 and 63 characters long, and cannot begin or end with a
minus sign.
Template: netcfg/error
Type: note
_Description: An error occured and I cannot continue.
Feel free to retry.
Template: netcfg/no_interfaces
Type: note
_Description: No interfaces were detected.
No network interfaces were found. That means that the installation
system was unable to find a network device. If you do have a network
card, then it is possible that the module for it hasn't been selected
yet. Go back to 'Configure network hardware'.

27
debian/netcfg-dhcp.templates

@ -0,0 +1,27 @@
Template: netcfg/dhcp_hostname
Type: string
_Description: What is your dhcp hostname?
In some situations, you may need to supply a DHCP host name. These
situations are rare. Most commonly, it applies to cable modem users. If
you are a cable modem user, you might need to specify an account number
here. Otherwise, you can just leave this blank.
Template: netcfg/confirm_dhcp
Type: boolean
Default: true
_Description: Is this information correct?
interface = ${interface}
hostname = ${hostname}
domain = ${domain}
dhcp hostname = ${dhcp_hostname}
nameservers = ${nameservers}
Template: netcfg/do_dhcp
Type: note
_Description: I will now configure the network.
This may take some time. It shouldn't take more than a minute or two.
Template: netcfg/no_dhcp_client
Type: note
_Description: No dhcp client found. I cannot continue.
This package requires pump or dhcp-client.

51
debian/netcfg-static.templates

@ -0,0 +1,51 @@
Template: netcfg/get_ipaddress
Type: string
_Description: IP address?
The IP address is unique to your computer and consists of four numbers
separated by periods. If you don't know what to use here, consult your
network administrator.
Template: netcfg/get_pointopoint
Type: string
_Description: Pointopoint address?
The pointopoint address is used to determine the other endpoint of the
point to point network. Consult your network administrator if you do not
know the value. The pointopoint address should be entered as four numbers
separated by periods.
Template: netcfg/get_netmask
Type: string
_Description: Netmask?
The netmask is used to determine which machines are local to your
network. Consult your network administrator if you do not know the
value. The netmask should be entered as four numbers separated by
periods.
Template: netcfg/get_gateway
Type: string
_Description: Gateway?
This is an IP address (four numbers separated by periods) that indicates
the gateway router, also known as the default router. All traffic that
goes outside your LAN (for instance, to the Internet) is sent through this
router. In rare circumstances, you may have no router; in that case, you
can leave this blank. If you don't know the proper answer to this
question, consult your network administrator.
Template: netcfg/gateway_unreachable
Type: note
_Description: The gateway you entered is unreachable.
You may have made an error entering your ipaddress, netmask and/or
gateway.
Template: netcfg/confirm_static
Type: boolean
Default: true
_Description: Is this configuration correct?
interface = ${interface}
hostname = ${hostname}
domain = ${domain}
ipaddress = ${ipaddress}
netmask = ${netmask}
gateway = ${gateway}
pointopoint = ${pointopoint}
nameservers = ${nameservers}

16
debian/rules

@ -35,9 +35,6 @@ clean:
dh_testroot
rm -f build-stamp configure-stamp
rm -f debian/netcfg-dhcp.postinst debian/netcfg-static.postinst
for TYPE in common dhcp static ; do \
rm -f debian/netcfg-$$TYPE.templates; \
done;
# Add here commands to clean up after the build process.
-$(MAKE) clean
@ -62,20 +59,11 @@ binary-arch: build install
dh_testdir
dh_testroot
for TYPE in common dhcp static ; do \
TEMPLATES=""; \
for LINGUA in en da de ru fr ; do \
TEMPLATES="$$TEMPLATES debian/template/netcfg-$$TYPE.templates.$$LINGUA" ; \
done ; \
echo "Creating netcfg-$$TYPE.templates -- $$TEMPLATES "; \
debconf-mergetemplate $$TEMPLATES > debian/netcfg-$$TYPE.templates; \
done ;
dh_installdebconf
(echo ; cat debian/netcfg-common.templates ) \
(echo ; po2debconf debian/netcfg-common.templates ) \
>> debian/netcfg-static/DEBIAN/templates
(echo ; cat debian/netcfg-common.templates )\
(echo ; po2debconf debian/netcfg-common.templates )\
>> debian/netcfg-dhcp/DEBIAN/templates
cp debian/menutest-common debian/netcfg-dhcp/DEBIAN/menutest
cp debian/menutest-common debian/netcfg-static/DEBIAN/menutest

Loading…
Cancel
Save