summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--perl-install/any.pm2
-rw-r--r--perl-install/bootloader.pm4
-rw-r--r--perl-install/diskdrake/hd_gtk.pm2
-rw-r--r--perl-install/diskdrake/interactive.pm2
-rw-r--r--perl-install/fs.pm20
-rw-r--r--perl-install/fsedit.pm22
-rw-r--r--perl-install/install2.pm7
-rw-r--r--perl-install/install_any.pm6
-rw-r--r--perl-install/install_interactive.pm6
-rw-r--r--perl-install/install_steps.pm8
-rw-r--r--perl-install/install_steps_interactive.pm4
-rw-r--r--perl-install/loopback.pm2
-rw-r--r--perl-install/lvm.pm2
-rw-r--r--perl-install/network/drakfirewall.pm2
-rw-r--r--perl-install/network/ethernet.pm2
-rw-r--r--perl-install/partition_table.pm10
-rw-r--r--perl-install/partition_table/raw.pm2
-rw-r--r--perl-install/raid.pm4
18 files changed, 54 insertions, 53 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index db555585e..f5299bb9e 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -111,7 +111,7 @@ because XFS needs a very large driver).") : ''))) or return;
}
my $floppy_dev;
- my @l = detect_devices::floppies_dev() or die N("Sorry, no floppy drive available");
+ my @l = detect_devices::floppies_dev() or die \N("Sorry, no floppy drive available");
my %l = (
'fd0' => N("First floppy drive"),
'fd1' => N("Second floppy drive"),
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 74cc95870..82677b0b0 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -1032,7 +1032,7 @@ N_("The highlighted entry will be booted automatically in %d seconds."),
);
my $e = "$::prefix/boot/.enough_space";
- output $e, 1; -s $e or die N("not enough room in /boot");
+ output $e, 1; -s $e or die \N("not enough room in /boot");
unlink $e;
$f;
}
@@ -1060,7 +1060,7 @@ sub install {
my ($bootloader, $fstab, $hds) = @_;
if (my $p = find { $bootloader->{boot} eq "/dev/$_->{device}" } @$fstab) {
- die N("You can't install the bootloader on a %s partition\n", partition_table::type2fs($p))
+ die \N("You can't install the bootloader on a %s partition\n", partition_table::type2fs($p))
if isThisFs('xfs', $p);
}
$bootloader->{keytable} = keytable($bootloader->{keytable});
diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm
index f6f23b22a..321682581 100644
--- a/perl-install/diskdrake/hd_gtk.pm
+++ b/perl-install/diskdrake/hd_gtk.pm
@@ -255,7 +255,7 @@ sub create_automatic_notebooks {
my $b = $_->{marked} or $notebook_widget->remove_page($::i);
$b;
} @notebook;
- @notebook or die N("No hard drives found");
+ @notebook or die \N("No hard drives found");
}
################################################################################
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index 5fdf71c82..3f0e7d30b 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -1050,7 +1050,7 @@ sub write_partitions {
if (!$::testing) {
partition_table::write($hd);
}
- $hd->{rebootNeeded} and die N("You'll need to reboot before the modification can take place");
+ $hd->{rebootNeeded} and die \N("You'll need to reboot before the modification can take place");
1;
}
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index a1758d57c..6bb46dee2 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -537,7 +537,7 @@ sub format_ext2($@) {
my ($dev, @options) = @_;
$dev =~ m,(rd|ida|cciss)/, and push @options, qw(-b 4096 -R stride=16); #- For RAID only.
push @options, qw(-b 1024 -O none) if arch() =~ /alpha/;
- run_program::raw({ timeout => 60 * 60 }, 'mke2fs', '-F', @options, devices::make($dev)) or die N("%s formatting of %s failed", any { $_ eq '-j' } @options ? "ext3" : "ext2", $dev);
+ run_program::raw({ timeout => 60 * 60 }, 'mke2fs', '-F', @options, devices::make($dev)) or die \N("%s formatting of %s failed", any { $_ eq '-j' } @options ? "ext3" : "ext2", $dev);
}
sub format_ext3 {
my ($dev, @options) = @_;
@@ -547,23 +547,23 @@ sub format_ext3 {
sub format_reiserfs {
my ($dev, @options) = @_;
#TODO add -h tea
- run_program::raw({ timeout => 60 * 60 }, "mkreiserfs", "-ff", @options, devices::make($dev)) or die N("%s formatting of %s failed", "reiserfs", $dev);
+ run_program::raw({ timeout => 60 * 60 }, "mkreiserfs", "-ff", @options, devices::make($dev)) or die \N("%s formatting of %s failed", "reiserfs", $dev);
}
sub format_xfs {
my ($dev, @options) = @_;
- run_program::raw({ timeout => 60 * 60 }, "mkfs.xfs", "-f", "-q", @options, devices::make($dev)) or die N("%s formatting of %s failed", "xfs", $dev);
+ run_program::raw({ timeout => 60 * 60 }, "mkfs.xfs", "-f", "-q", @options, devices::make($dev)) or die \N("%s formatting of %s failed", "xfs", $dev);
}
sub format_jfs {
my ($dev, @options) = @_;
- run_program::raw({ timeout => 60 * 60 }, "mkfs.jfs", "-f", @options, devices::make($dev)) or die N("%s formatting of %s failed", "jfs", $dev);
+ run_program::raw({ timeout => 60 * 60 }, "mkfs.jfs", "-f", @options, devices::make($dev)) or die \N("%s formatting of %s failed", "jfs", $dev);
}
sub format_dos {
my ($dev, @options) = @_;
- run_program::raw({ timeout => 60 * 60 }, "mkdosfs", @options, devices::make($dev)) or die N("%s formatting of %s failed", "dos", $dev);
+ run_program::raw({ timeout => 60 * 60 }, "mkdosfs", @options, devices::make($dev)) or die \N("%s formatting of %s failed", "dos", $dev);
}
sub format_hfs {
my ($dev, @options) = @_;
- run_program::raw({ timeout => 60 * 60 }, "hformat", @options, devices::make($dev)) or die N("%s formatting of %s failed", "HFS", $dev);
+ run_program::raw({ timeout => 60 * 60 }, "hformat", @options, devices::make($dev)) or die \N("%s formatting of %s failed", "HFS", $dev);
}
sub real_format_part {
my ($part) = @_;
@@ -600,7 +600,7 @@ sub real_format_part {
my $check_blocks = any { /^-c$/ } @options;
swap::make($dev, $check_blocks);
} else {
- die N("I don't know how to format %s in type %s", $part->{device}, type2name($part->{type}));
+ die \N("I don't know how to format %s in type %s", $part->{device}, type2name($part->{type}));
}
$part->{isFormatted} = 1;
}
@@ -677,7 +677,7 @@ sub mount {
if (member($fs, 'smb', 'smbfs', 'nfs', 'davfs', 'ntfs') && $::isStandalone) {
$wait_message->(N("Mounting partition %s", $dev)) if $wait_message;
- system('mount', '-t', $fs, $dev, $where, if_($options, '-o', $options)) == 0 or die N("mounting partition %s in directory %s failed", $dev, $where);
+ system('mount', '-t', $fs, $dev, $where, if_($options, '-o', $options)) == 0 or die \N("mounting partition %s in directory %s failed", $dev, $where);
return; #- do not update mtab, already done by mount(8)
} elsif (member($fs, 'ext2', 'proc', 'usbdevfs', 'iso9660', @fs_modules)) {
$where =~ s|/$||;
@@ -727,7 +727,7 @@ sub mount {
}
log::l("calling mount($dev, $where, $fs, $flag, $mount_opt)");
$wait_message->(N("Mounting partition %s", $dev)) if $wait_message;
- syscall_('mount', $dev, $where, $fs, $flag, $mount_opt) or die N("mounting partition %s in directory %s failed", $dev, $where) . " ($!)";
+ syscall_('mount', $dev, $where, $fs, $flag, $mount_opt) or die \N("mounting partition %s in directory %s failed", $dev, $where) . " ($!)";
} else {
log::l("skipping mounting $fs partition");
return;
@@ -742,7 +742,7 @@ sub umount {
my ($mntpoint) = @_;
$mntpoint =~ s|/$||;
log::l("calling umount($mntpoint)");
- syscall_('umount', $mntpoint) or die N("error unmounting %s: %s", $mntpoint, $!);
+ syscall_('umount', $mntpoint) or die \N("error unmounting %s: %s", $mntpoint, $!);
substInFile { $_ = '' if /(^|\s)$mntpoint\s/ } '/etc/mtab'; #- don't care about error, if we can't read, we won't manage to write... (and mess mtab)
}
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index 3a16cc963..72d87e7d8 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -506,8 +506,8 @@ sub get_root { &get_root_ || {} }
#- do this before modifying $part->{type}
sub check_type {
my ($type, $_hd, $part) = @_;
- isThisFs("jfs", { type => $type }) && $part->{size} < 16 << 11 and die N("You can't use JFS for partitions smaller than 16MB");
- isThisFs("reiserfs", { type => $type }) && $part->{size} < 32 << 11 and die N("You can't use ReiserFS for partitions smaller than 32MB");
+ isThisFs("jfs", { type => $type }) && $part->{size} < 16 << 11 and die \N("You can't use JFS for partitions smaller than 16MB");
+ isThisFs("reiserfs", { type => $type }) && $part->{size} < 32 << 11 and die \N("You can't use ReiserFS for partitions smaller than 32MB");
}
sub package_needed_for_partition_type {
@@ -526,18 +526,18 @@ sub check_mntpoint {
my ($mntpoint, $hd, $part, $all_hds) = @_;
$mntpoint eq '' || isSwap($part) || isNonMountable($part) and return;
- $mntpoint =~ m|^/| or die N("Mount points must begin with a leading /");
- $mntpoint ne $part->{mntpoint} && has_mntpoint($mntpoint, $all_hds) and die N("There is already a partition with mount point %s\n", $mntpoint);
+ $mntpoint =~ m|^/| or die \N("Mount points must begin with a leading /");
+ $mntpoint ne $part->{mntpoint} && has_mntpoint($mntpoint, $all_hds) and die \N("There is already a partition with mount point %s\n", $mntpoint);
die "raid / with no /boot"
if $mntpoint eq "/" && isRAID($part) && !has_mntpoint("/boot", $all_hds);
- die N("You can't use a LVM Logical Volume for mount point %s", $mntpoint)
+ die \N("You can't use a LVM Logical Volume for mount point %s", $mntpoint)
if $mntpoint eq '/boot' && isLVM($hd);
- die N("This directory should remain within the root filesystem")
+ die \N("This directory should remain within the root filesystem")
if member($mntpoint, qw(/bin /dev /etc /lib /sbin /root /mnt));
- die N("You need a true filesystem (ext2/ext3, reiserfs, xfs, or jfs) for this mount point\n")
+ die \N("You need a true filesystem (ext2/ext3, reiserfs, xfs, or jfs) for this mount point\n")
if !isTrueFS($part) && member($mntpoint, qw(/ /home /tmp /usr /var));
- die N("You can't use an encrypted file system for mount point %s", $mntpoint)
+ die \N("You can't use an encrypted file system for mount point %s", $mntpoint)
if $part->{options} =~ /encrypted/ && member($mntpoint, qw(/ /usr /var /boot));
local $part->{mntpoint} = $mntpoint;
@@ -598,9 +598,9 @@ sub auto_allocate {
if ($before == listlength(fsedit::get_all_fstab($all_hds))) {
# find out why auto_allocate failed
if (any { !has_mntpoint($_->{mntpoint}, $all_hds) } @$suggestions_) {
- die N("Not enough free space for auto-allocating");
+ die \N("Not enough free space for auto-allocating");
} else {
- die N("Nothing to do");
+ die \N("Nothing to do");
}
}
}
@@ -693,7 +693,7 @@ sub move {
local (*F, *G);
sysopen F, $hd->{file}, 0 or die '';
- sysopen G, $hd2->{file}, 2 or die N("Error opening %s for writing: %s", $hd2->{file}, $!);
+ sysopen G, $hd2->{file}, 2 or die \N("Error opening %s for writing: %s", $hd2->{file}, $!);
my $base = $part1->{start};
my $base2 = $part2->{start};
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 8ce56d2b6..640568e33 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -113,7 +113,7 @@ sub setupSCSI {
my ($clicked, $_ent_number, $auto) = @_;
if (!$::live && !$::g_auto_install && !$o->{blank} && !$::testing && !$::uml_install) {
- -s modules::cz_file() or die N("Can't access kernel modules corresponding to your kernel (file %s is missing), this generally means your boot floppy in not in sync with the Installation medium (please create a newer boot floppy)", modules::cz_file());
+ -s modules::cz_file() or die \N("Can't access kernel modules corresponding to your kernel (file %s is missing), this generally means your boot floppy in not in sync with the Installation medium (please create a newer boot floppy)", modules::cz_file());
}
installStepsCall($o, $auto, 'setupSCSI', $clicked);
@@ -167,7 +167,7 @@ sub formatPartitions {
if ($want_root_formated) {
foreach ('/usr') {
my $part = fsedit::mntpoint2part($_, $o->{fstab}) or next;
- $part->{toFormat} or die N("You must also format %s", $_);
+ $part->{toFormat} or die \N("You must also format %s", $_);
}
}
installStepsCall($o, $auto, 'formatMountPartitions', $o->{fstab}) if !$::testing;
@@ -323,7 +323,7 @@ sub start_i810fb {
#- MAIN
#-######################################################################################
sub main {
- $SIG{__DIE__} = sub { chomp(my $err = $_[0]); log::l("warning: $err") if $err !~ /^find_index failed/ };
+ $SIG{__DIE__} = sub { chomp(my $err = $_[0]); log::l("warning: ", ref($err) eq 'SCALAR' ? $$err : $err) if $err !~ /^find_index failed/ };
$SIG{SEGV} = sub {
my $msg = "segmentation fault: seems like memory is missing as the install crashes"; print "$msg\n"; log::l($msg);
$o->ask_warn('', $msg);
@@ -592,6 +592,7 @@ sub main {
$o->kill_action;
$clicked = 0;
if ($err) {
+ ref($err) eq 'SCALAR' and $err = $$err;
local $_ = $err;
$o->kill_action;
if (!/^already displayed/) {
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index a7d2a89a8..2b840b6d0 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -465,7 +465,7 @@ sub setAuthentication {
#run_program::rooted($o->{prefix}, "/usr/sbin/chkauth", "yp", $domain, "-s", $nis);
$o->pkg_install("ypbind");
my $domain = $o->{netc}{NISDOMAIN};
- $domain || $nis ne "broadcast" or die N("Can't use broadcast with no NIS domain");
+ $domain || $nis ne "broadcast" or die \N("Can't use broadcast with no NIS domain");
my $t = $domain ? "domain $domain" . ($nis ne "broadcast" && " server") : "ypserver";
substInFile {
$_ = "#~$_" unless /^#/;
@@ -878,7 +878,7 @@ sub loadO {
-e "$f.pl" and $f .= ".pl" unless -e $f;
my $fh;
- if (-e $f) { open $fh, $f } else { $fh = getFile($f) or die N("Error reading file %s", $f) }
+ if (-e $f) { open $fh, $f } else { $fh = getFile($f) or die \N("Error reading file %s", $f) }
{
local $/ = "\0";
no strict;
@@ -996,7 +996,7 @@ sub getHds {
my $hds = $all_hds->{hds};
if (is_empty_array_ref($hds)) { #- no way
- die N("An error occurred - no valid devices were found on which to create new filesystems. Please check your hardware for the cause of this problem");
+ die \N("An error occurred - no valid devices were found on which to create new filesystems. Please check your hardware for the cause of this problem");
}
#- try to figure out if the same number of hds is available, use them if ok.
diff --git a/perl-install/install_interactive.pm b/perl-install/install_interactive.pm
index e7287bd82..2ef9f73d8 100644
--- a/perl-install/install_interactive.pm
+++ b/perl-install/install_interactive.pm
@@ -150,7 +150,7 @@ sub partitionWizardSolutions {
};
$pkg->new($part->{device}, devices::make($part->{device}));
};
- $@ and die N("The FAT resizer is unable to handle your partition,
+ $@ and die \N("The FAT resizer is unable to handle your partition,
the following error occured: %s", formatError($@));
my $min_win = do {
my $_w = $o->wait_message(N("Resizing"), N("Computing the size of the Windows partition"));
@@ -160,7 +160,7 @@ the following error occured: %s", formatError($@));
#- this save at least a cylinder (less than 8Mb).
$min_win += partition_table::raw::cylinder_size($hd);
- $part->{size} > $min_linux + $min_swap + $min_freewin + $min_win or die N("Your Windows partition is too fragmented. Please reboot your computer under Windows, run the ``defrag'' utility, then restart the Mandrake Linux installation.");
+ $part->{size} > $min_linux + $min_swap + $min_freewin + $min_win or die \N("Your Windows partition is too fragmented. Please reboot your computer under Windows, run the ``defrag'' utility, then restart the Mandrake Linux installation.");
$o->ask_okcancel('', N("WARNING!
DrakX will now resize your Windows partition. Be careful:
@@ -186,7 +186,7 @@ When sure, press Ok.")) or return;
};
if (my $err = $@) {
$part->{size} = $oldsize;
- die N("FAT resizing failed: %s", formatError($err));
+ die \N("FAT resizing failed: %s", formatError($err));
}
$part->{isFormatted} = 1;
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index dce92be37..5b2db9845 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -184,7 +184,7 @@ sub doPartitionDisksAfter {
}
if (arch() =~ /ia64/ && !fsedit::has_mntpoint("/boot/efi", $o->{all_hds})) {
- die N("You must have a FAT partition mounted in /boot/efi");
+ die \N("You must have a FAT partition mounted in /boot/efi");
}
if ($o->{partitioning}{use_existing_root}) {
@@ -219,7 +219,7 @@ sub ask_mntpoint_s {
next if !$m || $m eq 'swap'; #- there may be a lot of swap.
- $m{$m} and die N("Duplicate mount point %s", $m);
+ $m{$m} and die \N("Duplicate mount point %s", $m);
$m{$m} = 1;
#- in case the type does not correspond, force it to ext3
@@ -388,7 +388,7 @@ sub afterInstallPackages($) {
return if $::g_auto_install;
- die N("Some important packages didn't get installed properly.
+ die \N("Some important packages didn't get installed properly.
Either your cdrom drive or your cdrom is defective.
Check the cdrom on an installed computer using \"rpm -qpl Mandrake/RPMS/*.rpm\"
") if any { m|read failed: Input/output error| } cat_("$o->{prefix}/root/drakx/install.log");
@@ -565,7 +565,7 @@ GridHeight=70
my @l = detect_devices::floppies_dev();
foreach (qw(blank updatemodules)) {
- $o->{$_} eq "1" and $o->{$_} = $l[0] || die N("No floppy drive available");
+ $o->{$_} eq "1" and $o->{$_} = $l[0] || die \N("No floppy drive available");
}
$o->{blank} and $o->copyKernelFromFloppy();
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index e062c6c7c..c71ccac73 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -233,7 +233,7 @@ sub ask_mntpoint_s { #- }{}
my @fstab = grep { isTrueFS($_) } @$fstab;
@fstab = grep { isSwap($_) } @$fstab if @fstab == 0;
@fstab = @$fstab if @fstab == 0;
- die N("No partition available") if @fstab == 0;
+ die \N("No partition available") if @fstab == 0;
{
my $_w = $o->wait_message('', N("Scanning partitions to find mount points"));
@@ -347,7 +347,7 @@ sub formatMountPartitions {
$o->ask_yesorno('', N("Failed to check filesystem %s. Do you want to repair the errors? (beware, you can loose data)", $1), 1);
};
undef $w; #- help perl (otherwise wait_message stays forever in newt)
- die N("Not enough swap space to fulfill installation, please add some") if availableMemory() < 40 * 1024;
+ die \N("Not enough swap space to fulfill installation, please add some") if availableMemory() < 40 * 1024;
}
#------------------------------------------------------------------------------
diff --git a/perl-install/loopback.pm b/perl-install/loopback.pm
index be432c3a6..d972339c2 100644
--- a/perl-install/loopback.pm
+++ b/perl-install/loopback.pm
@@ -29,7 +29,7 @@ sub check_circular_mounts {
my $check; $check = sub {
my ($part, @seen) = @_;
push @seen, $part->{mntpoint} || return;
- @seen > 1 && $part->{mntpoint} eq $base_mntpoint and die N("Circular mounts %s\n", join(", ", @seen));
+ @seen > 1 && $part->{mntpoint} eq $base_mntpoint and die \N("Circular mounts %s\n", join(", ", @seen));
if (my $part = fs::up_mount_point($part->{mntpoint}, $fstab)) {
#- '/' carrier is a special case, it will be mounted first
$check->($part, @seen) if !carryRootLoopback($part);
diff --git a/perl-install/lvm.pm b/perl-install/lvm.pm
index 4ae8e4ff2..93209cca8 100644
--- a/perl-install/lvm.pm
+++ b/perl-install/lvm.pm
@@ -106,7 +106,7 @@ sub vg_add {
sub vg_destroy {
my ($lvm) = @_;
- is_empty_array_ref($lvm->{primary}{normal}) or die N("Remove the logical volumes first\n");
+ is_empty_array_ref($lvm->{primary}{normal}) or die \N("Remove the logical volumes first\n");
run('vgchange', '-a', 'n', $lvm->{VG_name});
run_or_die('vgremove', $lvm->{VG_name});
foreach (@{$lvm->{disks}}) {
diff --git a/perl-install/network/drakfirewall.pm b/perl-install/network/drakfirewall.pm
index 4861b2242..8d6e7005a 100644
--- a/perl-install/network/drakfirewall.pm
+++ b/perl-install/network/drakfirewall.pm
@@ -107,7 +107,7 @@ sub get_ports {
sub set_ports {
my ($in, $disabled, $ports) = @_;
- my $shorewall = network::shorewall::read() || network::shorewall::default_interfaces() or die N("No network card");
+ my $shorewall = network::shorewall::read() || network::shorewall::default_interfaces() or die \N("No network card");
if (!$disabled || -x "$::prefix/sbin/shorewall") {
$in->do_pkgs->ensure_is_installed('shorewall', '/sbin/shorewall', $::isInstall) or return;
diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm
index 28b71adba..112e74b1c 100644
--- a/perl-install/network/ethernet.pm
+++ b/perl-install/network/ethernet.pm
@@ -164,7 +164,7 @@ sub configureNetwork {
my ($netc, $intf, $_first_time) = @_;
local $_;
modules::interactive::load_category($in, 'network/main|gigabit|usb|pcmcia', !$::expert, 1) or return;
- my @l = detect_devices::getNet() or die N("no network card found");
+ my @l = detect_devices::getNet() or die \N("no network card found");
my @all_cards = conf_network_card_backend($netc, $intf);
configureNetwork_step_1:
diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm
index 19b7f2842..1bb76bf4c 100644
--- a/perl-install/partition_table.pm
+++ b/perl-install/partition_table.pm
@@ -678,7 +678,7 @@ sub add_primary {
}
sub add_extended {
- arch() =~ /^sparc|ppc/ and die N("Extended partition not supported on this platform");
+ arch() =~ /^sparc|ppc/ and die \N("Extended partition not supported on this platform");
my ($hd, $part, $extended_type) = @_;
$extended_type =~ s/Extended_?//;
@@ -778,16 +778,16 @@ sub load {
my ($hd, $file, $force) = @_;
local *F;
- open F, $file or die N("Error reading file %s", $file);
+ open F, $file or die \N("Error reading file %s", $file);
my $h;
{
local $/ = "\0";
eval <F>;
}
- $@ and die N("Restoring from file %s failed: %s", $file, $@);
+ $@ and die \N("Restoring from file %s failed: %s", $file, $@);
- ref($h) eq 'ARRAY' or die N("Bad backup file");
+ ref($h) eq 'ARRAY' or die \N("Bad backup file");
my %h; @h{@fields2save} = @$h;
@@ -807,5 +807,5 @@ sub save {
my @h = @{$hd}{@fields2save};
require Data::Dumper;
eval { output($file, Data::Dumper->Dump([\@h], ['$h']), "\0") }
- or die N("Error writing to file %s", $file);
+ or die \N("Error writing to file %s", $file);
}
diff --git a/perl-install/partition_table/raw.pm b/perl-install/partition_table/raw.pm
index 0b06848ac..c25127cdc 100644
--- a/perl-install/partition_table/raw.pm
+++ b/perl-install/partition_table/raw.pm
@@ -190,7 +190,7 @@ sub test_for_bad_drives {
my $tmp2;
&$seek; sysread $F, $tmp2, $SECTORSIZE or die "test_for_bad_drives: can't even read again ($!)";
$tmp eq $tmp2 or die
-N("Something bad is happening on your drive.
+\N("Something bad is happening on your drive.
A test to check the integrity of data has failed.
It means writing anything on the disk will end up with random, corrupted data.");
}
diff --git a/perl-install/raid.pm b/perl-install/raid.pm
index 701ad1a3d..82fb4e0db 100644
--- a/perl-install/raid.pm
+++ b/perl-install/raid.pm
@@ -34,7 +34,7 @@ sub new {
sub add {
my ($raids, $part, $nb) = @_; $nb = nb($nb);
- $raids->[$nb]{isMounted} and die N("Can't add a partition to _formatted_ RAID md%d", $nb);
+ $raids->[$nb]{isMounted} and die \N("Can't add a partition to _formatted_ RAID md%d", $nb);
inactivate_and_dirty($raids->[$nb]);
$part->{notFormatted} = 1; $part->{isFormatted} = 0;
$part->{raid} = $nb;
@@ -152,7 +152,7 @@ sub verify {
my ($raids) = @_;
$raids or return;
foreach (grep { $_ } @$raids) {
- @{$_->{disks}} >= ($_->{level} =~ /4|5/ ? 3 : 2) or die N("Not enough partitions for RAID level %d\n", $_->{level});
+ @{$_->{disks}} >= ($_->{level} =~ /4|5/ ? 3 : 2) or die \N("Not enough partitions for RAID level %d\n", $_->{level});
}
}
generated by cgit v1.2.1 (git 2.21.0) at 2024-06-23 19:55:27 +0000