diff options
| -rw-r--r-- | config/auto_inst.cfg.pl | 2 | ||||
| -rwxr-xr-x | files/mga_rpms/update_media.sh | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl index aa44f02..5c3c49f 100644 --- a/config/auto_inst.cfg.pl +++ b/config/auto_inst.cfg.pl @@ -248,7 +248,7 @@ $o = { 'bluez-firmware', 'mageiawelcome', 'usbutils', # we want lsusb 'shared-mime-info', # needed for .desktop files to work atleast in gnome - 'dmraid', 'mdadm', 'mc', 'btrfs-progs', 'shorewall-ipv6', 'parted', 'glxinfo', 'patch', + 'mc', 'btrfs-progs', 'shorewall-ipv6', 'parted', 'glxinfo', 'patch', 'mageia-doc-mcc-en', if_($ENV{DRAKLIVE_REGION} eq 'all', 'vim-enhanced', ), diff --git a/files/mga_rpms/update_media.sh b/files/mga_rpms/update_media.sh index ee55238..ab367a9 100755 --- a/files/mga_rpms/update_media.sh +++ b/files/mga_rpms/update_media.sh @@ -30,6 +30,20 @@ cp $bcdmedia/x86_64/media/core/release/grub2-mageia-theme-*.rpm x86_64/mga_rpms/ cp $bcdmedia/x86_64/media/core/release/os-prober-*.rpm x86_64/mga_rpms/core/ cp $bcdmedia/x86_64/media/core/release/efibootmgr-*.rpm x86_64/mga_rpms/core/ +# add dmraid stuff +cp $bcdmedia/i586/media/core/release/dmraid-*.rpm i586/mga_rpms/core/ +cp $bcdmedia/i586/media/core/release/libdmraid1-*.rpm i586/mga_rpms/core/ +cp $bcdmedia/i586/media/core/release/kpartx-*.rpm i586/mga_rpms/core/ + +cp $bcdmedia/x86_64/media/core/release/dmraid-*.rpm x86_64/mga_rpms/core/ +cp $bcdmedia/x86_64/media/core/release/lib64dmraid1-*.rpm x86_64/mga_rpms/core/ +cp $bcdmedia/x86_64/media/core/release/kpartx-*.rpm x86_64/mga_rpms/core/ + +# add mdadm +cp $bcdmedia/i586/media/core/release/mdadm-*.rpm i586/mga_rpms/core/ + +cp $bcdmedia/x86_64/media/core/release/mdadm-*.rpm x86_64/mga_rpms/core/ + # add repo pubkeys cp $bcdmedia/i586/media/core/release/media_info/pubkey i586/mga_rpms/core/media_info/ cp $bcdmedia/x86_64/media/core/release/media_info/pubkey x86_64/mga_rpms/core/media_info/ |