Bug#311870: base-config: reduce amount of Debian branding in templates
Package: base-config
Version: 2.64
Severity: wishlist
Tags: patch
The attached patch reduces the number of explicit mentions of Debian in
base-config's templates, in an attempt to reduce somewhat the size of
the patch that derived distributions need to carry around. It's
moderately intrusive and the wording certainly needs to be reviewed, so
I didn't want to commit it directly!
I haven't yet managed to work out what to do with mirror/suite,
apt-setup/non-free, apt-setup/contrib, or base-config/login. The first
three may be intractable, and removing the distribution name from the
last one kind of seems like a shame. Maybe there's a case for a careful
SUBST here (after checking how translations would work).
Thanks,
--
Colin Watson [cjwatson@debian.org]
Index: apt-setup
===================================================================
--- apt-setup (revision 1552)
+++ apt-setup (working copy)
@@ -37,6 +37,9 @@
APTGET="$APTGET -o Acquire::gpgv::Options::=--ignore-time-conflict"
APTCDROM="$APTCDROM -o Acquire::gpgv::Options::=--ignore-time-conflict"
+# Hostname that serves security updates
+SECURITY_HOST=security.debian.org
+
# Clear the screen if we're on a tty, but don't fail if we're not.
clear_screen () {
clear >/dev/tty </dev/tty 2>/dev/null || true
@@ -749,7 +752,7 @@
# * adding it when the user has not: don't include those
if apt-cache policy | grep "o=Debian,a=" | grep -qv 'a=unstable' && \
- ! grep -q '^[^#]*security.debian.org' ${APTETC}sources.list; then
+ ! grep -q "^[^#]*$SECURITY_HOST" ${APTETC}sources.list; then
# Figure out what line to add (we're definitely going to add something,
# even if it's just a comment).
#
@@ -769,11 +772,12 @@
SUITE="stable"
fi
- LINE="http://security.debian.org/ $SUITE/updates $DISTS"
+ LINE="http://$SECURITY_HOST/ $SUITE/updates $DISTS"
COMMENT="# "
# Now ask if they want the entry to be added.
+ db_subst apt-setup/security-updates SECURITY_HOST "$SECURITY_HOST"
db_input medium apt-setup/security-updates || true
db_go || true
db_fset apt-setup/security-updates seen false
@@ -803,6 +807,7 @@
# TODO should loop and re-ask for http proxy if the
# user just entered one, in case it was bad.
clear_screen
+ db_subst apt-setup/security-updates-failed SECURITY_HOST "$SECURITY_HOST"
db_subst apt-setup/security-updates-failed apt_error `tr '\n' ' ' < $tempfile`
db_input critical apt-setup/security-updates-failed || true
db_go || true
@@ -828,7 +833,7 @@
# Now add the entry, commented out or not. (Don't add the commented
# version if a commented version already exists.)
- if [ -z "$COMMENT" ] || ! grep -q '#.*security.debian.org' ${APTETC}sources.list; then
+ if [ -z "$COMMENT" ] || ! grep -q "#.*$SECURITY_HOST" ${APTETC}sources.list; then
echo "" >>${APTETC}sources.list
echo "${COMMENT}deb $LINE" >>${APTETC}sources.list
fi
Index: debian/templates
===================================================================
--- debian/templates (revision 1551)
+++ debian/templates (working copy)
@@ -1,6 +1,6 @@
Template: base-config/title
Type: title
-_Description: Debian base system configuration
+_Description: Base system configuration
Template: base-config/main-menu
Type: select
@@ -10,11 +10,11 @@
Template: base-config/intro
Type: note
-_Description: Welcome to your new Debian system!
+_Description: Welcome to your newly installed system!
This program will now walk you through the process of setting up your
newly installed system. It will start with the basics -- time zone
selection, setting a root password and adding a user, and then progress to
- installing additional software to tune this new Debian system to your
+ installing additional software to tune this new system to your
needs.
Template: base-config/use-ppp
Index: apt-setup.templates
===================================================================
--- apt-setup.templates (revision 1551)
+++ apt-setup.templates (working copy)
@@ -28,11 +28,11 @@
_Choices: cdrom, http, ftp, filesystem, edit sources list by hand
Default: cdrom
_Description: Archive access method for apt:
- Please choose the method apt (the Debian package management tool)
- should use to access the Debian archive.
+ Please choose the method that apt (the package management tool)
+ should use to access the package archive.
.
- For example if you have a Debian cd, select "cdrom", while if
- you plan to install via a Debian mirror, choose "ftp" or "http".
+ For example if you have an installation CD, select "cdrom", while if
+ you plan to install from a mirror on the network, choose "ftp" or "http".
.
${note}
@@ -50,20 +50,20 @@
Type: select
Choices: ${mirrors}
Default: http.us.debian.org
-_Description: Choose the Debian mirror to use:
- Select the Debian mirror apt should use. You should select a mirror that
+_Description: Choose the mirror to use:
+ Select the mirror that apt should use. You should select a mirror that
is close to you on the net.
Template: apt-setup/hostname
Type: string
_Description: Mirror hostname:
- Enter the hostname of the mirror from which Debian will be downloaded.
+ Enter the hostname of the mirror from which packages will be downloaded.
Template: apt-setup/directory
Type: string
Default: /debian
_Description: Mirror directory:
- Enter the directory in which the Debian mirror is located.
+ Enter the directory in which the mirror is located.
Template: apt-setup/baddir
Type: note
@@ -74,7 +74,7 @@
Type: note
_Description: Mirror not found
The directory you entered does not contain a subdirectory named "dists",
- so it doesn't seem to be a Debian mirror.
+ so it doesn't seem to be a package mirror.
Template: apt-setup/cd/missing
Type: note
@@ -90,19 +90,19 @@
This program was unable to auto-detect a CD-ROM drive, or there is no
usable CD in the drive.
.
- Enter the device file to use to access your CD-ROM, and place a
- Debian CD in the drive.
+ Enter the device file to use to access your CD-ROM, and place an
+ installation CD in the drive.
Template: apt-setup/cd/bad
Type: note
-_Description: Non-Debian CD-ROM detected
- The CD-ROM drive contains a non-Debian CD.
+_Description: Incorrect CD-ROM detected
+ The CD-ROM drive contains a CD which cannot be used for installation.
Template: apt-setup/cd/another
Type: boolean
Default: false
_Description: Scan another CD?
- If you have another Debian CD (for example, the second in a two CD set),
+ If you have another installation CD (for example, the second in a two CD set),
you should insert and scan it now.
Template: apt-setup/non-free
@@ -129,9 +129,9 @@
Template: apt-setup/badsource
Type: note
-_Description: Failed to access the Debian archive
- While trying to access the debian archive using the information you
- provided, the Debian package management tool, apt, returned the
+_Description: Failed to access the package archive
+ While trying to access the archive using the information you
+ provided, the package management tool, apt, returned the
following error. The questions will be asked again.
.
${apt_error}
@@ -157,20 +157,19 @@
Template: apt-setup/security-updates
Type: boolean
Default: true
-_Description: Use security updates from security.debian.org?
- Debian provides timely security updates via the website
- security.debian.org. These updates may be tracked each time
- you upgrade your system. If you have a connection to the
- Internet, this is generally a good idea.
+_Description: Use security updates from ${SECURITY_HOST}?
+ Timely security updates are available via the website ${SECURITY_HOST}.
+ These updates may be tracked each time you upgrade your system.
+ If you have a connection to the Internet, this is generally a good idea.
Template: apt-setup/security-updates-failed
Type: note
_Description: Cannot access security updates
- The security updates on security.debian.org couldn't be accessed, so those
+ The security updates on ${SECURITY_HOST} couldn't be accessed, so those
updates will not be made available to you at this time. You may want to
investigate this later.
.
- Commented out entries for security.debian.org
+ Commented out entries for ${SECURITY_HOST}
have been added to the bottom of the /etc/apt/sources.list file.
.
The error message returned by apt:
Reply to: