[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[RFR] templates://linux-2.6/{linux-base.templates,templates/temp.image.plain/templates}



Please find, for review, the debconf templates for the linux-2.6 source package.

(I didn't review the package description)

This is a quite important review as some of these strings are likely
to appear during the system install. Some other will also appear
during kernel upgrades and, I guess, particularly for lenny->squeeze
upgrades.

I agreed with the Kernel Team for us to do a review of these changes.

Please note that, to cope with the specific layout of the debian/
directory in this package, I temporarily used a copy of
templates/temp.image.plain/templates, named
debian/temp.templates. That was meant for me to be able to use my
usual scripts..:-)

This review will last from Wednesday, March 31, 2010 to Saturday, April 10, 2010.

Please send reviews as unified diffs (diff -u) against the original
files. Comments about your proposed changes will be appreciated.

Your review should be sent as an answer to this mail.

When appropriate, I will send intermediate requests for review, with
"[RFRn]" (n>=2) as a subject tag.

When we will reach a consensus, I send a "Last Chance For
Comments" mail with "[LCFC]" as a subject tag.

Finally, the reviewed templates will be sent to the package maintainer
as a bug report, and a mail will be sent to this list with "[BTS]" as
a subject tag.

Rationale:
--- linux-2.6.old/debian/linux-base.templates	2010-03-31 07:33:05.952958142 +0200
+++ linux-2.6/debian/linux-base.templates	2010-03-31 07:39:33.688998875 +0200
@@ -1,20 +1,23 @@
 Template: linux-base/disk-id-convert-auto
 Type: boolean
 Default: true
-_Description: Update disk device ids in system configuration?
+_Description: Update disk device IDs in system configuration?
  The new Linux kernel version provides different drivers for some
- PATA (IDE) controllers.  The names of some hard disk, CD-ROM and
+ PATA (IDE) controllers. The names of some hard disk, CD-ROM and
  tape devices may change.
  .
- You are recommended to identify disk devices in configuration files
+ It is now recommended to identify disk devices in configuration files
  by label or UUID (unique identifier) rather than by device name,
- which will work with both old and new kernel versions.  Your system
- configuration can be updated automatically in most cases.
+ which will work with both old and new kernel versions.
+ .
+ The system configuration can be updated automatically in most cases.
+ Please choose whether you want this action to be performed.

I feel like "ID" is more appropriate than lowercas "id" as acronyms
are generally using uppercase. However, the current practice and
existing documentation may lead to keep "id".

That said, I'm dropping a double space after full stop, which is
something we try to get rid of, during such review.

Turning "You are recommended" to "It is now recommended". Passive form
being more usual in such case, I think. Also "now" as this was not
necessarily recommended in the past..:)

Split to another paragraph the statement that the system may be
automatically updated and confirm what's expected from the user.

 
 Template: linux-base/disk-id-convert-plan
 Type: boolean
 Default: true
-_Description: Apply these configuration changes to disk device ids?
+#flag:translate!:3,5,7
+_Description: Apply configuration changes to disk device IDs?
  These devices will be assigned UUIDs or labels:
  .
  ${relabel}
@@ -23,14 +26,15 @@
  .
  ${files}
  .
- The device ids will be changed as follows:
+ The device IDs will be changed as follows:
  .
  ${id_map}

Mark variable-only strings as non translatable

 
 Template: linux-base/disk-id-convert-plan-no-relabel
 Type: boolean
 Default: true
-_Description: Apply these configuration changes to disk device ids?
+#flag:translate!:3,5
+_Description: Apply these configuration changes to disk device IDs?
  These configuration files will be updated:
  .
  ${files}

Ditto


@@ -40,21 +44,23 @@
  ${id_map}
 
 Template: linux-base/disk-id-manual
-Type: note
-_Description: Please check these configuration files before rebooting
- These configuration files still use some device names that may
+Type: error
+#flag:translate!:3
+_Description: Configuration files still contain deprecated device names
+ The following configuration files still use some device names that may
  change when using the new kernel:
  .
  ${unconverted}

I think that the "error" type is more likely to properly bring the
user's attention.

Turn the synopsis from a sentence to a "title".

Device names are deprecated, right? So, just say it....imho more directive.

 
 Template: linux-base/disk-id-manual-boot-loader
-Type: note
-_Description: Check the boot loader configuration before rebooting
- The boot loader configuration for this system was not recognised.  These
+Type: error
+_Description: Boot loader configuration check needed
+ The boot loader configuration for this system was not recognised. These
  settings in the configuration may need to be updated:
  .
