summaryrefslogtreecommitdiffstats
path: root/rescue/sbin
diff options
context:
space:
mode:
Diffstat (limited to 'rescue/sbin')
-rwxr-xr-xrescue/sbin/partimage_whole_disk264
1 files changed, 264 insertions, 0 deletions
diff --git a/rescue/sbin/partimage_whole_disk b/rescue/sbin/partimage_whole_disk
new file mode 100755
index 000000000..ed0653a95
--- /dev/null
+++ b/rescue/sbin/partimage_whole_disk
@@ -0,0 +1,264 @@
+#!/usr/bin/perl
+
+use lib qw(/usr/lib/libDrakX);
+use standalone;
+use fsedit;
+use fs::format;
+use fs::type;
+use resize_fat::main;
+use diskdrake::resize_ntfs;
+use diskdrake::resize_ext2;
+use common;
+use partition_table::empty;
+use Carp::Heavy;
+
+my %options = (
+ save_home_directory => 1,
+ empty_space_at_end_of_disk => 0, # 300 * 1024 * 2, # 300MB
+ ask_before_modifying_home => 1,
+ bzip2 => 1,
+);
+
+my ($server);
+if ($ARGV[0] eq '-s') {
+ (undef, $server, @ARGV) = @ARGV;
+}
+my $action = shift @ARGV;
+
+sub usage() { die "partimage_whole_disk [-s <server>] (save_all <dir> | rest_all <dir>)\n" }
+
+$ENV{PATH} = "/sbin:/usr/sbin:$ENV{PATH}";
+$ENV{HOME} = '/';
+log::openLog("/var/log/partimage_whole_disk.log");
+my @partimage_cmd = ('partimage', if_($server, '-s', $server, '-n', '-L'));
+
+@ARGV == 1 or usage();
+
+if ($server && !is_network_configured()) {
+ run_program::run('drvinst', 'NETWORK');
+ run_program::run('dhcp-client');
+}
+
+run_program::run('drvinst', 'STORAGE_SCSI', 'STORAGE_IDE');
+
+my $all_hds = fsedit::get_hds({});
+
+if ($action eq 'save_all') {
+ save_all($ARGV[0]);
+} elsif ($action eq 'rest_all') {
+ rest_all($ARGV[0]);
+}
+
+sub save_all {
+ my ($dir) = @_;
+
+ my $base_dir = $dir;
+ for (my $i = 0; read_part_list($dir); $i++) {
+ #- find a free dir
+ $dir = sprintf("$base_dir.%03d", $i);
+ }
+
+ my $hd = $all_hds->{hds}[0] or die "no main hard drive\n";
+ log::l("save_all on $hd->{device}");
+ my $part_list = [ partition_table::get_normal_parts($hd) ];
+
+ foreach (@$part_list) {
+ $_->{saved} = !member($_->{fs_type}, 'ntfs', 'ntfs-3g', 'vfat', 'swap');
+ }
+
+ if (!$options{save_home_directory}) {
+ #- shrink and don't save the last ext3 partition (which is the /home partition)
+ if (my $part = find { isTrueLocalFS($_) } reverse @$part_list) {
+ $part->{size} = min($part->{size}, 1024 * 1024 * 2); # not greater than 1GB
+ $part->{saved} = 0;
+ }
+ }
+
+ foreach (grep { $_->{saved} } @$part_list) {
+ run_or_die(@partimage_cmd,
+ if_($options{bzip2}, '-z', 2),
+ '-V', 0, '--nombr', '--nodesc', '--nocheck', '-b', '-o',
+ 'save', devices::make($_->{device}), "$dir/$_->{device}");
+ }
+ save_part_list($dir, $hd->{geom}, $part_list);
+}
+sub rest_all {
+ my ($dir) = @_;
+
+ my ($forced_geom, $part_list) = read_part_list($dir) or error("read_part_list $dir failed");
+
+ (my $hd) = my @used_hds = uniq(map {
+ my $part = $_;
+ find { $part->{device} =~ /^\Q$_->{device}\E./ } fs::get::hds($all_hds)
+ or error("can't find hard drive for partition $part->{device}");
+ } @$part_list);
+
+ @used_hds >= 1 or error("no matching hd");
+ @used_hds <= 1 or error("multiple hds: " . join(' ', map { $_->{device} } @used_hds));
+
+ fs::type::set_fs_type($_, $_->{fs_type}) foreach @$part_list;
+ put_in_hash($_, partition_table::hd2minimal_part($hd)) foreach @$part_list;
+
+ my ($from_partimage, $other) = partition { $_->{saved} } @$part_list;
+ my ($from_resize, $created) = partition { member($_->{fs_type}, 'vfat', 'ntfs', 'ntfs-3g') } @$other;
+
+ my $total = sum(map { $_->{size} } @$part_list);
+ if ($total > $hd->{totalsectors}) {
+ error("$dir doesn't fit: $total > $hd->{totalsectors}");
+ }
+
+
+ foreach (@$from_resize) {
+ #- resize first
+ my $part = fs::get::device2part($_->{device}, [ fs::get::fstab($all_hds) ]);
+ if (!$part) {
+ log::l("partition to resize is missing ($_->{device})");
+ $_->{missing} = 1;
+ next;
+ }
+ if ($part->{fs_type} ne $_->{fs_type}) {
+ log::l("partition $_->{device} doesn't have the right filesystem ($part->{fs_type} != $_->{fs_type})");
+ $_->{missing} = 1;
+ next;
+ }
+
+ if (@$from_resize == 1) {
+ my $half_size = int($hd->{totalsectors} / 2) - 2 * $hd->cylinder_size;
+ my $suggested_total = $total - $_->{size} + $half_size;
+ log::l("resizing bigger? (size $_->{size}, half_size $half_size, total $total, suggested_total $suggested_total)");
+ if ($half_size > $_->{size} && $suggested_total < $hd->{totalsectors}) {
+ log::l("prefering to resize $_->{device} to size $half_size instead of $_->{size}");
+ $_->{size} = $half_size;
+ }
+ }
+
+ $_->{start} = $part->{start};
+ if ($_->{size} < $part->{size}) {
+ log::l("resizing $_->{device} to $_->{size} (it is $part->{size})");
+ my $resize_pkg = $_->{fs_type} eq 'vfat' ? 'resize_fat::main' : 'diskdrake::resize_ntfs';
+ my $resize = $resize_pkg->new($_->{device}, devices::make($_->{device}));
+ $resize->resize($_->{size});
+ } else {
+ log::l("no need to resize, instead setting $_->{device}'s size to $part->{size} instead of $_->{size}");
+ $_->{size} = $part->{size};
+ }
+ }
+
+ put_in_hash($hd->{geom}, $forced_geom);
+ log::l("totalsectors $hd->{totalsectors} heads $hd->{geom}{heads} sectors $hd->{geom}{sectors}");
+ partition_table::raw::compute_nb_cylinders($hd->{geom}, $hd->{totalsectors});
+
+ #- grow the last ext3 partition
+ if (my $part = find { isTrueLocalFS($_) } reverse @$part_list) {
+ $part->{ratio} = 1;
+
+ if ($options{ask_before_modifying_home}) {
+ print "\nkeep existing /home? (Y/n) ";
+ if (<STDIN> !~ /n/i) {
+ my $l = @$from_partimage > 1 ? $from_partimage : $created;
+ #- it was meant to be restored or formatted
+ my $p = pop @$l;
+ log::l("keeping existing /home: removing $p->{device}");
+ }
+ }
+ }
+
+ #- write the partition table
+ partition_table::raw::zero_MBR($hd);
+ foreach my $part (grep { $_->{rootDevice} eq $hd->{device} } @$part_list) {
+ next if $part->{missing};
+
+ my $hole = find { isEmpty($_) && $_->{size} >= $part->{size} } partition_table::get_normal_parts_and_holes($hd) or die "not enough room for $part->{device}";
+ $part->{start} = $hole->{start};
+
+ log::l("handling $part->{device}");
+ my $extended = $part->{device} =~ /(\d+)$/ && $1 > 4 && $hd->hasExtended;
+
+ my %wanted_part = %$part;
+ if ($part->{ratio}) {
+ $part->{size} = $hole->{size} - ($options{empty_space_at_end_of_disk} || 0);
+ } else {
+ $part->{size} += $hd->{geom}{sectors} if $extended;
+ $part->{size} += $hd->cylinder_size if $part->{start} == 1;
+ }
+ log::l("adding $part->{device} with size $part->{size}");
+ partition_table::add($hd, $part, $extended ? 'Extended' : 'Primary');
+ foreach ('device', if_(!$part->{ratio}, 'size')) {
+ $part->{$_} eq $wanted_part{$_} or log::l("bad $_ for $part->{device}: $part->{$_} != $wanted_part{$_}");
+ }
+ }
+ partition_table::write($hd);
+
+ #- restore from partimage
+ foreach (@$from_partimage) {
+ run_or_die(@partimage_cmd, 'restore', '-b', devices::make($_->{device}), "$dir/$_->{device}");
+
+ if ($_->{ratio}) {
+ my $resize = diskdrake::resize_ext2->new($_->{device}, devices::make($_->{device}));
+ $resize->resize($_->{size});
+ }
+ }
+
+ foreach (@$created) {
+ fs::format::part_raw($_, undef);
+ }
+
+ run_program::run('guessmounts');
+
+ if (my @missing = grep { $_->{missing} } @$part_list) {
+ my $missing = join('|', map { quotemeta($_->{device}) } @missing);
+ log::l("drop missing devices from fstab and lilo.conf: $missing");
+ $::prefix = '/mnt';
+ substInFile { $_ = '' if m!^/dev/($missing)\s! } "$::prefix/etc/fstab";
+
+ my $match;
+ substInFile {
+ /^\S/ and $match = m!^other=/dev/($missing)$!;
+ $_ = '' if $match;
+ } "$::prefix/etc/lilo.conf";
+ }
+
+ run_or_die('install_bootloader', '--auto');
+
+ print "\n", "Your system is ready, press enter to reboot (Y/n) ";
+ if (<STDIN> !~ /n/i) {
+ run_program::run('reboot');
+ }
+}
+
+sub lst_fields() { qw(device size fs_type saved) }
+sub save_part_list {
+ my ($dir, $geom, $part_list) = @_;
+ my @l = map { join(' ', @$_{lst_fields()}) } @$part_list;
+ log::l("save_part_list $dir: $_") foreach @l;
+ my $partimage = join(' ', @partimage_cmd);
+ open(my $F, "| $partimage -z0 -Bfoo=bar -o save_file $dir/lst");
+ print $F join("/", $geom->{heads}, $geom->{sectors}), "\n";
+ print $F "$_\n" foreach @l;
+}
+sub read_part_list {
+ my ($dir) = @_;
+ my $partimage = join(' ', @partimage_cmd);
+ open(my $F, "$partimage -z0 -Bfoo=bar rest_file $dir/lst |");
+ my $geom_string = <$F> or return;
+ my %geom; @geom{'heads', 'sectors'} = split('/', chomp_($geom_string));
+ my @l = chomp_(cat__($F));
+ log::l("read_part_list $dir: $_") foreach @l;
+ \%geom, [ map { my %l; @l{lst_fields()} = split; \%l } @l ];
+}
+
+sub run_or_die {
+ my (@l) = @_;
+ run_program::raw({ timeout => 4 * 60 * 60 }, @l) or die join(' ', @l) . " failed\n";
+}
+
+sub error {
+ my ($msg) = @_;
+ log::l($msg);
+ die "$msg\n";
+}
+
+sub is_network_configured() {
+ my (undef, @l) = cat_('/proc/net/route');
+ find { /^(\S+)/ && $1 ne 'lo' } @l;
+}
e5afae33d904bf8a2937811734369c8e1c0cdb2'>perl-install/share/po/is.po2
-rw-r--r--perl-install/share/po/it.po2
-rw-r--r--perl-install/share/po/ja.po2
-rw-r--r--perl-install/share/po/ko.po2
-rw-r--r--perl-install/share/po/ky.po2
-rw-r--r--perl-install/share/po/lt.po2
-rw-r--r--perl-install/share/po/ltg.po2
-rw-r--r--perl-install/share/po/lv.po2
-rw-r--r--perl-install/share/po/mk.po2
-rw-r--r--perl-install/share/po/mn.po2
-rw-r--r--perl-install/share/po/ms.po2
-rw-r--r--perl-install/share/po/mt.po2
-rw-r--r--perl-install/share/po/nb.po2
-rw-r--r--perl-install/share/po/nl.po2
-rw-r--r--perl-install/share/po/nn.po2
-rw-r--r--perl-install/share/po/pa_IN.po2
-rw-r--r--perl-install/share/po/pl.po2
-rw-r--r--perl-install/share/po/pt.po2
-rw-r--r--perl-install/share/po/pt_BR.po2
-rw-r--r--perl-install/share/po/ro.po2
-rw-r--r--perl-install/share/po/ru.po2
-rw-r--r--perl-install/share/po/sc.po2
-rw-r--r--perl-install/share/po/sk.po2
-rw-r--r--perl-install/share/po/sl.po2
-rw-r--r--perl-install/share/po/sq.po2
-rw-r--r--perl-install/share/po/sr.po2
-rw-r--r--perl-install/share/po/sr@Latn.po2
-rw-r--r--perl-install/share/po/sv.po2
-rw-r--r--perl-install/share/po/ta.po2
-rw-r--r--perl-install/share/po/tg.po2
-rw-r--r--perl-install/share/po/th.po2
-rw-r--r--perl-install/share/po/tl.po2
-rw-r--r--perl-install/share/po/tr.po2
-rw-r--r--perl-install/share/po/uk.po2
-rw-r--r--perl-install/share/po/uz.po2
-rw-r--r--perl-install/share/po/uz@Latn.po2
-rw-r--r--perl-install/share/po/vi.po2
-rw-r--r--perl-install/share/po/wa.po2
-rw-r--r--perl-install/share/po/zh_CN.po2
-rw-r--r--perl-install/share/po/zh_TW.po2
71 files changed, 71 insertions, 71 deletions
diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index 0bcd83154..ddb083e8f 100644
--- a/perl-install/share/po/DrakX.pot
+++ b/perl-install/share/po/DrakX.pot
@@ -17716,7 +17716,7 @@ msgstr ""
#: standalone/drakgw:180
#, c-format
-msgid "Local IP adress"
+msgid "Local IP address"
msgstr ""
#: standalone/drakgw:182
diff --git a/perl-install/share/po/af.po b/perl-install/share/po/af.po
index e3f795e83..97ff7fcdd 100644
--- a/perl-install/share/po/af.po
+++ b/perl-install/share/po/af.po
@@ -21111,7 +21111,7 @@ msgstr "Plaaslike Netwerkadres"
#: standalone/drakgw:180
#, c-format
-msgid "Local IP adress"
+msgid "Local IP address"
msgstr ""
#: standalone/drakgw:182
diff --git a/perl-install/share/po/am.po b/perl-install/share/po/am.po
index cdfe90fae..ac785d306 100644
--- a/perl-install/share/po/am.po
+++ b/perl-install/share/po/am.po
@@ -18664,7 +18664,7 @@ msgstr "የቀይ ባርኔታ መረብ"
#: standalone/drakgw:180
#, c-format
-msgid "Local IP adress"
+msgid "Local IP address"
msgstr ""
#: standalone/drakgw:182
diff --git a/perl-install/share/po/ar.po b/perl-install/share/po/ar.po
index ad5e6d499..9970b2ed8 100644
--- a/perl-install/share/po/ar.po
+++ b/perl-install/share/po/ar.po
@@ -21257,7 +21257,7 @@ msgstr "عنوان الشبكة المحلية"
#: standalone/drakgw:180
#, c-format
-msgid "Local IP adress"
+msgid "Local IP address"
msgstr ""
#: standalone/drakgw:182
diff --git a/perl-install/share/po/az.po b/perl-install/share/po/az.po
index 7e3327911..dafb56cb0 100644
--- a/perl-install/share/po/az.po
+++ b/perl-install/share/po/az.po
@@ -21056,7 +21056,7 @@ msgstr "Yerli Şəbəkə ünvanı"
#: standalone/drakgw:180
#, c-format
-msgid "Local IP adress"
+msgid "Local IP address"
msgstr ""
#: standalone/drakgw:182
diff --git a/perl-install/share/po/be.po b/perl-install/share/po/be.po
index 9b428f863..b81b11911 100644
--- a/perl-install/share/po/be.po
+++ b/perl-install/share/po/be.po
@@ -18889,7 +18889,7 @@ msgstr "Прагляд лякальнай сеткі"
#: standalone/drakgw:180
#, c-format
-msgid "Local IP adress"
+msgid "Local IP address"
msgstr ""
#: standalone/drakgw:182
diff --git a/perl-install/share/po/bg.po b/perl-install/share/po/bg.po
index 84c2715f0..f5eb025ab 100644
--- a/perl-install/share/po/bg.po
+++ b/perl-install/share/po/bg.po
@@ -20042,7 +20042,7 @@ msgstr "Адрес на Локална мрежа"
#: standalone/drakgw:180
#, c-format
-msgid "Local IP adress"
+msgid "Local IP address"
msgstr ""
#: standalone/drakgw:182
diff --git a/perl-install/share/po/bn.po b/perl-install/share/po/bn.po
index f610a1342..804b43a6c 100644
--- a/perl-install/share/po/bn.po
+++ b/perl-install/share/po/bn.po
@@ -21190,7 +21190,7 @@ msgstr "স্থানীয় নেটওয়ার্ক অ্যাড্র
#: standalone/drakgw:180
#, c-format
-msgid "Local IP adress"
+msgid "Local IP address"
msgstr ""
#: standalone/drakgw:182
diff --git a/perl-install/share/po/br.po b/perl-install/share/po/br.po
index c925d2854..74a779366 100644
--- a/perl-install/share/po/br.po
+++ b/perl-install/share/po/br.po
@@ -18985,7 +18985,7 @@ msgstr "Chomlec'h ar rouedad lec'hel"
#: standalone/drakgw:180
#, c-format
-msgid "Local IP adress"
+msgid "Local IP address"
msgstr "Address IP lec'hel"
#: standalone/drakgw:182
diff --git a/perl-install/share/po/bs.po b/perl-install/share/po/bs.po
index ef67ab809..6e4e147a0 100644
--- a/perl-install/share/po/bs.po
+++ b/perl-install/share/po/bs.po
@@ -21546,7 +21546,7 @@ msgstr "Lokalna mrežna adresa"
#: standalone/drakgw:180
#, c-format
-msgid "Local IP adress"
+msgid "Local IP address"
msgstr ""
#: standalone/drakgw:182
diff --git a/perl-install/share/po/ca.po b/perl-install/share/po/ca.po
index e865d2a58..df0f3ecbe 100644
--- a/perl-install/share/po/ca.po
+++ b/perl-install/share/po/ca.po
@@ -21670,7 +21670,7 @@ msgstr "Paràmetres de la xarxa local"
#: standalone/drakgw:180
#, c-format
-msgid "Local IP adress"
+msgid "Local IP address"
msgstr "Adreça IP local"
#
diff --git a/perl-install/share/po/cs.po b/perl-install/share/po/cs.po
index 87eb7d4a6..28348c411 100644
--- a/perl-install/share/po/cs.po
+++ b/perl-install/share/po/cs.po
@@ -21458,7 +21458,7 @@ msgstr "Nastavení lokální sítě"
#: standalone/drakgw:180
#, c-format
-msgid "Local IP adress"
+msgid "Local IP address"
msgstr "Lokální IP adresa"
#: standalone/drakgw:182
diff --git a/perl-install/share/po/cy.po b/perl-install/share/po/cy.po
index 09e6c84ba..e97e3d5f2 100644
--- a/perl-install/share/po/cy.po
+++ b/perl-install/share/po/cy.po
@@ -21554,7 +21554,7 @@ msgstr "Gosodiadau Rhwydwaith Ardal Leol"
#: standalone/drakgw:180
#, c-format
-msgid "Local IP adress"
+msgid "Local IP address"
msgstr "Cyfeiriad IP lleol"
#: standalone/drakgw:182
diff --git a/perl-install/share/po/da.po b/perl-install/share/po/da.po
index a9e96b196..6bad34c81 100644
--- a/perl-install/share/po/da.po
+++ b/perl-install/share/po/da.po
@@ -21460,7 +21460,7 @@ msgstr "Adresse på lokalnetværk"
#: standalone/drakgw:180
#, c-format
-msgid "Local IP adress"
+msgid "Local IP address"
msgstr ""
#: standalone/drakgw:182
diff --git a/perl-install/share/po/de.po b/perl-install/share/po/de.po
index eff42115b..56799c8d7 100644
--- a/perl-install/share/po/de.po
+++ b/perl-install/share/po/de.po
@@ -21881,7 +21881,7 @@ msgstr "Einstellungen des lokalen Netzwerkes"
#: standalone/drakgw:180
#, c-format
-msgid "Local IP adress"
+msgid "Local IP address"
msgstr "Lokale IP-Adresse"
#: standalone/drakgw:182
diff --git a/perl-install/share/po/el.po b/perl-install/share/po/el.po
index d932c28aa..22a46dc1c 100644
--- a/perl-install/share/po/el.po
+++ b/perl-install/share/po/el.po
@@ -20640,7 +20640,7 @@ msgstr "Τοπική διεύθυνση δικτύου"
#: standalone/drakgw:180
#, c-format
-msgid "Local IP adress"
+msgid "Local IP address"
msgstr ""
#: standalone/drakgw:182
diff --git a/perl-install/share/po/eo.po b/perl-install/share/po/eo.po
index 06b27342f..0c08ebdf3 100644
--- a/perl-install/share/po/eo.po
+++ b/perl-install/share/po/eo.po
@@ -19284,7 +19284,7 @@ msgstr "neniu retkarto trovita"
#: standalone/drakgw:180
#, c-format
-msgid "Local IP adress"
+msgid "Local IP address"
msgstr ""
#: standalone/drakgw:182
diff --git a/perl-install/share/po/es.po b/perl-install/share/po/es.po
index f1f1d9a9d..d8b284c3e 100644
--- a/perl-install/share/po/es.po
+++ b/perl-install/share/po/es.po
@@ -21833,7 +21833,7 @@ msgstr "Dirección de red local"
#: standalone/drakgw:180
#, c-format
-msgid "Local IP adress"
+msgid "Local IP address"
msgstr ""
#: standalone/drakgw:182
diff --git a/perl-install/share/po/et.po b/perl-install/share/po/et.po
index 6a27211d2..51165e413 100644
--- a/perl-install/share/po/et.po
+++ b/perl-install/share/po/et.po
@@ -21508,7 +21508,7 @@ msgstr "Kohtvõrgu seadistused"
#: standalone/drakgw:180
#, c-format
-msgid "Local IP adress"
+msgid "Local IP address"
msgstr "Kohalik IP-aadress"
#: standalone/drakgw:182
diff --git a/perl-install/share/po/eu.po b/perl-install/share/po/eu.po
index 7525d96db..e8bf18a51 100644
--- a/perl-install/share/po/eu.po
+++ b/perl-install/share/po/eu.po
@@ -21608,7 +21608,7 @@ msgstr "Bertako Eremuko Sare ezarpenak"
#: standalone/drakgw:180
#, c-format
-msgid "Local IP adress"
+msgid "Local IP address"
msgstr "Bertako IP helbidea"
#: standalone/drakgw:182
diff --git a/perl-install/share/po/fa.po b/perl-install/share/po/fa.po
index b052c5e94..28722846e 100644
--- a/perl-install/share/po/fa.po
+++ b/perl-install/share/po/fa.po
@@ -21404,7 +21404,7 @@ msgstr "نشانی شبکه‌ی محلی"
#: standalone/drakgw:180
#, c-format
-msgid "Local IP adress"
+msgid "Local IP address"
msgstr ""
#: standalone/drakgw:182
diff --git a/perl-install/share/po/fi.po b/perl-install/share/po/fi.po
index 3008b68de..d986fa905 100644
--- a/perl-install/share/po/fi.po
+++ b/perl-install/share/po/fi.po
@@ -21701,7 +21701,7 @@ msgstr "Paikallisverkko-osoite"
#: standalone/drakgw:180
#, c-format
-msgid "Local IP adress"
+msgid "Local IP address"
msgstr ""
#: standalone/drakgw:182
diff --git a/perl-install/share/po/fr.po b/perl-install/share/po/fr.po
index c546c3a36..35ae89c13 100644
--- a/perl-install/share/po/fr.po
+++ b/perl-install/share/po/fr.po
@@ -21981,7 +21981,7 @@ msgstr "Configuration du Réseau Local"
#: standalone/drakgw:180
#, c-format
-msgid "Local IP adress"
+msgid "Local IP address"
msgstr "Adresse IP locale"
#: standalone/drakgw:182
diff --git a/perl-install/share/po/fur.po b/perl-install/share/po/fur.po
index 596566cfd..87c54f6b5 100644
--- a/perl-install/share/po/fur.po
+++ b/perl-install/share/po/fur.po
@@ -18690,7 +18690,7 @@ msgstr ""
#: standalone/drakgw:180
#, c-format
-msgid "Local IP adress"
+msgid "Local IP address"
msgstr ""
#: standalone/drakgw:182
diff --git a/perl-install/share/po/ga.po b/perl-install/share/po/ga.po
index e72d727e3..b20c89bc4 100644
--- a/perl-install/share/po/ga.po
+++ b/perl-install/share/po/ga.po
@@ -18729,7 +18729,7 @@ msgstr "ní fuaireathas cárta gréasánú"
#: standalone/drakgw:180
#, c-format
-msgid "Local IP adress"
+msgid "Local IP address"
msgstr ""
#: standalone/drakgw:182
diff --git a/perl-install/share/po/gl.po b/perl-install/share/po/gl.po
index 73fe26701..5772f2a3a 100644
--- a/perl-install/share/po/gl.po
+++ b/perl-install/share/po/gl.po
@@ -20682,7 +20682,7 @@ msgstr "Enderezo da Rede Local"
#: standalone/drakgw:180
#, c-format
-msgid "Local IP adress"
+msgid "Local IP address"
msgstr ""
#: standalone/drakgw:182
diff --git a/perl-install/share/po/he.po b/perl-install/share/po/he.po
index 396012049..9f886bef9 100644
--- a/perl-install/share/po/he.po
+++ b/perl-install/share/po/he.po
@@ -20111,7 +20111,7 @@ msgstr "הגדרות רשת מקומית"
#: standalone/drakgw:180
#, c-format
-msgid "Local IP adress"
+msgid "Local IP address"
msgstr "כתובת IP מקומית"
#: standalone/drakgw:182
diff --git a/perl-install/share/po/hi.po b/perl-install/share/po/hi.po
index af7a39bb8..d3d819c6c 100644
--- a/perl-install/share/po/hi.po
+++ b/perl-install/share/po/hi.po
@@ -20312,7 +20312,7 @@ msgstr "स्थानीय नेटवर्क का पता"
#: standalone/drakgw:180
#, c-format
-msgid "Local IP adress"
+msgid "Local IP address"
msgstr ""
#: standalone/drakgw:182
diff --git a/perl-install/share/po/hr.po b/perl-install/share/po/hr.po
index 475d48278..735f02db2 100644
--- a/perl-install/share/po/hr.po
+++ b/perl-install/share/po/hr.po
@@ -20413,7 +20413,7 @@ msgstr "C-Class lokalna mreža"
#: standalone/drakgw:180
#, c-format
-msgid "Local IP adress"
+msgid "Local IP address"
msgstr ""
#: standalone/drakgw:182
diff --git a/perl-install/share/po/hu.po b/perl-install/share/po/hu.po
index eb741bfa1..4338797ac 100644
--- a/perl-install/share/po/hu.po
+++ b/perl-install/share/po/hu.po
@@ -21768,7 +21768,7 @@ msgstr "Helyi hálózati cím"
#: standalone/drakgw:180
#, c-format
-msgid "Local IP adress"
+msgid "Local IP address"
msgstr ""
#: standalone/drakgw:182
diff --git a/perl-install/share/po/id.po b/perl-install/share/po/id.po
index dd6b9f124..76e06ead3 100644
--- a/perl-install/share/po/id.po
+++ b/perl-install/share/po/id.po
@@ -21756,7 +21756,7 @@ msgstr "Setting Local Area Network"
#: standalone/drakgw:180
#, c-format
-msgid "Local IP adress"
+msgid "Local IP address"
msgstr "Alamat IP Lokal"
#: standalone/drakgw:182
diff --git a/perl-install/share/po/is.po b/perl-install/share/po/is.po
index 787fd3081..074f480dc 100644
--- a/perl-install/share/po/is.po
+++ b/perl-install/share/po/is.po
@@ -21449,7 +21449,7 @@ msgstr "Stillingar staðbundins nets"
#: standalone/drakgw:180
#, c-format
-msgid "Local IP adress"
+msgid "Local IP address"
msgstr "Staðbundin IP-tala"
#: standalone/drakgw:182
diff --git a/perl-install/share/po/it.po b/perl-install/share/po/it.po
index df200b736..894503aee 100644
--- a/perl-install/share/po/it.po
+++ b/perl-install/share/po/it.po
@@ -21745,7 +21745,7 @@ msgstr "Indirizzo rete locale"
#: standalone/drakgw:180
#, c-format
-msgid "Local IP adress"
+msgid "Local IP address"
msgstr ""
#: standalone/drakgw:182
diff --git a/perl-install/share/po/ja.po b/perl-install/share/po/ja.po
index ddf49ac1f..5fdbddd44 100644
--- a/perl-install/share/po/ja.po
+++ b/perl-install/share/po/ja.po
@@ -21193,7 +21193,7 @@ msgstr "ローカルネットワークの設定"
#: standalone/drakgw:180
#, c-format
-msgid "Local IP adress"
+msgid "Local IP address"
msgstr "ローカルIPアドレス"
#: standalone/drakgw:182
diff --git a/perl-install/share/po/ko.po b/perl-install/share/po/ko.po
index 49b2d5ba7..5cf6aafb1 100644
--- a/perl-install/share/po/ko.po
+++ b/perl-install/share/po/ko.po
@@ -19527,7 +19527,7 @@ msgstr "C 클래스 지역 네트웍"
#: standalone/drakgw:180
#, c-format
-msgid "Local IP adress"
+msgid "Local IP address"
msgstr ""
#: standalone/drakgw:182
diff --git a/perl-install/share/po/ky.po b/perl-install/share/po/ky.po
index d4bc6caf4..ddbb05624 100644
--- a/perl-install/share/po/ky.po
+++ b/perl-install/share/po/ky.po
@@ -19447,7 +19447,7 @@ msgstr "Локалдык желе"
#: standalone/drakgw:180
#, c-format
-msgid "Local IP adress"
+msgid "Local IP address"
msgstr ""
#: standalone/drakgw:182
diff --git a/perl-install/share/po/lt.po b/perl-install/share/po/lt.po
index fb1e18bc7..d09ae7ee7 100644
--- a/perl-install/share/po/lt.po
+++ b/perl-install/share/po/lt.po
@@ -19318,7 +19318,7 @@ msgstr "nerasta jokia tinklo plokštė"
#: standalone/drakgw:180
#, c-format
-msgid "Local IP adress"
+msgid "Local IP address"
msgstr ""
#: standalone/drakgw:182
diff --git a/perl-install/share/po/ltg.po b/perl-install/share/po/ltg.po
index 43c7c67f3..b56c1950f 100644
--- a/perl-install/share/po/ltg.po
+++ b/perl-install/share/po/ltg.po
@@ -19743,7 +19743,7 @@ msgstr "Lokaluo teikla adrese"
#: standalone/drakgw:180
#, c-format
-msgid "Local IP adress"
+msgid "Local IP address"
msgstr ""
#: standalone/drakgw:182
diff --git a/perl-install/share/po/lv.po b/perl-install/share/po/lv.po
index e9dbc43f3..b96bc8350 100644
--- a/perl-install/share/po/lv.po
+++ b/perl-install/share/po/lv.po
@@ -19718,7 +19718,7 @@ msgstr "Lokālā tīkla adrese"
#: standalone/drakgw:180
#, c-format
-msgid "Local IP adress"
+msgid "Local IP address"
msgstr ""
#: standalone/drakgw:182
diff --git a/perl-install/share/po/mk.po b/perl-install/share/po/mk.po
index 4ba4adba6..c91c44600 100644
--- a/perl-install/share/po/mk.po
+++ b/perl-install/share/po/mk.po
@@ -20797,7 +20797,7 @@ msgstr "Локален Мрежа"
#: standalone/drakgw:180
#, c-format
-msgid "Local IP adress"
+msgid "Local IP address"
msgstr ""
#: standalone/drakgw:182
diff --git a/perl-install/share/po/mn.po b/perl-install/share/po/mn.po
index bff4e0d4b..9075567fe 100644
--- a/perl-install/share/po/mn.po
+++ b/perl-install/share/po/mn.po