summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--perl-install/authentication.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.pm32
-rw-r--r--perl-install/install2.pm5
-rw-r--r--perl-install/install_any.pm4
-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/partition_table.pm10
-rw-r--r--perl-install/partition_table/raw.pm2
-rw-r--r--perl-install/raid.pm4
-rw-r--r--perl-install/swap.pm2
18 files changed, 56 insertions, 57 deletions
diff --git a/perl-install/authentication.pm b/perl-install/authentication.pm
index 08bad2cc7..0c86777aa 100644
--- a/perl-install/authentication.pm
+++ b/perl-install/authentication.pm
@@ -80,7 +80,7 @@ sub set {
} elsif ($kind eq 'NIS') {
$in->do_pkgs->install('ypbind');
my $domain = $netc->{NISDOMAIN};
- $domain || $val ne "broadcast" or die \N("Can't use broadcast with no NIS domain");
+ $domain || $val ne "broadcast" or die N("Can't use broadcast with no NIS domain");
my $t = $domain ? "domain $domain" . ($val ne "broadcast" && " server") : "ypserver";
substInFile {
$_ = "#~$_" unless /^#/;
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 243f69708..0cdbfc1bd 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -1140,7 +1140,7 @@ EOF
";
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;
}
@@ -1168,7 +1168,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 816563103..c6ae7b4e4 100644
--- a/perl-install/diskdrake/hd_gtk.pm
+++ b/perl-install/diskdrake/hd_gtk.pm
@@ -252,7 +252,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 30f16e1cc..a037c4fe4 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -1053,7 +1053,7 @@ sub check {
sub check_rebootNeeded {
my ($_in, $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");
}
sub write_partitions {
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index 33ea9ab23..030c6c1f3 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -578,7 +578,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) = @_;
@@ -588,23 +588,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) = @_;
@@ -645,7 +645,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;
}
@@ -717,7 +717,7 @@ sub mount {
if (member($fs, 'smb', 'smbfs', 'nfs', 'davfs', 'ntfs') && $::isStandalone || $::move) {
$o_wait_message->(N("Mounting partition %s", $dev)) if $o_wait_message;
- system('mount', '-t', $fs, $dev, $where, if_($o_options, '-o', $o_options)) == 0 or die \N("mounting partition %s in directory %s failed", $dev, $where);
+ system('mount', '-t', $fs, $dev, $where, if_($o_options, '-o', $o_options)) == 0 or die N("mounting partition %s in directory %s failed", $dev, $where);
} else {
my @types = ('ext2', 'proc', 'sysfs', 'usbdevfs', 'iso9660', 'devfs', @fs_modules);
@@ -770,7 +770,7 @@ sub mount {
}
log::l("calling mount($dev, $where, $fs, $flag, $mount_opt)");
$o_wait_message->(N("Mounting partition %s", $dev)) if $o_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) . " ($!)";
eval { #- fail silently, /etc may be read-only
append_to_file("/etc/mtab", "$dev $where $fs defaults 0 0\n");
@@ -786,7 +786,7 @@ sub umount {
syscall_('umount2', $mntpoint, 0) or do {
kill 15, fuzzy_pidofs('^fam\b');
- syscall_('umount2', $mntpoint, 0) or die \N("error unmounting %s: %s", $mntpoint, $!);
+ syscall_('umount2', $mntpoint, 0) 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 bb6348a6e..87c50de6d 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -510,8 +510,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 {
@@ -530,28 +530,28 @@ 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 =~ m|[\x7f-\xff]| and cdie \N("Mount points should contain only alphanumerical characters");
- mntpoint2part($mntpoint, [ grep { $_ ne $part } get_really_all_fstab($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 =~ m|[\x7f-\xff]| and cdie N("Mount points should contain only alphanumerical characters");
+ mntpoint2part($mntpoint, [ grep { $_ ne $part } get_really_all_fstab($all_hds) ]) and die N("There is already a partition with mount point %s\n", $mntpoint);
- cdie \N("You've selected a software RAID partition as root (/).
+ cdie N("You've selected a software RAID partition as root (/).
No bootloader is able to handle this without a /boot partition.
Please be sure to add a /boot partition") 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);
- cdie \N("You've selected a LVM Logical Volume as root (/).
+ cdie N("You've selected a LVM Logical Volume as root (/).
The bootloader is not able to handle this without a /boot partition.
Please be sure to add a /boot partition") if $mntpoint eq "/" && isLVM($part) && !has_mntpoint("/boot", $all_hds);
- cdie \N("You may not be able to install lilo (since lilo doesn't handle a LV on multiple PVs)")
+ cdie N("You may not be able to install lilo (since lilo doesn't handle a LV on multiple PVs)")
if 0; # arch() =~ /i.86/ && $mntpoint eq '/' && isLVM($hd) && @{$hd->{disks} || []} > 1;
- cdie \N("This directory should remain within the root filesystem")
+ cdie N("This directory should remain within the root filesystem")
if member($mntpoint, qw(/root));
- 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 /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;
@@ -612,9 +612,9 @@ sub auto_allocate {
if ($before == listlength(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");
}
}
}
@@ -710,7 +710,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 e15b03a08..e18a243d2 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -116,7 +116,7 @@ sub setupSCSI {
if (!$o->{blank} && !$::testing && !$::uml_install) {
-d '/lib/modules/' . c::kernel_version() ||
- -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);
@@ -166,7 +166,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;
@@ -628,7 +628,6 @@ 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 c3c2469ab..3f49ee36a 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -861,7 +861,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;
@@ -985,7 +985,7 @@ sub getHds {
my $hds = $all_hds->{hds};
if (is_empty_array_ref($hds) && !$::move) { #- 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 8919649d2..69018db24 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 Mandrakelinux 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 Mandrakelinux installation.");
$o->ask_okcancel('', formatAlaTeX(N("WARNING!
DrakX will now resize your Windows partition. Be careful: this
@@ -188,7 +188,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));
}
$o->ask_warn('', N("To ensure data integrity after resizing the partition(s),
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 26ea83d9a..23df4874b 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -203,7 +203,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} && !$::recovery) {
@@ -238,7 +238,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
@@ -403,7 +403,7 @@ sub installPackages($$) { #- complete REWORK, TODO and TOCHECK!
sub afterInstallPackages($) {
my ($o) = @_;
- 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");
@@ -532,7 +532,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 cdb8def53..01eb176a4 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -245,7 +245,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"));
@@ -359,7 +359,7 @@ sub formatMountPartitions {
$o->ask_yesorno('', N("Failed to check filesystem %s. Do you want to repair the errors? (beware, you can lose 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 45505bda4..f945adede 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 c0e29450a..0770bf2b9 100644
--- a/perl-install/lvm.pm
+++ b/perl-install/lvm.pm
@@ -112,7 +112,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");
lvm_cmd('vgchange', '-a', 'n', $lvm->{VG_name});
lvm_cmd_or_die('vgremove', $lvm->{VG_name});
foreach (@{$lvm->{disks}}) {
diff --git a/perl-install/network/drakfirewall.pm b/perl-install/network/drakfirewall.pm
index 887aa3b1e..dcfd596fa 100644
--- a/perl-install/network/drakfirewall.pm
+++ b/perl-install/network/drakfirewall.pm
@@ -122,7 +122,7 @@ sub get_ports {
sub set_ports {
my ($in, $disabled, $ports) = @_;
- my $shorewall = network::shorewall::read($in, 'not_silent') || network::shorewall::default_interfaces($in) or die \N("No network card");
+ my $shorewall = network::shorewall::read($in, 'not_silent') || network::shorewall::default_interfaces($in) 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/partition_table.pm b/perl-install/partition_table.pm
index 590dd752a..45b3a7088 100644
--- a/perl-install/partition_table.pm
+++ b/perl-install/partition_table.pm
@@ -746,7 +746,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_?//;
@@ -844,16 +844,16 @@ sub next_start {
sub load {
my ($hd, $file, $b_force) = @_;
- open(my $F, $file) or die \N("Error reading file %s", $file);
+ open(my $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;
@@ -873,5 +873,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 2b7efa808..e01f9c1c3 100644
--- a/perl-install/partition_table/raw.pm
+++ b/perl-install/partition_table/raw.pm
@@ -184,7 +184,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 df2cb6cde..7237af929 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});
}
}
diff --git a/perl-install/swap.pm b/perl-install/swap.pm
index f9bacf492..564513ad9 100644
--- a/perl-install/swap.pm
+++ b/perl-install/swap.pm
@@ -9,7 +9,7 @@ use devices;
sub make {
my ($dev, $checkBlocks) = @_;
- run_program::raw({ timeout => 60 * 60 }, "mkswap", if_($checkBlocks, '-c'), devices::make($dev)) or die \N("%s formatting of %s failed", 'swap', $dev);
+ run_program::raw({ timeout => 60 * 60 }, "mkswap", if_($checkBlocks, '-c'), devices::make($dev)) or die N("%s formatting of %s failed", 'swap', $dev);
}
sub enable {
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-02 01:47:46 +0000