-  * The root device id passed as a kernel parameter
-  * The boot device id used to install and update the boot loader
+  * The root device ID passed as a kernel parameter;
+  * The boot device ID used to install and update the boot loader.
  .
- We recommend that you identify these devices by UUID or label, except that
- on MIPS systems this is not supported for the root device.
+ You should identify these devices by UUID or label, with the
+ noticeable exception of the root device for MIPS systems.
+

Another note turned into "error" and a synopsis turned as a title for
it

Drop double space

Add punctuation

Drop the use of first person. Rewrite the last sentence that looks
awkward to me (Germish? :-))

-- 



Template: linux-base/disk-id-convert-auto
Type: boolean
Default: true
_Description: Update disk device IDs in system configuration?
 The new Linux kernel version provides different drivers for some
 PATA (IDE) controllers. The names of some hard disk, CD-ROM and
 tape devices may change.
 .
 It is now recommended to identify disk devices in configuration files
 by label or UUID (unique identifier) rather than by device name,
 which will work with both old and new kernel versions.
 .
 The system configuration can be updated automatically in most cases.
 Please choose whether you want this action to be performed.

Template: linux-base/disk-id-convert-plan
Type: boolean
Default: true
#flag:translate!:3,5,7
_Description: Apply configuration changes to disk device IDs?
 These devices will be assigned UUIDs or labels:
 .
 ${relabel}
 .
 These configuration files will be updated:
 .
 ${files}
 .
 The device IDs will be changed as follows:
 .
 ${id_map}

Template: linux-base/disk-id-convert-plan-no-relabel
Type: boolean
Default: true
#flag:translate!:3,5
_Description: Apply these configuration changes to disk device IDs?
 These configuration files will be updated:
 .
 ${files}
 .
 The device ids will be changed as follows:
 .
 ${id_map}

Template: linux-base/disk-id-manual
Type: error
#flag:translate!:3
_Description: Configuration files still contain deprecated device names
 The following configuration files still use some device names that may
 change when using the new kernel:
 .
 ${unconverted}

Template: linux-base/disk-id-manual-boot-loader
Type: error
_Description: Boot loader configuration check needed
 The boot loader configuration for this system was not recognised. These
 settings in the configuration may need to be updated:
 .
  * The root device ID passed as a kernel parameter;
  * The boot device ID used to install and update the boot loader.
 .
 You should identify these devices by UUID or label, with the
 noticeable exception of the root device for MIPS systems.

Template: =ST-image-=V/postinst/depmod-error-initrd-=V
Type: boolean
Default: false
_Description: Abort installation after depmod error?
 The 'depmod' command exited with the exit code ${exit_value}
 (${SIGNAL}${CORE}).
 .
 Since this image uses initrd, the ${modules_base}/=V/modules.dep file
 will not be deleted, even though it may be invalid.
 .
 You should abort the installation and fix the
 errors in depmod, or regenerate the initrd image with a known good
 modules.dep file. If you don't abort the installation, there is
 a danger that the system will fail to boot.

Template: shared/kernel-image/really-run-bootloader
Type: boolean
Default: true
_Description: Run the default boot loader?
 The default boot loader for this architecture is $loader, which is
 present.
 .
 However, there is no explicit request to run that boot loader in
 /etc/kernel-img.conf while GRUB seems to be installed with
 a postinst hook set.
 .
 It thus seems that this system is using GRUB as
 boot loader instead of $loader.
 .
 Please choose which should run: the default boot loader now, or the
 GRUB update later.

Template: =ST-image-=V/postinst/bootloader-test-error-=V
Type: note
_Description: Error running the boot loader in test mode
 An error occurred while running the ${loader} boot loader in test mode.
 .
 A log is available in ${temp_file_name}. Please edit /etc/${loader}.conf
 manually and re-run ${loader} to fix that issue and keep this system
 bootable.

Template: =ST-image-=V/postinst/bootloader-error-=V
Type: note
_Description: Error running the boot loader
 An error occurred while running the ${loader} boot loader.
 .
 A log is available in ${temp_file_name}. Please edit /etc/${loader}.conf
 manually and re-run ${loader} to fix that issue and keep this system
 bootable.

