debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

* debian/changelog: Update. 

* debian/templates/temp.image.plain/preinst,
  debian/templates/temp.image.plain/templates: Kill reboot warning.

svn path=/dists/trunk/linux-2.6/; revision=10186
This commit is contained in:
Bastian Blank 2008-01-25 08:56:17 +00:00
parent fef0503b3b
commit 145bcd09d1
3 changed files with 3 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -12,6 +12,9 @@ linux-2.6 (2.6.24-1~experimental.1) UNRELEASED; urgency=low
* [amd64, i386]: Enable ACPI_SYSFS_POWER and disable ACPI_PROCFS_POWER.
* [fw] Sync with latest git-ieee1394 for sbp2 fixes.
[ Bastian Blank ]
* Kill reboot warning from old templates.
-- maximilian attems <maks@debian.org> Wed, 23 Jan 2008 11:35:31 +0100
linux-2.6 (2.6.24~rc8-1~experimental.1) experimental; urgency=low

34
debian/templates/temp.image.plain/preinst vendored
View File

@ -88,8 +88,6 @@ my $CONF_LOC = '/etc/kernel-img.conf';
my $relative_links = '';
my $silent_modules = '';
my $silent_loader = '';
my $warn_reboot = 'Yes'; # Warn that we are installing a version of
# the kernel we are running
my $modules_base = '/lib/modules';
@ -129,7 +127,6 @@ if (-r "$CONF_LOC" && -f "$CONF_LOC" ) {
$use_hard_links = '' if /use_hard_links\s*=\s*(no|false|0)\s*$/ig;
$silent_modules = '' if /silent_modules\s*=\s*(no|false|0)\s*$/ig;
$silent_loader = '' if /silent_loader\s*=\s*(no|false|0)\s*$/ig;
$warn_reboot = '' if /warn_reboot\s*=\s*(no|false|0)\s*$/ig;
$minimal_swap = '' if /minimal_swap\s*=\s*(no|false|0)\s*$/ig;
$ignore_depmod_err = '' if /ignore_depmod_err\s*=\s*(no|false|0)\s*$/ig;
$relink_src_link = '' if /relink_src_link\s*=\s*(no|false|0)\s*$/ig;
@ -151,7 +148,6 @@ if (-r "$CONF_LOC" && -f "$CONF_LOC" ) {
$use_hard_links = "Yes" if /use_hard_links\s*=\s*(yes|true|1)\s*$/ig;
$silent_modules = 'Yes' if /silent_modules\s*=\s*(yes|true|1)\s*$/ig;
$silent_loader = 'Yes' if /silent_loader\s*=\s*(yes|true|1)\s*$/ig;
$warn_reboot = 'Yes' if /warn_reboot\s*=\s*(yes|true|1)\s*$/ig;
$minimal_swap = 'Yes' if /minimal_swap\s*=\s*(yes|true|1)\s*$/ig;
$ignore_depmod_err = 'Yes' if /ignore_depmod_err\s*=\s*(yes|true|1)\s*$/ig;
$relink_src_link = 'Yes' if /relink_src_link\s*=\s*(yes|true|1)\s*$/ig;
@ -476,36 +472,6 @@ EOF
}
}
if ( -f "$modules_base/$version/modules.dep" && $warn_reboot) {
my $running = '';
chop($running=`uname -r`);
if ($running eq $version) {
my $note = "${package_name}/preinst/already-running-this-$version";
($ret,$seen) = fset ("$note", 'seen', 'false');
die "Error setting debconf flags in $note: $seen" if $ret;
($ret,$seen) = fset ("$note", 'seen', 'false');
die "Error setting debconf flags in $note: $seen" if $ret;
$ret = subst("$note", 'modules_base', "$modules_base");
die "Error setting debconf substitutions in $note: $seen" if $ret;
$ret = subst("$note", 'running', "$running");
die "Error setting debconf substitutions in $note: $seen" if $ret;
($ret,$seen) = input('critical', "$note");
if ($ret && $ret != 30 ) {
die "Error setting debconf note $note: $seen";
}
($ret,$seen) = go ();
if ($ret && $ret != 30 ) {
die "Error asking debconf question $note: $seen";
}
}
}
# set the env var stem
$ENV{'STEM'} = "=ST";

20
debian/templates/temp.image.plain/templates vendored
View File

@ -144,26 +144,6 @@ Description: Aborting install since modules exist
pertaining to this was not shown, and the default action is to abort
the install. =ST-image-=V aborted.
Template: =ST-image-=V/preinst/already-running-this-=V
Type: note
Description: The kernel version running is the same as the one being installed
You are attempting to install a kernel version that is the same as
the version you are currently running (version ${running}). The modules
list is quite likely to have been changed, and the modules dependency
file ${modules_base}/=V/modules.dep needs to be re-built. It can
not be built correctly right now, since the module list for the
running kernel are likely to be different from the kernel installed.
I am creating a new modules.dep file, but that may not be
correct. It shall be regenerated correctly at next reboot.
.
I repeat: you have to reboot in order for the modules file to be
created correctly. Until you reboot, it may be impossible to load
some modules. Reboot as soon as this install is finished (Do not
reboot right now, since you may not be able to boot back up until
installation is over, but boot immediately after). I can not stress
that too much. You need to reboot soon.
Template: =ST-image-=V/postinst/create-kimage-link-=V
Type: boolean
Default: true