diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2017-11-27 15:06:16 +0000 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2018-05-28 11:47:26 +0100 |
| commit | 8cf4662cca0f4bf2820bf0d30bf0e048e0c19e15 (patch) | |
| tree | 6f5d94bac17e666ef817bcf89931a64e5f30fbe5 | |
| parent | 4121e603d4da4d614ba5b1afb3b994e805be5b65 (diff) | |
| download | drakx-8cf4662cca0f4bf2820bf0d30bf0e048e0c19e15.tar drakx-8cf4662cca0f4bf2820bf0d30bf0e048e0c19e15.tar.gz drakx-8cf4662cca0f4bf2820bf0d30bf0e048e0c19e15.tar.bz2 drakx-8cf4662cca0f4bf2820bf0d30bf0e048e0c19e15.tar.xz drakx-8cf4662cca0f4bf2820bf0d30bf0e048e0c19e15.zip | |
installer: force update of /dev/disk/by-uuid after partitioning (mga#22059)
Because stage2 does not include the udev 60-blocks.rule, udev does not
automatically update the soft links in /dev/disk/by-uuid after we write
the partition table and format the partitions. We need these links to
be updated before we create the initrd. It would be cleaner to fix this
with a udev rule, but for now, use brute force.
(cherry picked from commit 13d0e32733b8c1827335a1551dedbbf88daf369f)
| -rw-r--r-- | perl-install/install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/install/install2.pm | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 5b718dbe5..e23d1db0a 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,6 +1,8 @@ - diskdrake: o ensure device major/minor numbers are reread after writing the partition table (mga#22032) + o ensure soft links in /dev/disk/by-uuid are updated so that valid + UUIDs are embedded in the initrd (mga#22059) - fix perl escaping causing commands to not get linked - do not include some hwdb files from uneeded pkgs - bootloader: diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm index 90759e651..cf8ff7da8 100644 --- a/perl-install/install/install2.pm +++ b/perl-install/install/install2.pm @@ -213,6 +213,13 @@ sub formatPartitions { } installStepsCall($o, $auto, 'formatMountPartitions') if !$::testing; + # Workaround for mga#22059. Because stage2 does not include the udev 60-blocks.rule, + # udev does not automatically update the soft links in /dev/disk/by-uuid after we + # write the partition table and format the partitions. We need these links to be + # updated before we create the initrd. It would be cleaner to fix this with a udev + # rule, but for now, use brute force. + run_program::run('udevadm', 'trigger', '--type=devices'); + if ($want_root_formated) { #- we formatted /, ensure /var/lib/rpm is cleaned otherwise bad things can happen #- (especially when /var is *not* formatted) |