Template: =ST-image-=V/prerm/removing-running-kernel-=V
Type: boolean
Default: true
_Description: Abort kernel removal?
 You are running a kernel (version ${running}) and attempting to remove
 the same version.
 .
 This can make the system unbootable as it will remove
 /boot/vmlinuz-${running} and all modules under the directory
 /lib/modules/${running}. This can only be fixed with a copy of the
 kernel image and the corresponding modules.
 .
 It is highly recommended to abort the kernel removal unless you are
 prepared to fix the system after removal.

Template: =ST-image-=V/prerm/would-invalidate-boot-loader-=V
Type: boolean
Default: true
_Description: Abort kernel removal?
 This system uses a valid /etc/${loader}.conf file that mentions
 ${kimage}-=V. Removing =ST-image-=V will invalidate
 that file.
 .
 You will need to edit /etc/${loader}.conf or re-target
 symbolic links mentioned there (typically, /vmlinuz and /vmlinuz.old)
 to not refer to ${kimage}-=V. Then, you will have to re-run ${loader}.
 .
 It is highly recommended to abort the kernel removal unless you are
 prepared to fix the system after removal.

Template: =ST-image-=V/postinst/missing-firmware-=V
Type: note
_Description: Required firmware files may be missing
 This system is currently running Linux ${runningversion} and you are
 installing Linux ${version}.  In the new version some of the drivers
 used on this system may require additional firmware files:
 .
 ${missing}
 .
 Most firmware files are not included in the Debian system because
 no source code is available for them.  You may need to reconfigure
 the package manager to include the non-free section of the Debian
 archive before you can install these firmware files.
--- linux-2.6.old/debian/linux-base.templates	2010-03-31 07:33:05.952958142 +0200
+++ linux-2.6/debian/linux-base.templates	2010-03-31 07:39:33.688998875 +0200
@@ -1,20 +1,23 @@
 Template: linux-base/disk-id-convert-auto
 Type: boolean
 Default: true
-_Description: Update disk device ids in system configuration?
+_Description: Update disk device IDs in system configuration?
  The new Linux kernel version provides different drivers for some
- PATA (IDE) controllers.  The names of some hard disk, CD-ROM and
+ PATA (IDE) controllers. The names of some hard disk, CD-ROM and
  tape devices may change.
  .
- You are recommended to identify disk devices in configuration files
+ It is now recommended to identify disk devices in configuration files
  by label or UUID (unique identifier) rather than by device name,
- which will work with both old and new kernel versions.  Your system
- configuration can be updated automatically in most cases.
+ which will work with both old and new kernel versions.
+ .
+ The system configuration can be updated automatically in most cases.
+ Please choose whether you want this action to be performed.
 
 Template: linux-base/disk-id-convert-plan
 Type: boolean
 Default: true
-_Description: Apply these configuration changes to disk device ids?
+#flag:translate!:3,5,7
+_Description: Apply configuration changes to disk device IDs?
  These devices will be assigned UUIDs or labels:
  .
  ${relabel}
@@ -23,14 +26,15 @@
  .
  ${files}
  .
- The device ids will be changed as follows:
+ The device IDs will be changed as follows:
  .
  ${id_map}
 
 Template: linux-base/disk-id-convert-plan-no-relabel
 Type: boolean
 Default: true
-_Description: Apply these configuration changes to disk device ids?
+#flag:translate!:3,5
+_Description: Apply these configuration changes to disk device IDs?
  These configuration files will be updated:
  .
  ${files}
@@ -40,21 +44,23 @@
  ${id_map}
 
 Template: linux-base/disk-id-manual
-Type: note
-_Description: Please check these configuration files before rebooting
- These configuration files still use some device names that may
+Type: error
+#flag:translate!:3
+_Description: Configuration files still contain deprecated device names
+ The following configuration files still use some device names that may
  change when using the new kernel:
  .
  ${unconverted}
 
 Template: linux-base/disk-id-manual-boot-loader
-Type: note
-_Description: Check the boot loader configuration before rebooting
- The boot loader configuration for this system was not recognised.  These
+Type: error
+_Description: Boot loader configuration check needed
+ The boot loader configuration for this system was not recognised. These
  settings in the configuration may need to be updated:
  .
-  * The root device id passed as a kernel parameter
-  * The boot device id used to install and update the boot loader
+  * The root device ID passed as a kernel parameter;
+  * The boot device ID used to install and update the boot loader.
  .
- We recommend that you identify these devices by UUID or label, except that
- on MIPS systems this is not supported for the root device.
+ You should identify these devices by UUID or label, with the
+ noticeable exception of the root device for MIPS systems.
+

Attachment: signature.asc
Description: Digital signature


Reply to: