summaryrefslogtreecommitdiffstats
path: root/perl-install/share/po/cy.po
diff options
context:
space:
mode:
authorEugeni Dodonov <eugeni@mandriva.org>2009-03-27 01:29:51 +0000
committerEugeni Dodonov <eugeni@mandriva.org>2009-03-27 01:29:51 +0000
commitcdfa0121836db0a0e6b4f0832606a65cca2dba9b (patch)
tree17c826502279a4ee9788c72cf66a42db77f4db10 /perl-install/share/po/cy.po
parent878e9e2699abfa86cf1d7170932f70cf1a3a8187 (diff)
downloaddrakx-cdfa0121836db0a0e6b4f0832606a65cca2dba9b.tar
drakx-cdfa0121836db0a0e6b4f0832606a65cca2dba9b.tar.gz
drakx-cdfa0121836db0a0e6b4f0832606a65cca2dba9b.tar.bz2
drakx-cdfa0121836db0a0e6b4f0832606a65cca2dba9b.tar.xz
drakx-cdfa0121836db0a0e6b4f0832606a65cca2dba9b.zip
po: sync with the code.
Diffstat (limited to 'perl-install/share/po/cy.po')
-rw-r--r--perl-install/share/po/cy.po149
1 files changed, 77 insertions, 72 deletions
diff --git a/perl-install/share/po/cy.po b/perl-install/share/po/cy.po
index e2ec17413..38f05a8a5 100644
--- a/perl-install/share/po/cy.po
+++ b/perl-install/share/po/cy.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Mandriva DrakX.cy\n"
-"POT-Creation-Date: 2009-03-18 18:39+0100\n"
+"POT-Creation-Date: 2009-03-26 22:18-0300\n"
"PO-Revision-Date: 2009-02-27 08:42-0000\n"
"Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
"Language-Team: Cymraeg <post@meddal.com>\n"
@@ -16,7 +16,7 @@ msgstr ""
"X-Poedit-Country: UNITED KINGDOM\n"
"X-Poedit-SourceCharset: utf-8\n"
-#: any.pm:252 any.pm:862 diskdrake/interactive.pm:590
+#: any.pm:252 any.pm:863 diskdrake/interactive.pm:590
#: diskdrake/interactive.pm:790 diskdrake/interactive.pm:834
#: diskdrake/interactive.pm:920 diskdrake/interactive.pm:1174
#: diskdrake/interactive.pm:1226 do_pkgs.pm:241 do_pkgs.pm:287
@@ -472,77 +472,77 @@ msgstr "Enw mewngofnodi"
msgid "Shell"
msgstr "Cragen"
-#: any.pm:862
+#: any.pm:863
#, c-format
msgid "Please wait, adding media..."
msgstr "Arhoswch, ychwanegu cyfrwng..."
-#: any.pm:890 security/l10n.pm:14
+#: any.pm:892 security/l10n.pm:14
#, c-format
msgid "Autologin"
msgstr "Awto mewngofnodi"
-#: any.pm:891
+#: any.pm:893
#, c-format
msgid "I can set up your computer to automatically log on one user."
msgstr "Mewngofnodi'n awtomatig ar gyfer un defnyddiwr."
-#: any.pm:892
+#: any.pm:894
#, c-format
msgid "Use this feature"
msgstr "Defnyddiwch y nodwedd"
-#: any.pm:893
+#: any.pm:895
#, c-format
msgid "Choose the default user:"
msgstr "Dewis y defnyddiwr rhagosodedig:"
-#: any.pm:894
+#: any.pm:896
#, c-format
msgid "Choose the window manager to run:"
msgstr "Dewiswch y rheolwr ffenestr i redeg:"
-#: any.pm:905 any.pm:925 any.pm:986
+#: any.pm:907 any.pm:927 any.pm:988
#, c-format
msgid "Release Notes"
msgstr "Nodiadau Ryddhau"
-#: any.pm:932 any.pm:1278 interactive/gtk.pm:794
+#: any.pm:934 any.pm:1280 interactive/gtk.pm:794
#, c-format
msgid "Close"
msgstr "Cau"
-#: any.pm:972
+#: any.pm:974
#, c-format
msgid "License agreement"
msgstr "Cytundeb trwyddedu"
-#: any.pm:974 diskdrake/dav.pm:26
+#: any.pm:976 diskdrake/dav.pm:26
#, c-format
msgid "Quit"
msgstr "Gadael"
-#: any.pm:981
+#: any.pm:983
#, c-format
msgid "Do you accept this license ?"
msgstr "A ydych chi'n derbyn y drwydded hon?"
-#: any.pm:982
+#: any.pm:984
#, c-format
msgid "Accept"
msgstr "Derbyn"
-#: any.pm:982
+#: any.pm:984
#, c-format
msgid "Refuse"
msgstr "Gwrthod"
-#: any.pm:1008 any.pm:1074
+#: any.pm:1010 any.pm:1076
#, c-format
msgid "Please choose a language to use"
msgstr "Dewiswch iaith i'w defnyddio"
-#: any.pm:1037
+#: any.pm:1039
#, c-format
msgid ""
"Mandriva Linux can support multiple languages. Select\n"
@@ -553,77 +553,77 @@ msgstr ""
"pa iaith yr hoffech ei osod. Byddant ar gael pan fydd eich gosodiad\n"
"wedi ei gwblhau a phan fyddwch yn ail gychwyn eich system."
-#: any.pm:1040
+#: any.pm:1042
#, c-format
msgid "Multi languages"
msgstr "Amlieithog"
-#: any.pm:1051 any.pm:1083
+#: any.pm:1053 any.pm:1085
#, c-format
msgid "Old compatibility (non UTF-8) encoding"
msgstr "Hen Amgodiad (nid utf-8)"
-#: any.pm:1053
+#: any.pm:1055
#, c-format
msgid "All languages"
msgstr "Pob iaith"
-#: any.pm:1075
+#: any.pm:1077
#, c-format
msgid "Language choice"
msgstr "Dewis iaith"
-#: any.pm:1129
+#: any.pm:1131
#, c-format
msgid "Country / Region"
msgstr "Gwlad / Ardal"
-#: any.pm:1130
+#: any.pm:1132
#, c-format
msgid "Please choose your country"
msgstr "Dewiswch eich gwlad"
-#: any.pm:1132
+#: any.pm:1134
#, c-format
msgid "Here is the full list of available countries"
msgstr "Dyma restr lawn o'r gwledydd sydd ar gael"
-#: any.pm:1133
+#: any.pm:1135
#, c-format
msgid "Other Countries"
msgstr "Gwledydd eraill"
-#: any.pm:1133 interactive.pm:488 interactive/gtk.pm:445
+#: any.pm:1135 interactive.pm:488 interactive/gtk.pm:445
#, c-format
msgid "Advanced"
msgstr "Uwch"
-#: any.pm:1139
+#: any.pm:1141
#, c-format
msgid "Input method:"
msgstr "Dull mewnbwn:"
-#: any.pm:1142
+#: any.pm:1144
#, c-format
msgid "None"
msgstr "Dim"
-#: any.pm:1223
+#: any.pm:1225
#, c-format
msgid "No sharing"
msgstr "Peidio rhannu"
-#: any.pm:1223
+#: any.pm:1225
#, c-format
msgid "Allow all users"
msgstr "Caniatáu pob defnyddiwr"
-#: any.pm:1223
+#: any.pm:1225
#, c-format
msgid "Custom"
msgstr "Arddull"
-#: any.pm:1227
+#: any.pm:1229
#, c-format
msgid ""
"Would you like to allow users to share some of their directories?\n"
@@ -638,7 +638,7 @@ msgstr ""
"\n"
"\"Addasu\" caniatáu cyfran i'r defnyddwyr.\n"
-#: any.pm:1239
+#: any.pm:1241
#, c-format
msgid ""
"NFS: the traditional Unix file sharing system, with less support on Mac and "
@@ -647,7 +647,7 @@ msgstr ""
"NFS: system rhannu ffeiliau traddodiadol Unix, sydd â llai o gefnogaeth ar "
"Mac a Windows."
-#: any.pm:1242
+#: any.pm:1244
#, c-format
msgid ""
"SMB: a file sharing system used by Windows, Mac OS X and many modern Linux "
@@ -656,19 +656,19 @@ msgstr ""
"SMB: system rhannu ffeiliau sy'n cael ei ddefnyddio yn Windows, Mac OSX a "
"nifer o systemau Linux diweddar."
-#: any.pm:1250
+#: any.pm:1252
#, c-format
msgid ""
"You can export using NFS or SMB. Please select which you would like to use."
msgstr ""
"Gallwch allforio gan ddefnyddio NFS neu SMB. Pa un hoffech chi ei ddefnyddio?"
-#: any.pm:1278
+#: any.pm:1280
#, c-format
msgid "Launch userdrake"
msgstr "Cychwyn userdrake"
-#: any.pm:1280
+#: any.pm:1282
#, c-format
msgid ""
"The per-user sharing uses the group \"fileshare\". \n"
@@ -677,52 +677,54 @@ msgstr ""
"Mae'r rhannu yn ôl defnyddiwr yn defnyddio grŵp \"rhannu ffeiliau\" .\n"
"Mae modd defnyddio userdrake i ychwanegu defnyddiwr i'r grŵp. "
-#: any.pm:1380
-#, c-format
-msgid "Please log out and then use Ctrl-Alt-BackSpace"
-msgstr "Allgofnodwch ac yna defnyddiwch Ctrl Alt-BackSpace"
+#: any.pm:1383
+#, fuzzy, c-format
+msgid ""
+"You need to logout and back in again for changes to take effect. Press OK to "
+"logout now."
+msgstr "Rhaid allgofnodi ac i mewn eto i newidiadau ddigwydd."
-#: any.pm:1384
+#: any.pm:1387
#, c-format
msgid "You need to log out and back in again for changes to take effect"
msgstr "Rhaid allgofnodi ac i mewn eto i newidiadau ddigwydd."
-#: any.pm:1419
+#: any.pm:1422
#, c-format
msgid "Timezone"
msgstr "Cylchfa amser"
-#: any.pm:1419
+#: any.pm:1422
#, c-format
msgid "Which is your timezone?"
msgstr "Pa un yw eich parth amser?"
-#: any.pm:1442 any.pm:1444
+#: any.pm:1445 any.pm:1447
#, c-format
msgid "Date, Clock & Time Zone Settings"
msgstr "Gosodiadau Dyddiad Cloc a Chylchedd Amser"
-#: any.pm:1445
+#: any.pm:1448
#, c-format
msgid "What is the best time?"
msgstr "Beth yw'r amser gorau?"
-#: any.pm:1449
+#: any.pm:1452
#, c-format
msgid "%s (hardware clock set to UTC)"
msgstr "%s (cloc caledwedd wedi ei osod i UTC)"
-#: any.pm:1450
+#: any.pm:1453
#, c-format
msgid "%s (hardware clock set to local time)"
msgstr "%s (cloc caledwedd wedi ei osod i'r amser lleol)"
-#: any.pm:1452
+#: any.pm:1455
#, c-format
msgid "NTP Server"
msgstr "Gweinydd NTP"
-#: any.pm:1453
+#: any.pm:1456
#, c-format
msgid "Automatic time synchronization (using NTP)"
msgstr "Cydweddi amser awtomatig (defnyddio NTP)"
@@ -1226,7 +1228,7 @@ msgstr "Gorffen"
#: diskdrake/interactive.pm:1114 diskdrake/interactive.pm:1127
#: diskdrake/interactive.pm:1130 diskdrake/interactive.pm:1398
#: diskdrake/smbnfs_gtk.pm:42 do_pkgs.pm:23 do_pkgs.pm:28 do_pkgs.pm:44
-#: do_pkgs.pm:60 do_pkgs.pm:65 do_pkgs.pm:82 fsedit.pm:245
+#: do_pkgs.pm:60 do_pkgs.pm:65 do_pkgs.pm:82 fsedit.pm:246
#: interactive/http.pm:117 interactive/http.pm:118 modules/interactive.pm:19
#: scanner.pm:95 scanner.pm:106 scanner.pm:113 scanner.pm:120 wizards.pm:95
#: wizards.pm:99 wizards.pm:121
@@ -2202,7 +2204,7 @@ msgstr "Newid y math"
#: diskdrake/smbnfs_gtk.pm:81 interactive.pm:129 interactive.pm:550
#: interactive/curses.pm:260 interactive/http.pm:104 interactive/http.pm:160
-#: interactive/stdio.pm:39 interactive/stdio.pm:148 mygtk2.pm:805 ugtk2.pm:415
+#: interactive/stdio.pm:39 interactive/stdio.pm:148 mygtk2.pm:817 ugtk2.pm:415
#: ugtk2.pm:517 ugtk2.pm:526 ugtk2.pm:812
#, c-format
msgid "Cancel"
@@ -2715,7 +2717,7 @@ msgstr "Dileu a defnyddio'r ddisg gyfan"
msgid "You have more than one hard drive, which one do you install linux on?"
msgstr "Mae gennych fwy nag un disg caled, ar ba un hoffech osod linux?"
-#: fs/partitioning_wizard.pm:210 fsedit.pm:599
+#: fs/partitioning_wizard.pm:210 fsedit.pm:600
#, c-format
msgid "ALL existing partitions and their data will be lost on drive %s"
msgstr "Bydd POB rhaniad presennol a'u data'n cael eu colli ar yrrwr %si"
@@ -2754,37 +2756,37 @@ msgstr "Mae dewin rhannu DrakX wedi canfod yr atebion canlynol:"
msgid "Partitioning failed: %s"
msgstr "Methodd creu'r rhaniad: %s"
-#: fs/type.pm:379
+#: fs/type.pm:380
#, c-format
msgid "You can not use JFS for partitions smaller than 16MB"
msgstr "Does dim modd defnyddio JFS ar raniadau llai na 16MB"
-#: fs/type.pm:380
+#: fs/type.pm:381
#, c-format
msgid "You can not use ReiserFS for partitions smaller than 32MB"
msgstr "Does dim modd defnyddio ReiserFS ar gyfer rhaniadau llai na 32MB"
-#: fsedit.pm:23
+#: fsedit.pm:24
#, c-format
msgid "simple"
msgstr "syml"
-#: fsedit.pm:27
+#: fsedit.pm:28
#, c-format
msgid "with /usr"
msgstr "gyda /usr"
-#: fsedit.pm:32
+#: fsedit.pm:33
#, c-format
msgid "server"
msgstr "Gweinydd"
-#: fsedit.pm:136
+#: fsedit.pm:137
#, c-format
msgid "BIOS software RAID detected on disks %s. Activate it?"
msgstr "Mae meddalwedd BIOS RAID wedi ei ganfod ar ddisgiau %s. Gweithredu?"
-#: fsedit.pm:246
+#: fsedit.pm:247
#, c-format
msgid ""
"I can not read the partition table of device %s, it's too corrupted for me :"
@@ -2802,22 +2804,22 @@ msgstr ""
"\n"
"Ydych chi'n cytuno i golli'r holl raniadau?\n"
-#: fsedit.pm:424
+#: fsedit.pm:425
#, c-format
msgid "Mount points must begin with a leading /"
msgstr "Rhaid i bwyntiau arosod gynnwys / arweiniol"
-#: fsedit.pm:425
+#: fsedit.pm:426
#, c-format
msgid "Mount points should contain only alphanumerical characters"
msgstr "Dylai enw'r pwyntiau arosod gynnwys llythrennau a rhifau'n unig"
-#: fsedit.pm:426
+#: fsedit.pm:427
#, c-format
msgid "There is already a partition with mount point %s\n"
msgstr "Mae yna eisoes raniad gyda phwynt arosod %s\n"
-#: fsedit.pm:430
+#: fsedit.pm:431
#, c-format
msgid ""
"You've selected a software RAID partition as root (/).\n"
@@ -2828,7 +2830,7 @@ msgstr ""
"Nid oes cychwynnwr yn gallu trin hwn heb raniad /boot\n"
"Cofiwch ychwanegu rhaniad /boot"
-#: fsedit.pm:436
+#: fsedit.pm:437
#, c-format
msgid ""
"You can not use the LVM Logical Volume for mount point %s since it spans "
@@ -2837,7 +2839,7 @@ msgstr ""
"Does dim modd defnyddio Cyfrol Resymegol LVM ar gyfer pwynt arosod %s am ei "
"fod ar draws cyfrolau ffisegol."
-#: fsedit.pm:438
+#: fsedit.pm:439
#, c-format
msgid ""
"You've selected the LVM Logical Volume as root (/).\n"
@@ -2849,12 +2851,12 @@ msgstr ""
"Nid oes cychwynnwr yn gallu trin hwn pan yw ar draws cyfrolau ffisegol.\n"
"Cofiwch ychwanegu rhaniad /boot yn gyntaf"
-#: fsedit.pm:442 fsedit.pm:444
+#: fsedit.pm:443 fsedit.pm:445
#, c-format
msgid "This directory should remain within the root filesystem"
msgstr "Dylai'r cyfeiriadur aros o fewn y system ffeilio gwraidd"
-#: fsedit.pm:446 fsedit.pm:448
+#: fsedit.pm:447 fsedit.pm:449
#, c-format
msgid ""
"You need a true filesystem (ext2/ext3, reiserfs, xfs, or jfs) for this mount "
@@ -2863,17 +2865,17 @@ msgstr ""
"Mae angen gwir system ffeilio (ext2, reiserfs, xfs, neu jfs)) ar gyfer y "
"pwynt arosod\n"
-#: fsedit.pm:450
+#: fsedit.pm:451
#, c-format
msgid "You can not use an encrypted file system for mount point %s"
msgstr "Nid oes modd defnyddio Cyfrol Resymegol LVM ar gyfer pwynt arosod %s"
-#: fsedit.pm:515
+#: fsedit.pm:516
#, c-format
msgid "Not enough free space for auto-allocating"
msgstr "Nid oes digon o le ar gyfer awto ddynodi"
-#: fsedit.pm:517
+#: fsedit.pm:518
#, c-format
msgid "Nothing to do"
msgstr "Dim i'w wneud"
@@ -3398,7 +3400,7 @@ msgstr "Math o diwniwr:"
#: interactive.pm:128 interactive.pm:549 interactive/curses.pm:263
#: interactive/http.pm:103 interactive/http.pm:156 interactive/stdio.pm:39
-#: interactive/stdio.pm:148 interactive/stdio.pm:149 mygtk2.pm:805
+#: interactive/stdio.pm:148 interactive/stdio.pm:149 mygtk2.pm:817
#: ugtk2.pm:421 ugtk2.pm:519 ugtk2.pm:812 ugtk2.pm:835
#, c-format
msgid "Ok"
@@ -7058,6 +7060,9 @@ msgstr ""
msgid "Installation failed"
msgstr "Methodd y gosod"
+#~ msgid "Please log out and then use Ctrl-Alt-BackSpace"
+#~ msgstr "Allgofnodwch ac yna defnyddiwch Ctrl Alt-BackSpace"
+
#~ msgid "Welcome To Crackers"
#~ msgstr "Croeso i Crackers"
/span> "swap", size => 64 << 11, fs_type => 'swap', ratio => 2, maxsize => 1600 << 11 }, { mntpoint => "/usr", size => 300 << 11, fs_type => 'ext3', ratio => 4, maxsize => 4000 << 11 }, { mntpoint => "/var", size => 200 << 11, fs_type => 'ext3', ratio => 3 }, { mntpoint => "/home", size => 150 << 11, fs_type => 'ext3', ratio => 3 }, { mntpoint => "/tmp", size => 150 << 11, fs_type => 'ext3', ratio => 2, maxsize => 1000 << 11 }, ], ); foreach (values %suggestions) { if (arch() =~ /ia64/) { @$_ = ({ mntpoint => "/boot/efi", size => 50 << 11, pt_type => 0xef, ratio => 1, maxsize => 150 << 11 }, @$_); } } my @suggestions_mntpoints = ( "/var/ftp", "/var/www", "/boot", '/usr/local', '/opt', arch() =~ /sparc/ ? "/mnt/sunos" : arch() =~ /ppc/ ? "/mnt/macos" : "/mnt/windows", ); #-###################################################################################### #- Functions #-###################################################################################### sub recompute_loopbacks { my ($all_hds) = @_; my @fstab = fs::get::fstab($all_hds); @{$all_hds->{loopbacks}} = map { isPartOfLoopback($_) ? @{$_->{loopback}} : () } @fstab; } sub raids { my ($hds) = @_; my @parts = fs::get::hds_fstab(@$hds); my @l = grep { isRawRAID($_) } @parts or return []; log::l("looking for raids in " . join(' ', map { $_->{device} } @l)); require raid; raid::detect_during_install(@l) if $::isInstall; raid::get_existing(@l); } sub lvms { my ($all_hds) = @_; my @pvs = grep { isRawLVM($_) } fs::get::fstab($all_hds) or return; log::l("looking for vgs in " . join(' ', map { $_->{device} } @pvs)); #- otherwise vgscan will not find them devices::make($_->{device}) foreach @pvs; require lvm; my @lvms; foreach (@pvs) { my $name = lvm::get_vg($_) or next; my $lvm = find { $_->{VG_name} eq $name } @lvms; if (!$lvm) { $lvm = new lvm($name); lvm::update_size($lvm); lvm::get_lvs($lvm); push @lvms, $lvm; } $_->{lvm} = $name; push @{$lvm->{disks}}, $_; } @lvms; } sub get_hds { my ($o_flags, $o_in) = @_; my $flags = $o_flags || {}; $flags->{readonly} && ($flags->{clearall} || $flags->{clear}) and die "conflicting flags readonly and clear/clearall"; my @drives = detect_devices::hds(); foreach my $hd (@drives) { $hd->{file} = devices::make($hd->{device}); $hd->{prefix} ||= $hd->{device}; } @drives = partition_table::raw::get_geometries(@drives); my (@hds, @raw_hds); foreach my $hd (@drives) { $hd->{readonly} = $flags->{readonly}; eval { partition_table::raw::test_for_bad_drives($hd) if !$flags->{no_bad_drives} }; if (my $err = $@) { if ($err =~ /write error:/) { $hd->{readonly} = 1; } elsif ($err =~ /read error:/) { next; } else { $o_in and $o_in->ask_warn('', $err); next; } } if ($flags->{clearall} || member($hd->{device}, @{$flags->{clear} || []})) { partition_table::raw::zero_MBR_and_dirty($hd); } else { my $handle_die_and_cdie = sub { if ($hd->{readonly}) { log::l("using /proc/partitions since diskdrake failed :("); use_proc_partitions($hd); 1; } elsif (my $type = fs::type::type_subpart_from_magic($hd)) { #- non partitioned drive? if (exists $hd->{usb_description} && $type->{fs_type}) { #- USB keys put_in_hash($hd, $type); push @raw_hds, $hd; $hd = ''; 1; } elsif ($type->{pt_type} == 0x8e) { #- LVM on full disk my $part = { size => $hd->{totalsectors}, device => $hd->{device}, %$type }; bless $hd, 'partition_table::raw'; $hd->{readonly} = $hd->{getting_rid_of_readonly_allowed} = 1; $hd->{primary}{normal} = [ $part ]; 1; } else { 0; } } else { 0; } }; my $handled; eval { catch_cdie { partition_table::read($hd); if (listlength(partition_table::get_normal_parts($hd)) == 0) { $handled = 1 if $handle_die_and_cdie->(); } else { compare_with_proc_partitions($hd) if $::isInstall; } } sub { my $err = $@; if ($handle_die_and_cdie->()) { $handled = 1; 0; #- do not continue, transform cdie into die } else { !$o_in || $o_in->ask_okcancel('', formatError($err)); } }; }; if (my $err = $@) { if ($handled) { #- already handled in cdie handler above } elsif ($handle_die_and_cdie->()) { } elsif ($o_in && $o_in->ask_yesorno(N("Error"), N("I can not read the partition table of device %s, it's too corrupted for me :( I can try to go on, erasing over bad partitions (ALL DATA will be lost!). The other solution is to not allow DrakX to modify the partition table. (the error is %s) Do you agree to lose all the partitions? ", $hd->{device}, formatError($err)))) { partition_table::raw::zero_MBR($hd); } else { #- using it readonly log::l("using /proc/partitions since diskdrake failed :("); use_proc_partitions($hd); } } $hd or next; member($_->{device}, @{$flags->{clear} || []}) and partition_table::remove($hd, $_) foreach partition_table::get_normal_parts($hd); } my @parts = partition_table::get_normal_parts($hd); # checking the magic of the filesystem, do not rely on pt_type foreach (grep { member($_->{fs_type}, 'vfat', 'ntfs', 'ext2') || $_->{pt_type} == 0x100 } @parts) { if (my $type = fs::type::type_subpart_from_magic($_)) { if ($type->{fs_type}) { #- keep {pt_type} $_->{fs_type} = $type->{fs_type}; } else { put_in_hash($_, $type); } } else { $_->{bad_fs_type_magic} = 1; } } foreach (@parts) { my $label = member($_->{fs_type}, qw(ext2 ext3)) ? c::get_ext2_label(devices::make($_->{device})) : ''; $_->{device_LABEL} = $label if $label; } if ($hd->{usb_media_type}) { $_->{is_removable} = 1 foreach @parts; } push @hds, $hd; } #- detect raids before LVM allowing LVM on raid my $raids = raids(\@hds); my $all_hds = { %{ fs::get::empty_all_hds() }, hds => \@hds, raw_hds => \@raw_hds, lvms => [], raids => $raids }; $all_hds->{lvms} = [ lvms($all_hds) ]; fs::get_major_minor(fs::get::fstab($all_hds)); $all_hds; } sub read_proc_partitions { my ($hds) = @_; my @all = devices::read_proc_partitions_raw(); my ($parts, $disks) = partition { $_->{dev} =~ /\d$/ && $_->{dev} !~ /^(sr|scd)/ } @all; my $devfs_like = any { $_->{dev} =~ m|/disc$| } @$disks; my %devfs2normal = map { my (undef, $major, $minor) = devices::entry($_->{device}); my $disk = find { $_->{major} == $major && $_->{minor} == $minor } @$disks; $disk->{dev} => $_->{device}; } @$hds; my $prev_part; foreach my $part (@$parts) { my $dev; if ($devfs_like) { $dev = -e "/dev/$part->{dev}" ? $part->{dev} : sprintf("0x%x%02x", $part->{major}, $part->{minor}); $part->{rootDevice} = $devfs2normal{dirname($part->{dev}) . '/disc'}; } else { $dev = $part->{dev}; if (my $hd = find { $part->{dev} =~ /^\Q$_->{device}\E./ } @$hds) { put_in_hash($part, partition_table::hd2minimal_part($hd)); } } undef $prev_part if $prev_part && ($prev_part->{rootDevice} || '') ne ($part->{rootDevice} || ''); $part->{device} = $dev; $part->{size} *= 2; # from KB to sectors $part->{start} = $prev_part ? $prev_part->{start} + $prev_part->{size} : 0;