diff options
| -rw-r--r-- | config/auto_inst.cfg.pl | 14 | ||||
| -rw-r--r-- | config/settings-livecd.cfg | 2 | ||||
| -rw-r--r-- | files/UEFI/GNOME/boot/efiboot.img | bin | 18874368 -> 23068672 bytes | |||
| -rw-r--r-- | files/UEFI/GNOME/loader/entries/01-mga-boot.conf | 2 | ||||
| -rw-r--r-- | files/UEFI/GNOME/loader/entries/02-mga-install.conf | 2 | ||||
| -rw-r--r-- | files/UEFI/GNOME/loader/entries/03-mga-boot-safe.conf | 2 | ||||
| -rw-r--r-- | files/UEFI/KDE4/boot/efiboot.img | bin | 18874368 -> 23068672 bytes | |||
| -rw-r--r-- | files/UEFI/KDE4/loader/entries/01-mga-boot.conf | 2 | ||||
| -rw-r--r-- | files/UEFI/KDE4/loader/entries/02-mga-install.conf | 2 | ||||
| -rw-r--r-- | files/UEFI/KDE4/loader/entries/03-mga-boot-safe.conf | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | files/hacks/message | bin | 537088 -> 537088 bytes | |||
| -rwxr-xr-x | files/mga_rpms/update_media.sh | 28 |
12 files changed, 28 insertions, 28 deletions
diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl index 511fa3c..8d4bcab 100644 --- a/config/auto_inst.cfg.pl +++ b/config/auto_inst.cfg.pl @@ -196,9 +196,9 @@ $o = { 'mono', # block the kernels we dont want - if_($ENV{DRAKLIVE_ARCH} eq 'i586', '/^kernel-desktop-/', '/^fglrx-kernel-3\.15\.2-desktop-/', '/^nvidia-current-kernel-3\.15\.2-desktop-/', '/^nvidia304-kernel-3\.15\.2-desktop-', '/^nvidia173-kernel-3\.15\.2-desktop-/', '/^vboxadditions-kernel-3\.15\.2-desktop-/'), - '/^kernel-server-/', '/^fglrx-kernel-3\.15\.2-server-/', '/^nvidia-current-kernel-3\.15\.2-server-/', '/^nvidia304-kernel-3\.15\.2-server-/', '/^nvidia173-kernel-3\.15\.2-server-/', '/^vboxadditions-kernel-3\.15\.2-server-/', - '/^broadcom-wl-/', '/^nvidia-current-/', '/^nvidia304-/', '/^nvidia173-/', '/^fglrx-/', + if_($ENV{DRAKLIVE_ARCH} eq 'i586', '/^kernel-desktop-/', '/^fglrx-kernel-3\.15\.2-desktop-/', '/^nvidia-current-kernel-3\.15\.6-desktop-/', '/^nvidia304-kernel-3\.15\.6-desktop-', '/^nvidia173-kernel-3\.15\.6-desktop-/', '/^vboxadditions-kernel-3\.15\.6-desktop-/'), + '/^kernel-server-/', '/^fglrx-kernel-3\.15\.6-server-/', '/^nvidia-current-kernel-3\.15\.6-server-/', '/^nvidia304-kernel-3\.15\.6-server-/', '/^nvidia173-kernel-3\.15\.6-server-/', '/^vboxadditions-kernel-3\.15\.6-server-/', + '/^broadcom-wl-/', '/^nvidia173-/', '/^fglrx-/', if_($ENV{DRAKLIVE_PRODUCT} =~ /LiveCD/i, 'libreoffice-core'), @@ -241,16 +241,16 @@ $o = { if_($ENV{DRAKLIVE_ARCH} eq 'i586', 'libcanberra-gtk0'), if_($ENV{DRAKLIVE_ARCH} eq 'x86_64', 'lib64canberra-gtk0'), - if_($ENV{DRAKLIVE_ARCH} eq 'i586', 'vboxadditions-kernel-desktop586-latest'), - if_($ENV{DRAKLIVE_ARCH} eq 'x86_64', 'vboxadditions-kernel-desktop-latest', 'gummiboot'), + if_($ENV{DRAKLIVE_ARCH} eq 'i586', 'vboxadditions-kernel-desktop586-latest', 'nvidia-current-kernel-desktop586-latest', 'nvidia304-kernel-desktop586-latest'), + if_($ENV{DRAKLIVE_ARCH} eq 'x86_64', 'vboxadditions-kernel-desktop-latest', 'nvidia-current-kernel-desktop-latest', 'nvidia304-kernel-desktop-latest', 'gummiboot'), - 'x11-server-common', 'x11-driver-video-vboxvideo', + 'x11-server-common', 'x11-driver-video-vboxvideo', 'x11-driver-video-nvidia-current', 'x11-driver-video-nvidia304', 'basesystem', 'x11-driver-video', 'x11-driver-input', 'bluez-firmware', 'mageiawelcome', 'usbutils', # we want lsusb 'shared-mime-info', # needed for .desktop files to work atleast in gnome 'mc', 'btrfs-progs', 'shorewall-ipv6', 'parted', 'glxinfo', 'patch', - 'mageia-doc-mcc-en', 'bind-utils', + 'mageia-doc-mcc-en', 'bind-utils', 'mdadm', 'dmraid', if_($ENV{DRAKLIVE_REGION} eq 'all', 'vim-enhanced', ), diff --git a/config/settings-livecd.cfg b/config/settings-livecd.cfg index dda8487..d05a5e7 100644 --- a/config/settings-livecd.cfg +++ b/config/settings-livecd.cfg @@ -11,7 +11,7 @@ region=all pack= name=Mageia product=LiveCD -version=5-alpha1 +version=5-alpha2 commercial=0 default_user=live builddir=/home/draklive/var-data/build diff --git a/files/UEFI/GNOME/boot/efiboot.img b/files/UEFI/GNOME/boot/efiboot.img Binary files differindex a1bfb74..e9d71b7 100644 --- a/files/UEFI/GNOME/boot/efiboot.img +++ b/files/UEFI/GNOME/boot/efiboot.img diff --git a/files/UEFI/GNOME/loader/entries/01-mga-boot.conf b/files/UEFI/GNOME/loader/entries/01-mga-boot.conf index 24c86ad..f8adacd 100644 --- a/files/UEFI/GNOME/loader/entries/01-mga-boot.conf +++ b/files/UEFI/GNOME/loader/entries/01-mga-boot.conf @@ -1,4 +1,4 @@ title Boot Mageia 5 (Cauldron) Live linux /boot/vmlinuz initrd /boot/cdrom/initrd.gz -options root=mgalive:LABEL=Mageia-5-alpha1-GNOME-LiveDVD quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 +options root=mgalive:LABEL=Mageia-5-alpha2-GNOME-LiveDVD quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 diff --git a/files/UEFI/GNOME/loader/entries/02-mga-install.conf b/files/UEFI/GNOME/loader/entries/02-mga-install.conf index f2e63cb..917eab4 100644 --- a/files/UEFI/GNOME/loader/entries/02-mga-install.conf +++ b/files/UEFI/GNOME/loader/entries/02-mga-install.conf @@ -1,4 +1,4 @@ title Install Mageia 5 (Cauldron) Live linux /boot/vmlinuz initrd /boot/cdrom/initrd.gz -options root=mgalive:LABEL=Mageia-5-alpha1-GNOME-LiveDVD quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 install +options root=mgalive:LABEL=Mageia-5-alpha2-GNOME-LiveDVD quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 install diff --git a/files/UEFI/GNOME/loader/entries/03-mga-boot-safe.conf b/files/UEFI/GNOME/loader/entries/03-mga-boot-safe.conf index 4becbcd..cffcafc 100644 --- a/files/UEFI/GNOME/loader/entries/03-mga-boot-safe.conf +++ b/files/UEFI/GNOME/loader/entries/03-mga-boot-safe.conf @@ -1,4 +1,4 @@ title Boot Mageia 5 (Cauldron) Live (Safe mode) linux /boot/vmlinuz initrd /boot/cdrom/initrd.gz -options root=mgalive:LABEL=Mageia-5-alpha1-GNOME-LiveDVD rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 nokmsboot xdriver=vesa +options root=mgalive:LABEL=Mageia-5-alpha2-GNOME-LiveDVD rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 nokmsboot xdriver=vesa diff --git a/files/UEFI/KDE4/boot/efiboot.img b/files/UEFI/KDE4/boot/efiboot.img Binary files differindex 964427d..3369228 100644 --- a/files/UEFI/KDE4/boot/efiboot.img +++ b/files/UEFI/KDE4/boot/efiboot.img diff --git a/files/UEFI/KDE4/loader/entries/01-mga-boot.conf b/files/UEFI/KDE4/loader/entries/01-mga-boot.conf index 3dd18da..aa13b2a 100644 --- a/files/UEFI/KDE4/loader/entries/01-mga-boot.conf +++ b/files/UEFI/KDE4/loader/entries/01-mga-boot.conf @@ -1,4 +1,4 @@ title Boot Mageia 5 (Cauldron) Live linux /boot/vmlinuz initrd /boot/cdrom/initrd.gz -options root=mgalive:LABEL=Mageia-5-alpha1-KDE4-LiveDVD quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 +options root=mgalive:LABEL=Mageia-5-alpha2-KDE4-LiveDVD quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 diff --git a/files/UEFI/KDE4/loader/entries/02-mga-install.conf b/files/UEFI/KDE4/loader/entries/02-mga-install.conf index 8790c4a..22ce588 100644 --- a/files/UEFI/KDE4/loader/entries/02-mga-install.conf +++ b/files/UEFI/KDE4/loader/entries/02-mga-install.conf @@ -1,4 +1,4 @@ title Install Mageia 5 (Cauldron) Live linux /boot/vmlinuz initrd /boot/cdrom/initrd.gz -options root=mgalive:LABEL=Mageia-5-alpha1-KDE4-LiveDVD quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 install +options root=mgalive:LABEL=Mageia-5-alpha2-KDE4-LiveDVD quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 install diff --git a/files/UEFI/KDE4/loader/entries/03-mga-boot-safe.conf b/files/UEFI/KDE4/loader/entries/03-mga-boot-safe.conf index 2f97842..3972f9f 100644 --- a/files/UEFI/KDE4/loader/entries/03-mga-boot-safe.conf +++ b/files/UEFI/KDE4/loader/entries/03-mga-boot-safe.conf @@ -1,4 +1,4 @@ title Boot Mageia 5 (Cauldron) Live (Safe mode) linux /boot/vmlinuz initrd /boot/cdrom/initrd.gz -options root=mgalive:LABEL=Mageia-5-alpha1-KDE4-LiveDVD rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 nokmsboot xdriver=vesa +options root=mgalive:LABEL=Mageia-5-alpha2-KDE4-LiveDVD rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 nokmsboot xdriver=vesa diff --git a/files/hacks/message b/files/hacks/message Binary files differindex 7449b50..7449b50 100644..100755 --- a/files/hacks/message +++ b/files/hacks/message diff --git a/files/mga_rpms/update_media.sh b/files/mga_rpms/update_media.sh index f0bca2d..f9be889 100755 --- a/files/mga_rpms/update_media.sh +++ b/files/mga_rpms/update_media.sh @@ -22,13 +22,13 @@ cp $bcdmedia/i586/media/core/release/broadcom-*-config-*.rpm i586/mga_rpms/core/ cp $bcdmedia/x86_64/media/core/release/broadcom-*-config-*.rpm x86_64/mga_rpms/core/ # nvidia-current -cp $bcdmedia/i586/media/nonfree/release/nvidia-current-kernel-*-desktop586-*.rpm i586/mga_rpms/nonfree/ -cp $bcdmedia/i586/media/nonfree/release/nvidia-current-kernel-desktop586-latest-*.rpm i586/mga_rpms/nonfree/ -cp $bcdmedia/i586/media/nonfree/release/x11-driver-video-nvidia-current-*.rpm i586/mga_rpms/nonfree/ +#cp $bcdmedia/i586/media/nonfree/release/nvidia-current-kernel-*-desktop586-*.rpm i586/mga_rpms/nonfree/ +#cp $bcdmedia/i586/media/nonfree/release/nvidia-current-kernel-desktop586-latest-*.rpm i586/mga_rpms/nonfree/ +#cp $bcdmedia/i586/media/nonfree/release/x11-driver-video-nvidia-current-*.rpm i586/mga_rpms/nonfree/ -cp $bcdmedia/x86_64/media/nonfree/release/nvidia-current-kernel-*-desktop-*.rpm x86_64/mga_rpms/nonfree/ -cp $bcdmedia/x86_64/media/nonfree/release/nvidia-current-kernel-desktop-latest-*.rpm x86_64/mga_rpms/nonfree/ -cp $bcdmedia/x86_64/media/nonfree/release/x11-driver-video-nvidia-current-*.rpm x86_64/mga_rpms/nonfree/ +#cp $bcdmedia/x86_64/media/nonfree/release/nvidia-current-kernel-*-desktop-*.rpm x86_64/mga_rpms/nonfree/ +#cp $bcdmedia/x86_64/media/nonfree/release/nvidia-current-kernel-desktop-latest-*.rpm x86_64/mga_rpms/nonfree/ +#cp $bcdmedia/x86_64/media/nonfree/release/x11-driver-video-nvidia-current-*.rpm x86_64/mga_rpms/nonfree/ # add grub2 stuff cp $bcdmedia/i586/media/core/release/grub2-2*.rpm i586/mga_rpms/core/ @@ -44,18 +44,18 @@ 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/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/ +#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/i586/media/core/release/mdadm-*.rpm i586/mga_rpms/core/ -cp $bcdmedia/x86_64/media/core/release/mdadm-*.rpm x86_64/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/ |