diff options
| author | Jonathan Bauer | 2020-05-25 11:26:54 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2020-05-25 11:26:54 +0200 |
| commit | 8b36285c9ec75ee9fa59f44b0714b952b574190f (patch) | |
| tree | 3d4e51530e54e3d7643e47f2bd4e550be0de07f0 /modules.d/slx-uuid | |
| parent | build-initramfs.sh: support CentOS-7 again (diff) | |
| parent | Merge branch 'master' into nobash-merge (diff) | |
| download | systemd-init-8b36285c9ec75ee9fa59f44b0714b952b574190f.tar.gz systemd-init-8b36285c9ec75ee9fa59f44b0714b952b574190f.tar.xz systemd-init-8b36285c9ec75ee9fa59f44b0714b952b574190f.zip | |
Merge branch 'nobash-merge' into downloader-nobash-merge
Diffstat (limited to 'modules.d/slx-uuid')
| -rw-r--r-- | modules.d/slx-uuid/bad-uuid-defaults.conf | 2 | ||||
| -rwxr-xr-x | modules.d/slx-uuid/module-setup.sh | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/modules.d/slx-uuid/bad-uuid-defaults.conf b/modules.d/slx-uuid/bad-uuid-defaults.conf index aaf59a7d..dab53d07 100644 --- a/modules.d/slx-uuid/bad-uuid-defaults.conf +++ b/modules.d/slx-uuid/bad-uuid-defaults.conf @@ -1,8 +1,10 @@ 00000000-0000-0000-0000-000000000000 +00000000-0000-0000-0000-000000000001 03000200-0400-0500-0006-000700080009 11111111-2222-3333-4444-555555555555 44454C4C-2000-1020-8020-A0C04F202020 4C4C4544-0000-2010-8020-80C04F202020 4C4C4544-0046-3310-805A-B6C04F4B4D31 +58585858-5858-5858-5858-585858585858 A023157C-F692-11DE-977C-7F0F26276F33 FFFFFFFF-FFFF-FFFF-FFFF-FFFFFFFFFFFF diff --git a/modules.d/slx-uuid/module-setup.sh b/modules.d/slx-uuid/module-setup.sh index 569b5155..1e550136 100755 --- a/modules.d/slx-uuid/module-setup.sh +++ b/modules.d/slx-uuid/module-setup.sh @@ -13,7 +13,16 @@ depends() { } install() { mkdir -p "$initdir/etc/bad-uuid.d" - inst_simple "$moddir/bad-uuid-defaults.conf" "/etc/bad-uuid.d/bad-uuid-defaults.conf" + # check if we have an uuid blacklists installed by openslx/mltk on this system + if [ "$(ls -A /opt/openslx/bad-uuid.d)" ]; then + for blacklist in "/opt/openslx/bad-uuid.d"/* ]; do + inst_simple "$blacklist" "/etc/bad-uuid.d/${blacklist##*/}" + done + else + # use this module's default blacklist + inst_simple "$moddir/bad-uuid-defaults.conf" "/etc/bad-uuid.d/bad-uuid-defaults.conf" + fi + inst_multiple dmidecode inst_hook pre-udev 05 "$moddir/scripts/get-system-uuid.sh" inst_hook pre-pivot 10 "$moddir/scripts/copy-system-uuid-to-newroot.sh" |