diff options
| -rw-r--r-- | perl-install/NEWS | 3 | ||||
| -rwxr-xr-x | perl-install/standalone/bootloader-config | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 3bfea24ef..d1bdd7b0c 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- bootloader-config: + o --action migrate-to-uuids: do not migrate non sdx/hdx to UUID + (bootloader config) - reduce banner font size Version 11.60 - 30 September 2008 diff --git a/perl-install/standalone/bootloader-config b/perl-install/standalone/bootloader-config index 4a21bc7ac..590c96d3e 100755 --- a/perl-install/standalone/bootloader-config +++ b/perl-install/standalone/bootloader-config @@ -276,7 +276,7 @@ sub _migrate_to_uuids__fstab() { my $fstab_migrated; foreach my $part (@raw_fstab) { - devices::should_prefer_UUID($part->{device}) or next; + _should_prefer_UUID($part) or next; my $part_ = find { fs::get::is_same_hd($part, $_) } @$fstab or log::l("migrate_to_uuids: do not know $part->{device}, can not migrate it"), next; @@ -302,9 +302,15 @@ sub _migrate_dev_to_uuid { $dev && $dev =~ m!/dev/! or return; my $part = fs::get::device2part($dev, $fstab); + _should_prefer_UUID($part) or return; $part && $part->{device_UUID} && "UUID=$part->{device_UUID}"; } +sub _should_prefer_UUID { + my ($part) = @_; + devices::should_prefer_UUID($part->{device}); +} + # add UUID to swap v.2 in case the swap was created long ago when mkswap didn't do it by default sub _add_uuid_to_swap { my ($part) = @_; |