summaryrefslogtreecommitdiffstats
path: root/perl-install/partition_table/gpt.pm
blob: bb1cb82a41362194636eb31327a2d7776fcbe5fe (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
package partition_table::gpt; # $Id$

use diagnostics;
use strict;
use vars qw(@ISA);

@ISA = qw(partition_table::raw);

use common;
use partition_table::raw;
use partition_table::dos;
use partition_table;
use c;

my %gpt_types = (
  0x00 => "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
  0x82 => "\x6d\xfd\x57\x06\xab\xa4\xc4\x43\x84\xe5\x09\x33\xc8\x4b\x4f\x4f",
  0x83 => "\xA2\xA0\xD0\xEB\xE5\xB9\x33\x44\x87\xC0\x68\xB6\xB7\x26\x99\xC7",
  0x8e => "\x79\xd3\xd6\xe6\x07\xf5\xc2\x44\xa2\x3c\x23\x8f\x2a\x3d\xf9\x28",
  0xfd => "\x0f\x88\x9d\xa1\xfc\x05\x3b\x4d\xa0\x06\x74\x3f\x0f\x84\x91\x1e",
  0xef => "\x28\x73\x2A\xC1\x1F\xF8\xd2\x11\xBA\x4B\x00\xA0\xC9\x3E\xC9\x3B",
  # legacy_partition_table => "\x41\xEE\x4D\x02\xE7\x33\xd3\x11\x9D\x69\x00\x08\xC7\x81\xF3\x9F"
  # PARTITION_MSFT_RESERVED_GUID "\x16\xE3\xC9\xE3\x5C\x0B\xB8\x4D\x81\x7D\xF9\x2D\xF0\x02\x15\xAE"
  #PARTITION_RESERVED_GUID "\x39\x33\xa6\x8d\x07\x00\xc0\x60\xc4\x36\x08\x3a\xc8\x23\x09\x08"
);

my $current_revision = 0x00010200;
my ($main_format, $main_fields) = list2kv(
  a8    => 'magic',
  V     => 'revision',
  V     => 'headerSize',
  V     => 'headerCRC32',
  a4    => 'blank1',
  Q     => 'myLBA',
  Q     => 'alternateLBA',
  Q     => 'firstUsableLBA',
  Q     => 'lastUsableLBA',
  a16   => 'guid',
  Q     => 'partitionEntriesLBA',
  V     => 'nbPartitions',
  V     => 'partitionEntrySize',
  V     => 'partitionEntriesCRC32',
);

my ($partitionEntry_format, $partitionEntry_fields) = list2kv(
  a16   => 'gpt_type',
  a16   => 'guid',
  Q     => 'start',
  Q     => 'ending',
  a8    => 'efi_attributes',
  a72   => 'name',
);

my ($guid_format, $guid_fields) = list2kv(
  N     => 'time_low',
  n     => 'time_mid',
  n     => 'time_hi_and_version',
  n     => 'clock_seq',
  a6    => 'node',
);

$_ = join('', @$_) foreach $main_format, $partitionEntry_format, $guid_format;

my $magic = "EFI PART";

sub generate_guid() {
    my $tmp;
    open(my $F, devices::make("random")) or die "Could not open /dev/random for GUID generation";
    read $F, $tmp, psizeof($guid_format);
	
    my %guid; @guid{@$guid_fields} = unpack $guid_format, $tmp;
    $guid{clock_seq} = ($guid{clock_seq} & 0x3fff) | 0x8000;
    $guid{time_hi_and_version} = ($guid{time_hi_and_version} & 0x0fff) | 0x4000;
    pack($guid_format, @guid{@$guid_fields});
}

sub crc32 {
    my ($buffer) = @_;

    my $crc = 0xFFFFFFFF;
    foreach (unpack "C*", $buffer) {
	my $subcrc = ($crc ^ $_) & 0xFF;
        for (my $j = 8; $j > 0; $j--) {
	    my $b = $subcrc & 1;
	    $subcrc = ($subcrc >> 1) & 0x7FFFFFFF;
	    $subcrc = $subcrc ^ 0xEDB88320 if $b;
        }
        $crc = ($crc >> 8) ^ $subcrc;
    }
    $crc ^ 0xFFFFFFFF;
}

sub compute_headerCRC32 {
    my ($info) = @_;
    local $info->{headerCRC32} = 0;
    crc32(pack($main_format, @$info{@$main_fields}));
}

sub read_header {
    my ($sector, $F) = @_;
    my $tmp;

    c::lseek_sector(fileno($F), $sector, 0) or die "reading of partition in sector $sector failed";

    sysread $F, $tmp, psizeof($main_format) or die "error while reading partition table in sector $sector";
    my %info; @info{@$main_fields} = unpack $main_format, $tmp;
    
    $info{magic} eq $magic or die "bad magic number";
    $info{myLBA} == $sector or die "myLBA is not the same";
    $info{headerSize} == psizeof($main_format) or die "bad partition table header size";
    $info{partitionEntrySize} == psizeof($partitionEntry_format) or die "bad partitionEntrySize";
    $info{revision} <= $current_revision or log::l("oops, this is a new GPT revision ($info{revision} > $current_revision)");

    $info{headerCRC32} == compute_headerCRC32(\%info) or die "bad partition table checksum";
    \%info
}

sub read_partitionEntries {
    my ($info, $F) = @_;
    my $tmp;

    c::lseek_sector(fileno($F), $info->{partitionEntriesLBA}, 0) or die "can't seek to sector partitionEntriesLBA";
    sysread $F, $tmp, psizeof($partitionEntry_format) * $info->{nbPartitions} or die "error while reading partition table in sector $info->{partitionEntriesLBA}";
    $info->{partitionEntriesCRC32} == crc32($tmp) or die "bad partition entries checksum";

    c::lseek_sector(fileno($F), $info->{partitionEntriesLBA}, 0) or die "can't seek to sector partitionEntriesLBA";
    my %gpt_types_rev = reverse %gpt_types;
    my @pt = 
      map {
	sysread $F, $tmp, psizeof($partitionEntry_format) or die "error while reading partition table in sector $info->{partitionEntriesLBA}";
	my %h; @h{@$partitionEntry_fields} = unpack $partitionEntry_format, $tmp;
	$h{size} = $h{ending} - $h{start} + 1;
	$h{type} = $gpt_types_rev{$h{gpt_type}};
	$h{type} = 0x100 if !defined $h{type};
	\%h;
    } (1 .. $info->{nbPartitions});
    \@pt;
}

sub read {
    my ($hd, $sector) = @_;

    my $l = partition_table::dos::read($hd, $sector);
    my @l = grep { $_->{size} && $_->{type} && !partition_table::isExtended($_) } @$l;
    @l == 1 or die "bad PMBR";
    $l[0]{type} == 0xee or die "bad PMBR";
    my $myLBA = $l[0]{start};

    my $F = partition_table::raw::openit($hd) or die "failed to open device";
    my $info1 = eval { read_header($myLBA, $F) };
    my $info2 = eval { read_header($info1->{alternateLBA} || $l[0]{start} + $l[0]{size} - 1, $F) }; #- what about using $hd->{totalsectors} ???
    my $info = $info1 || { %$info2, myLBA => $info2->{alternateLBA}, alternateLBA => $info2->{myLBA}, partitionEntriesLBA => $info2->{alternateLBA} + 1 } or die;
    my $pt = $info1 && $info2 ? 
	eval { $info1 && read_partitionEntries($info1, $F) } || read_partitionEntries($info2, $F) :
	read_partitionEntries($info, $F);
    $hd->raw_removed($pt);

    $pt, $info;
}

# write the partition table (and extended ones)
# for each entry, it uses fields: start, size, type, active
sub write {
    my ($hd, $sector, $pt, $info) = @_;

    foreach (@$pt) {
	$_->{ending} = $_->{start} + $_->{size} - 1;
	$_->{guid} ||= generate_guid();
	$_->{gpt_type} = $gpt_types{$_->{type}} || $_->{gpt_type} || $gpt_types{0x83};
    }
    my $partitionEntries = join('', map {
	pack($partitionEntry_format, @$_{@$partitionEntry_fields})	
    } (@$pt, ({}) x ($info->{nbPartitions} - @$pt)));

    $info->{partitionEntriesCRC32} = crc32($partitionEntries);
    $info->{headerCRC32} = compute_headerCRC32($info);

    my $info2 = { %$info, 
		  myLBA => $info->{alternateLBA}, alternateLBA => $info->{myLBA}, 
		  partitionEntriesLBA => $info->{alternateLBA} - psizeof($partitionEntry_format) * $info->{nbPartitions} / 512,
		};
    $info2->{headerCRC32} = compute_headerCRC32($info2);

    {
	# write the PMBR
	my $pmbr = partition_table::dos::clear_raw();
	$pmbr->{raw}[0] = { type => 0xee, local_start => $info->{myLBA}, size => $info->{alternateLBA} - $info->{myLBA} + 1 };
	partition_table::dos::write($hd, $sector, $pmbr->{raw});
    }

    my $F = partition_table::raw::openit($hd, 2) or die "error opening device $hd->{device} for writing";
    
    c::lseek_sector(fileno($F), $info->{myLBA}, 0) or return 0;
    #- pad with 0's
    syswrite $F, pack($main_format, @$info{@$main_fields}) . "\0" x 512, 512 or return 0;

    c::lseek_sector(fileno($F), $info->{alternateLBA}, 0) or return 0;
    #- pad with 0's
    syswrite $F, pack($main_format, @$info2{@$main_fields}) . "\0" x 512, 512 or return 0;

    c::lseek_sector(fileno($F), $info->{partitionEntriesLBA}, 0) or return 0;
    syswrite $F, $partitionEntries or return 0;
    
    c::lseek_sector(fileno($F), $info2->{partitionEntriesLBA}, 0) or return 0;
    syswrite $F, $partitionEntries or return 0;

    common::sync();
    1;
}

sub raw_removed {
    my ($_hd, $raw) = @_;
    @$raw = grep { $_->{size} && $_->{type} } @$raw;
}
sub can_raw_add {
    my ($hd) = @_;
    @{$hd->{primary}{raw}} < $hd->{primary}{info}{nbPartitions};
}
sub raw_add {
    my ($hd, $raw, $part) = @_;
    $hd->can_raw_add or die "raw_add: partition table already full";
    push @$raw, $part;
}

sub adjustStart {}
sub adjustEnd {}

sub first_usable_sector {
    my ($hd) = @_;
    $hd->{primary}{info}{firstUsableLBA};
}
sub last_usable_sector { 
    my ($hd) = @_;
    $hd->{primary}{info}{lastUsableLBA} + 1;
}

sub info {
    my ($hd) = @_;
    my $nb_sect = 32;

    #- build a default suitable partition table,
    #- checksum will be built when writing on disk.
    {
	magic => $magic,
	revision => $current_revision,
	headerSize => psizeof($main_format),
	myLBA => 1,
	alternateLBA => $hd->{totalsectors} - 1,
	firstUsableLBA => $nb_sect + 2,
	lastUsableLBA => $hd->{totalsectors} - $nb_sect - 2,
	guid => generate_guid(),
	partitionEntriesLBA => 2,
	nbPartitions => $nb_sect * 512 / psizeof($partitionEntry_format),
	partitionEntrySize => psizeof($partitionEntry_format),
    };
}

sub clear_raw {
    my ($hd) = @_;
    { raw => [], info => info($hd) };
}

1;
class='ctx'> #: network/netconnect.pm:1037 printer/printerdrake.pm:1605
#: standalone/drakconnect:649
diff --git a/perl-install/share/po/el.po b/perl-install/share/po/el.po
index 06d068eae..2fa746ae8 100644
--- a/perl-install/share/po/el.po
+++ b/perl-install/share/po/el.po
@@ -10495,15 +10495,7 @@ msgstr "Χρόνος εκτός σύνδεσης (σε δεύτερα)"
msgid "Get DNS servers from DHCP"
msgstr "Η IP του εξυπηρετητή DNS"
-#: network/netconnect.pm:1043
-#, c-format
-msgid "Get YP server from DHCP"
-msgstr ""
-#: network/netconnect.pm:1044
-#, c-format
-msgid "Get NTPD server from DHCP"
-msgstr ""
#: network/netconnect.pm:1037 printer/printerdrake.pm:1605
#: standalone/drakconnect:649
diff --git a/perl-install/share/po/eo.po b/perl-install/share/po/eo.po
index 8b64745d5..28781ec37 100644
--- a/perl-install/share/po/eo.po
+++ b/perl-install/share/po/eo.po
@@ -9691,15 +9691,7 @@ msgstr "Speco de konekto"
msgid "Get DNS servers from DHCP"
msgstr "IP de SMB servilo"
-#: network/netconnect.pm:1043
-#, c-format
-msgid "Get YP server from DHCP"
-msgstr ""
-#: network/netconnect.pm:1044
-#, c-format
-msgid "Get NTPD server from DHCP"
-msgstr ""
#: network/netconnect.pm:1037 printer/printerdrake.pm:1605
#: standalone/drakconnect:649
diff --git a/perl-install/share/po/es.po b/perl-install/share/po/es.po
index 2d0f666a3..563cdcb44 100644
--- a/perl-install/share/po/es.po
+++ b/perl-install/share/po/es.po
@@ -10959,15 +10959,7 @@ msgstr "Demora de la conexión (en seg)"
msgid "Get DNS servers from DHCP"
msgstr "La IP del servidor DNS"
-#: network/netconnect.pm:1043
-#, c-format
-msgid "Get YP server from DHCP"
-msgstr ""
-#: network/netconnect.pm:1044
-#, c-format
-msgid "Get NTPD server from DHCP"
-msgstr ""
#: network/netconnect.pm:1037 printer/printerdrake.pm:1605
#: standalone/drakconnect:649
diff --git a/perl-install/share/po/et.po b/perl-install/share/po/et.po
index aae98a50c..8ebcac272 100644
--- a/perl-install/share/po/et.po
+++ b/perl-install/share/po/et.po
@@ -10788,15 +10788,7 @@ msgstr "Ühenduse aegumine (sekundites)"
msgid "Get DNS servers from DHCP"
msgstr "Nimeserveri IP"
-#: network/netconnect.pm:1043
-#, c-format
-msgid "Get YP server from DHCP"
-msgstr ""
-#: network/netconnect.pm:1044
-#, c-format
-msgid "Get NTPD server from DHCP"
-msgstr ""
#: network/netconnect.pm:1037 printer/printerdrake.pm:1605
#: standalone/drakconnect:649
diff --git a/perl-install/share/po/eu.po b/perl-install/share/po/eu.po
index e6fdd48ec..437efe887 100644
--- a/perl-install/share/po/eu.po
+++ b/perl-install/share/po/eu.po
@@ -10882,15 +10882,7 @@ msgstr "Konexioaren denbora-muga (segundotan)"
msgid "Get DNS servers from DHCP"
msgstr "DNS zerbitzariaren IPa"
-#: network/netconnect.pm:1043
-#, c-format
-msgid "Get YP server from DHCP"
-msgstr ""
-#: network/netconnect.pm:1044
-#, c-format
-msgid "Get NTPD server from DHCP"
-msgstr ""
#: network/netconnect.pm:1037 printer/printerdrake.pm:1605
#: standalone/drakconnect:649
diff --git a/perl-install/share/po/fa.po b/perl-install/share/po/fa.po
index a580912be..3e898598f 100644
--- a/perl-install/share/po/fa.po
+++ b/perl-install/share/po/fa.po
@@ -10763,15 +10763,7 @@ msgstr "زمان‌انتظار اتصال (ثانیه)"
msgid "Get DNS servers from DHCP"
msgstr "آی‌پی کارگزار DNS"
-#: network/netconnect.pm:1043
-#, c-format
-msgid "Get YP server from DHCP"
-msgstr ""
-#: network/netconnect.pm:1044
-#, c-format
-msgid "Get NTPD server from DHCP"
-msgstr ""
#: network/netconnect.pm:1037 printer/printerdrake.pm:1605
#: standalone/drakconnect:649
diff --git a/perl-install/share/po/fi.po b/perl-install/share/po/fi.po
index 0b859008e..bd721ff7a 100644
--- a/perl-install/share/po/fi.po
+++ b/perl-install/share/po/fi.po
@@ -10926,15 +10926,7 @@ msgstr "Yhteyden aikakatkaisu (sekunneissa)"
msgid "Get DNS servers from DHCP"
msgstr "DNS-palvelimen IP-osoite"
-#: network/netconnect.pm:1043
-#, c-format
-msgid "Get YP server from DHCP"
-msgstr ""
-#: network/netconnect.pm:1044
-#, c-format
-msgid "Get NTPD server from DHCP"
-msgstr ""
#: network/netconnect.pm:1037 printer/printerdrake.pm:1605
#: standalone/drakconnect:649
diff --git a/perl-install/share/po/fr.po b/perl-install/share/po/fr.po
index a8541d6f5..fac7d8d86 100644
--- a/perl-install/share/po/fr.po
+++ b/perl-install/share/po/fr.po
@@ -11004,15 +11004,7 @@ msgstr "Temps maxi pour établir la connexion (en sec.)"
msgid "Get DNS servers from DHCP"
msgstr "L'adresse IP du serveur DNS"
-#: network/netconnect.pm:1043
-#, c-format
-msgid "Get YP server from DHCP"
-msgstr ""
-#: network/netconnect.pm:1044
-#, c-format
-msgid "Get NTPD server from DHCP"
-msgstr ""
#: network/netconnect.pm:1037 printer/printerdrake.pm:1605
#: standalone/drakconnect:649
diff --git a/perl-install/share/po/fur.po b/perl-install/share/po/fur.po
index 8bf2199f1..97a524afa 100644
--- a/perl-install/share/po/fur.po
+++ b/perl-install/share/po/fur.po
@@ -9333,15 +9333,7 @@ msgstr ""
msgid "Get DNS servers from DHCP"
msgstr ""
-#: network/netconnect.pm:1043
-#, c-format
-msgid "Get YP server from DHCP"
-msgstr ""
-#: network/netconnect.pm:1044
-#, c-format
-msgid "Get NTPD server from DHCP"
-msgstr ""
#: network/netconnect.pm:1037 printer/printerdrake.pm:1605
#: standalone/drakconnect:649
diff --git a/perl-install/share/po/ga.po b/perl-install/share/po/ga.po
index 48b7ab9cb..4d2ac5233 100644
--- a/perl-install/share/po/ga.po
+++ b/perl-install/share/po/ga.po
@@ -9374,15 +9374,7 @@ msgstr "Ainm Nasc"
msgid "Get DNS servers from DHCP"
msgstr "IP freastalaí SMP"
-#: network/netconnect.pm:1043
-#, c-format
-msgid "Get YP server from DHCP"
-msgstr ""
-#: network/netconnect.pm:1044
-#, c-format
-msgid "Get NTPD server from DHCP"
-msgstr ""
#: network/netconnect.pm:1037 printer/printerdrake.pm:1605
#: standalone/drakconnect:649
diff --git a/perl-install/share/po/gl.po b/perl-install/share/po/gl.po
index ebc3051cd..88a5f0d13 100644
--- a/perl-install/share/po/gl.po
+++ b/perl-install/share/po/gl.po
@@ -9816,15 +9816,7 @@ msgstr "Tipo de conexión: "
msgid "Get DNS servers from DHCP"
msgstr "IP do Servidor DNS"
-#: network/netconnect.pm:1043
-#, c-format
-msgid "Get YP server from DHCP"
-msgstr ""
-#: network/netconnect.pm:1044
-#, c-format
-msgid "Get NTPD server from DHCP"
-msgstr ""
#: network/netconnect.pm:1037 printer/printerdrake.pm:1605
#: standalone/drakconnect:649
diff --git a/perl-install/share/po/he.po b/perl-install/share/po/he.po
index 7d452059c..f76b5bfe2 100644
--- a/perl-install/share/po/he.po
+++ b/perl-install/share/po/he.po
@@ -10126,15 +10126,7 @@ msgstr "תפוגת חיבור (בשניות)"
msgid "Get DNS servers from DHCP"
msgstr "שרתי DNS"
-#: network/netconnect.pm:1043
-#, c-format
-msgid "Get YP server from DHCP"
-msgstr ""
-#: network/netconnect.pm:1044
-#, c-format
-msgid "Get NTPD server from DHCP"
-msgstr ""
#: network/netconnect.pm:1037 printer/printerdrake.pm:1605
#: standalone/drakconnect:649
diff --git a/perl-install/share/po/hi.po b/perl-install/share/po/hi.po
index 343d1892f..18c030386 100644
--- a/perl-install/share/po/hi.po
+++ b/perl-install/share/po/hi.po
@@ -10253,15 +10253,7 @@ msgstr "संबंध समय- सीमा समाप्ति (पलो
msgid "Get DNS servers from DHCP"
msgstr "डीएनएस सर्वर आईपी"
-#: network/netconnect.pm:1043
-#, c-format
-msgid "Get YP server from DHCP"
-msgstr ""
-#: network/netconnect.pm:1044
-#, c-format
-msgid "Get NTPD server from DHCP"
-msgstr ""
#: network/netconnect.pm:1037 printer/printerdrake.pm:1605
#: standalone/drakconnect:649
diff --git a/perl-install/share/po/hr.po b/perl-install/share/po/hr.po
index b18dfd07c..f34fc7fbf 100644
--- a/perl-install/share/po/hr.po
+++ b/perl-install/share/po/hr.po
@@ -10445,15 +10445,7 @@ msgstr "Vrijeme čekanja veze (u sek)"
msgid "Get DNS servers from DHCP"
msgstr "IP (ovog) DHCP poslužitelja"
-#: network/netconnect.pm:1043
-#, c-format
-msgid "Get YP server from DHCP"
-msgstr ""
-#: network/netconnect.pm:1044
-#, c-format
-msgid "Get NTPD server from DHCP"
-msgstr ""
#: network/netconnect.pm:1037 printer/printerdrake.pm:1605
#: standalone/drakconnect:649
diff --git a/perl-install/share/po/hu.po b/perl-install/share/po/hu.po
index d5e56cac3..e97d46158 100644
--- a/perl-install/share/po/hu.po
+++ b/perl-install/share/po/hu.po
@@ -10898,15 +10898,7 @@ msgstr "A csatlakozás várakozási ideje (másodpercben)"
msgid "Get DNS servers from DHCP"
msgstr "A DNS-kiszolgáló IP-címe"
-#: network/netconnect.pm:1043
-#, c-format
-msgid "Get YP server from DHCP"
-msgstr ""
-#: network/netconnect.pm:1044
-#, c-format
-msgid "Get NTPD server from DHCP"
-msgstr ""
#: network/netconnect.pm:1037 printer/printerdrake.pm:1605
#: standalone/drakconnect:649
diff --git a/perl-install/share/po/id.po b/perl-install/share/po/id.po
index 69a2254ad..085d312f5 100644
--- a/perl-install/share/po/id.po
+++ b/perl-install/share/po/id.po
@@ -10448,15 +10448,7 @@ msgstr "Timeout koneksi (detik)"
msgid "Get DNS servers from DHCP"
msgstr "IP Server DNS"
-#: network/netconnect.pm:1043
-#, c-format
-msgid "Get YP server from DHCP"
-msgstr ""
-#: network/netconnect.pm:1044
-#, c-format
-msgid "Get NTPD server from DHCP"
-msgstr ""
#: network/netconnect.pm:1037 printer/printerdrake.pm:1605
#: standalone/drakconnect:649
diff --git a/perl-install/share/po/is.po b/perl-install/share/po/is.po
index d67269ce2..e73465029 100644
--- a/perl-install/share/po/is.po
+++ b/perl-install/share/po/is.po
@@ -10126,15 +10126,7 @@ msgstr "Tenging fellur á tíma eftir (í sek)"
msgid "Get DNS servers from DHCP"
msgstr "Vistfang DNS þjóns"
-#: network/netconnect.pm:1043
-#, c-format
-msgid "Get YP server from DHCP"
-msgstr ""
-#: network/netconnect.pm:1044
-#, c-format
-msgid "Get NTPD server from DHCP"
-msgstr ""
#: network/netconnect.pm:1037 printer/printerdrake.pm:1605
#: standalone/drakconnect:649
diff --git a/perl-install/share/po/it.po b/perl-install/share/po/it.po
index d1ccd073d..6e892367c 100644
--- a/perl-install/share/po/it.po
+++ b/perl-install/share/po/it.po
@@ -10939,15 +10939,7 @@ msgstr "Timeout connessione (in sec.)"
msgid "Get DNS servers from DHCP"
msgstr "IP del server DNS"
-#: network/netconnect.pm:1043
-#, c-format
-msgid "Get YP server from DHCP"
-msgstr ""
-#: network/netconnect.pm:1044
-#, c-format
-msgid "Get NTPD server from DHCP"
-msgstr ""
#: network/netconnect.pm:1037 printer/printerdrake.pm:1605
#: standalone/drakconnect:649
diff --git a/perl-install/share/po/ja.po b/perl-install/share/po/ja.po
index a6d1ddf7e..4b7bcd35e 100644
--- a/perl-install/share/po/ja.po
+++ b/perl-install/share/po/ja.po
@@ -10617,15 +10617,7 @@ msgstr "接続のタイムアウト(秒)"
msgid "Get DNS servers from DHCP"
msgstr "DNSサーバのIP"
-#: network/netconnect.pm:1043
-#, c-format
-msgid "Get YP server from DHCP"
-msgstr ""
-#: network/netconnect.pm:1044
-#, c-format
-msgid "Get NTPD server from DHCP"
-msgstr ""
#: network/netconnect.pm:1037 printer/printerdrake.pm:1605
#: standalone/drakconnect:649
diff --git a/perl-install/share/po/ko.po b/perl-install/share/po/ko.po
index 049b54c50..08d5ca08a 100644
--- a/perl-install/share/po/ko.po
+++ b/perl-install/share/po/ko.po
@@ -9899,15 +9899,7 @@ msgstr "연결 시간초과 (초)"
msgid "Get DNS servers from DHCP"
msgstr "DHCP 서버 IP"
-#: network/netconnect.pm:1043
-#, c-format
-msgid "Get YP server from DHCP"
-msgstr ""
-#: network/netconnect.pm:1044
-#, c-format
-msgid "Get NTPD server from DHCP"
-msgstr ""
#: network/netconnect.pm:1037 printer/printerdrake.pm:1605
#: standalone/drakconnect:649
diff --git a/perl-install/share/po/ky.po b/perl-install/share/po/ky.po
index fb27b9665..ffa959f95 100644
--- a/perl-install/share/po/ky.po
+++ b/perl-install/share/po/ky.po
@@ -10001,15 +10001,7 @@ msgstr ""
msgid "Get DNS servers from DHCP"
msgstr ""
-#: network/netconnect.pm:1043
-#, c-format
-msgid "Get YP server from DHCP"
-msgstr ""
-#: network/netconnect.pm:1044
-#, c-format
-msgid "Get NTPD server from DHCP"
-msgstr ""
#: network/netconnect.pm:1037 printer/printerdrake.pm:1605
#: standalone/drakconnect:649
diff --git a/perl-install/share/po/lt.po b/perl-install/share/po/lt.po
index 07a60e285..37cd1c83e 100644
--- a/perl-install/share/po/lt.po
+++ b/perl-install/share/po/lt.po
@@ -9810,15 +9810,7 @@ msgstr "Jungties tipas: "
msgid "Get DNS servers from DHCP"
msgstr "CUPS serverio IP"
-#: network/netconnect.pm:1043
-#, c-format
-msgid "Get YP server from DHCP"
-msgstr ""
-#: network/netconnect.pm:1044
-#, c-format
-msgid "Get NTPD server from DHCP"
-msgstr ""
#: network/netconnect.pm:1037 printer/printerdrake.pm:1605
#: standalone/drakconnect:649
diff --git a/perl-install/share/po/ltg.po b/perl-install/share/po/ltg.po
index 097a1ec5f..1372f98d5 100644
--- a/perl-install/share/po/ltg.po
+++ b/perl-install/share/po/ltg.po
@@ -9999,15 +9999,7 @@ msgstr "Savīnuojuma taimauts (sek.)"
msgid "Get DNS servers from DHCP"
msgstr "DNS servera IP"
-#: network/netconnect.pm:1043
-#, c-format
-msgid "Get YP server from DHCP"
-msgstr ""
-#: network/netconnect.pm:1044
-#, c-format
-msgid "Get NTPD server from DHCP"
-msgstr ""
#: network/netconnect.pm:1037 printer/printerdrake.pm:1605
#: standalone/drakconnect:649
diff --git a/perl-install/share/po/lv.po b/perl-install/share/po/lv.po
index d9340144e..7de7d3a69 100644
--- a/perl-install/share/po/lv.po
+++ b/perl-install/share/po/lv.po
@@ -9936,15 +9936,7 @@ msgstr "Savienojuma taimauts (sek.)"
msgid "Get DNS servers from DHCP"
msgstr "DNS servera IP"
-#: network/netconnect.pm:1043
-#, c-format
-msgid "Get YP server from DHCP"
-msgstr ""
-#: network/netconnect.pm:1044
-#, c-format
-msgid "Get NTPD server from DHCP"
-msgstr ""
#: network/netconnect.pm:1037 printer/printerdrake.pm:1605
#: standalone/drakconnect:649
diff --git a/perl-install/share/po/mk.po b/perl-install/share/po/mk.po
index a7363906c..d35838562 100644
--- a/perl-install/share/po/mk.po
+++ b/perl-install/share/po/mk.po
@@ -10648,15 +10648,7 @@ msgstr "Пауза на врската (во секунди)"
msgid "Get DNS servers from DHCP"
msgstr "DNS Сервер IP"
-#: network/netconnect.pm:1043
-#, c-format
-msgid "Get YP server from DHCP"
-msgstr ""
-#: network/netconnect.pm:1044
-#, c-format
-msgid "Get NTPD server from DHCP"
-msgstr ""
#: network/netconnect.pm:1037 printer/printerdrake.pm:1605
#: standalone/drakconnect:649
diff --git a/perl-install/share/po/mn.po b/perl-install/share/po/mn.po
index cb4ade934..c5cbba569 100644
--- a/perl-install/share/po/mn.po
+++ b/perl-install/share/po/mn.po
@@ -9413,15 +9413,7 @@ msgstr "Холболт ямх"
msgid "Get DNS servers from DHCP"
msgstr ""
-#: network/netconnect.pm:1043
-#, c-format
-msgid "Get YP server from DHCP"
-msgstr ""
-#: network/netconnect.pm:1044
-#, c-format
-msgid "Get NTPD server from DHCP"
-msgstr ""
#: network/netconnect.pm:1037 printer/printerdrake.pm:1605
#: standalone/drakconnect:649
diff --git a/perl-install/share/po/ms.po b/perl-install/share/po/ms.po
index cd7605400..2d8527c09 100644
--- a/perl-install/share/po/ms.po
+++ b/perl-install/share/po/ms.po
@@ -9435,15 +9435,7 @@ msgstr "Tentukan jenis sambungan (dalam dec)"
msgid "Get DNS servers from DHCP"
msgstr "Alamat IP DCC:"
-#: network/netconnect.pm:1043
-#, c-format
-msgid "Get YP server from DHCP"
-msgstr ""
-#: network/netconnect.pm:1044
-#, c-format
-msgid "Get NTPD server from DHCP"
-msgstr ""
#: network/netconnect.pm:1037 printer/printerdrake.pm:1605
#: standalone/drakconnect:649
diff --git a/perl-install/share/po/mt.po b/perl-install/share/po/mt.po
index f83ce64bb..becbf52ea 100644
--- a/perl-install/share/po/mt.po
+++ b/perl-install/share/po/mt.po
@@ -10671,15 +10671,7 @@ msgstr "Ħin biex tiskadi l-konnessjoni (sek)"
msgid "Get DNS servers from DHCP"
msgstr "IP tas-server DHCP"
-#: network/netconnect.pm:1043
-#, c-format
-msgid "Get YP server from DHCP"
-msgstr ""
-#: network/netconnect.pm:1044
-#, c-format
-msgid "Get NTPD server from DHCP"
-msgstr ""
#: network/netconnect.pm:1037 printer/printerdrake.pm:1605
#: standalone/drakconnect:649
diff --git a/perl-install/share/po/nb.po b/perl-install/share/po/nb.po
index 9b6dd4945..355603b89 100644
--- a/perl-install/share/po/nb.po
+++ b/perl-install/share/po/nb.po