Mga 4 final configsdistro/mga4

21 files changed, 108 insertions, 19 deletions

diff --git a/files/UEFI/GNOME/boot/efiboot.img b/files/UEFI/GNOME/boot/efiboot.img
new file mode 100644
index 0000000..b513d98
--- /dev/null
+++ 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 60f2e47..26fcb20 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 4 Live
 linux    /boot/vmlinuz
 initrd   /boot/cdrom/initrd.gz
-options  root=mgalive:LABEL=Mageia-4-GNOME-LiveDVD splash quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 vga=788
+options  root=mgalive:LABEL=Mageia-4-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 1abcc7b..f107d32 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 4 Live
 linux    /boot/vmlinuz
 initrd   /boot/cdrom/initrd.gz
-options  root=mgalive:LABEL=Mageia-4-GNOME-LiveDVD splash quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 vga=788 install
+options  root=mgalive:LABEL=Mageia-4-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 e3bae9c..d99424a 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 4 Live (Safe mode)
 linux    /boot/vmlinuz
 initrd   /boot/cdrom/initrd.gz
-options  root=mgalive:LABEL=Mageia-4-GNOME-LiveDVD rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 xdriver=vesa
+options  root=mgalive:LABEL=Mageia-4-GNOME-LiveDVD rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 nokmsboot xdriver=vesa
diff --git a/files/UEFI/GNOME/loader/entries/04-mga-usb-boot.conf b/files/UEFI/GNOME/loader/entries/04-mga-usb-boot.conf
index f70c488..3f661fc 100644
--- a/files/UEFI/GNOME/loader/entries/04-mga-usb-boot.conf
+++ b/files/UEFI/GNOME/loader/entries/04-mga-usb-boot.conf
@@ -1,4 +1,4 @@
-title    Boot Mageia 4 Live (USB FAT32)
+title    Boot Mageia 4 Live (from usb)
 linux    /boot/vmlinuz
 initrd   /boot/cdrom/initrd.gz
-options  root=mgalive:LABEL=MGA4LIVE UEFI splash quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 vga=788
+options  root=mgalive:LABEL=MGALIVE UEFI quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0
diff --git a/files/UEFI/GNOME/loader/entries/05-mga-usb-install.conf b/files/UEFI/GNOME/loader/entries/05-mga-usb-install.conf
index afd6fce..825bf6f 100644
--- a/files/UEFI/GNOME/loader/entries/05-mga-usb-install.conf
+++ b/files/UEFI/GNOME/loader/entries/05-mga-usb-install.conf
@@ -1,4 +1,4 @@
-title    Install Mageia 4 Live (USB FAT32)
+title    Install Mageia 4 Live (from usb)
 linux    /boot/vmlinuz
 initrd   /boot/cdrom/initrd.gz
-options  root=mgalive:LABEL=MGA4LIVE UEFI splash quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 vga=788 install
+options  root=mgalive:LABEL=MGALIVE UEFI quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 install
diff --git a/files/UEFI/GNOME/loader/entries/06-mga-usb-boot-safe.conf b/files/UEFI/GNOME/loader/entries/06-mga-usb-boot-safe.conf
index fe45c18..28b2cda 100644
--- a/files/UEFI/GNOME/loader/entries/06-mga-usb-boot-safe.conf
+++ b/files/UEFI/GNOME/loader/entries/06-mga-usb-boot-safe.conf
@@ -1,4 +1,4 @@
-title    Boot Mageia 4 Live (USB FAT32, Safe mode)
+title    Boot Mageia 4 Live (Safe mode, from usb)
 linux    /boot/vmlinuz
 initrd   /boot/cdrom/initrd.gz
-options  root=mgalive:LABEL=MGA4LIVE UEFI rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 xdriver=vesa
+options  root=mgalive:LABEL=MGALIVE UEFI 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
new file mode 100644
index 0000000..5a4e7e4
--- /dev/null
+++ 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 8ad07cd..9fda6b7 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 4 Live
 linux    /boot/vmlinuz
 initrd   /boot/cdrom/initrd.gz
-options  root=mgalive:LABEL=Mageia-4-KDE4-LiveDVD splash quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 vga=788
+options  root=mgalive:LABEL=Mageia-4-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 7b55197..f340e6b 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 4 Live
 linux    /boot/vmlinuz
 initrd   /boot/cdrom/initrd.gz
-options  root=mgalive:LABEL=Mageia-4-KDE4-LiveDVD splash quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 vga=788 install
+options  root=mgalive:LABEL=Mageia-4-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 7e0c9c5..158d1b7 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 4 Live (Safe mode)
 linux    /boot/vmlinuz
 initrd   /boot/cdrom/initrd.gz
-options  root=mgalive:LABEL=Mageia-4-KDE4-LiveDVD rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 xdriver=vesa
+options  root=mgalive:LABEL=Mageia-4-KDE4-LiveDVD rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 nokmsboot xdriver=vesa
diff --git a/files/UEFI/KDE4/loader/entries/04-mga-usb-boot.conf b/files/UEFI/KDE4/loader/entries/04-mga-usb-boot.conf
index f70c488..3f661fc 100644
--- a/files/UEFI/KDE4/loader/entries/04-mga-usb-boot.conf
+++ b/files/UEFI/KDE4/loader/entries/04-mga-usb-boot.conf
@@ -1,4 +1,4 @@
-title    Boot Mageia 4 Live (USB FAT32)
+title    Boot Mageia 4 Live (from usb)
 linux    /boot/vmlinuz
 initrd   /boot/cdrom/initrd.gz
-options  root=mgalive:LABEL=MGA4LIVE UEFI splash quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 vga=788
+options  root=mgalive:LABEL=MGALIVE UEFI quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0
diff --git a/files/UEFI/KDE4/loader/entries/05-mga-usb-install.conf b/files/UEFI/KDE4/loader/entries/05-mga-usb-install.conf
index afd6fce..825bf6f 100644
--- a/files/UEFI/KDE4/loader/entries/05-mga-usb-install.conf
+++ b/files/UEFI/KDE4/loader/entries/05-mga-usb-install.conf
@@ -1,4 +1,4 @@
-title    Install Mageia 4 Live (USB FAT32)
+title    Install Mageia 4 Live (from usb)
 linux    /boot/vmlinuz
 initrd   /boot/cdrom/initrd.gz
-options  root=mgalive:LABEL=MGA4LIVE UEFI splash quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 vga=788 install
+options  root=mgalive:LABEL=MGALIVE UEFI quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 install
diff --git a/files/UEFI/KDE4/loader/entries/06-mga-usb-boot-safe.conf b/files/UEFI/KDE4/loader/entries/06-mga-usb-boot-safe.conf
index fe45c18..28b2cda 100644
--- a/files/UEFI/KDE4/loader/entries/06-mga-usb-boot-safe.conf
+++ b/files/UEFI/KDE4/loader/entries/06-mga-usb-boot-safe.conf
@@ -1,4 +1,4 @@
-title    Boot Mageia 4 Live (USB FAT32, Safe mode)
+title    Boot Mageia 4 Live (Safe mode, from usb)
 linux    /boot/vmlinuz
 initrd   /boot/cdrom/initrd.gz
-options  root=mgalive:LABEL=MGA4LIVE UEFI rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 xdriver=vesa
+options  root=mgalive:LABEL=MGALIVE UEFI rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 nokmsboot xdriver=vesa
diff --git a/files/draklive-install.d/run.d/generate-gtk-icon-cache.sh b/files/draklive-install.d/run.d/generate-gtk-icon-cache.sh
index e920320..cd65647 100755
--- a/files/draklive-install.d/run.d/generate-gtk-icon-cache.sh
+++ b/files/draklive-install.d/run.d/generate-gtk-icon-cache.sh
@@ -5,3 +5,6 @@ for icondir in /usr/share/icons/*; do
 		/usr/bin/gtk-update-icon-cache --force --quiet "$icondir";
 	fi
 done
+if [ -d "/home/live" ]; then 
+    chown -R live:live /home/live
+fi
diff --git a/files/draklive-install.d/services b/files/draklive-install.d/services
index 6e7a6b4..e8190db 100644
--- a/files/draklive-install.d/services
+++ b/files/draklive-install.d/services
@@ -1,3 +1,4 @@
 anacron
 crond
 dkms
+msec
diff --git a/files/glib2-branding.gschema.override b/files/glib2-branding.gschema.override
new file mode 100644
index 0000000..52a4905
--- /dev/null
+++ b/files/glib2-branding.gschema.override
@@ -0,0 +1,73 @@
+[org.gnome.desktop.interface]
+## No accessibility by default, until we're 100% there's no regression
+toolkit-accessibility = false
+### For the theme, we stay with the defaults
+## Note: for non-GNOME sessions, the cursor theme is defined in /var/adm/fillup-templates/sysconfig.windowmanager-desktop-data-openSUSE from desktop-data-openSUSE
+# cursor-theme = ""
+## Note: gtk[23]-branding-%{branding_name} must contain the same defaults for icon and gtk, otherwise the theme will change when gnome-settings-daemon starts
+# icon-theme = ""
+gtk-theme = "oxygen-gtk"
+
+[org.gnome.desktop.background]
+## Default wallpaper
+picture-uri = "file:///usr/share/mga/backgrounds/default.jpg"
+picture-options = "stretched"
+primary-color = "#258c06"
+secondary-color = "#258c06"
+
+[org.gnome.desktop.screensaver]
+## Default wallpaper
+picture-uri = "file:///usr/share/mga/backgrounds/default.jpg"
+picture-options = "stretched"
+primary-color = "#258c06"
+secondary-color = "#258c06"
+
+[org.gnome.login-screen]
+## Logo in the gdm login dialog
+# logo='/usr/share/icons/hicolor/scalable/apps/distributor.svg'
+
+[org.gnome.libgnomekbd.desktop]
+## Set keyboard layout global per session instead of per window
+#group-per-window = false
+
+[org.gnome.desktop.sound]
+## Make sure to have event sounds by default
+event-sounds = true
+
+[org.gnome.desktop.wm.preferences]
+## Audible bell is more annoying than useful
+audible-bell = false
+### For the theme, we stay with the defaults
+# titlebar-uses-system-font = false
+# titlebar-font = ""
+# theme = ""
+
+[org.gnome.settings-daemon.plugins.xsettings]
+## the PackageKit gtk+ module is too spammy, fdo#23917
+disabled-gtk-modules = [ "pk-gtk-module" ]
+
+[org.gnome.settings-daemon.plugins.media-keys]
+help = "XF86Help"
+
+[org.gnome.shell]
+## Default apps shown in the gnome-shell dash
+favorite-apps = [ 'mageia-draklive-install.desktop', 'register.desktop', 'firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'gnome-documents.desktop', 'mageia-drakconf.desktop' ]
+## Default extensions that are enabled
+#enabled-extensions = [ 'alternative-status-menu@gnome-shell-extensions.gnome.org' ]
+
+[org.gnome.gnome-panel.applet.window-list]
+## Display all workspaces in the gnome-panel window list applet
+#display-all-workspaces = true
+
+[org.freedesktop.Tracker.Miner.Files]
+## Disable indexing on removable media
+index-removable-devices = false
+
+[org.gnome.eog.ui]
+## External editor to use when editing image
+external-editor = "gimp.desktop"
+
+# ovitters: disable to avoid longstanding bug causing occasional 100% CPU usage
+# in gnome-settings-daemon as well as a blinking numlock
+[org.gnome.settings-daemon.peripherals.keyboard]
+remember-numlock-state = false
diff --git a/files/interfaces b/files/interfaces
new file mode 100644
index 0000000..6d2f918
--- /dev/null
+++ b/files/interfaces
@@ -0,0 +1,12 @@
+#
+# Shorewall6 version 4 - Interfaces File
+#
+# For information about entries in this file, type "man shorewall6-interfaces"
+#
+# The manpage is also online at
+# http://www.shorewall.net/manpages6/shorewall6-interfaces.html
+#
+###############################################################################
+?FORMAT 2
+###############################################################################
+#ZONE		INTERFACE		OPTIONS
diff --git a/files/live.51-mageia-resume.conf b/files/live.51-mageia-resume.conf
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/files/live.51-mageia-resume.conf
diff --git a/files/live.modprobe.conf b/files/live.modprobe.conf
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/files/live.modprobe.conf
diff --git a/files/pkgs.pm b/files/pkgs.pm
index 8a32a4d..ee04188 100644
--- a/files/pkgs.pm
+++ b/files/pkgs.pm
@@ -259,7 +259,7 @@ sub remove_unused_packages {
     undef $wait;
 
     # Packages to not remove even if they seem unused
-    my @wanted_hardware_packages = qw(gnome-bluetooth pulseaudio-module-bluetooth gnome-phone-manager bluedevil kppp ppp wireless-tools wpa_supplicant kernel-firmware-nonfree radeon-firmware ralink-firmware rtlwifi-firmware ipw2100-firmware ipw2200-firmware iwlwifi-3945-ucode iwlwifi-4965-ucode iwlwifi-agn-ucode);
+    my @wanted_hardware_packages = qw(gnome-bluetooth pulseaudio-module-bluetooth gnome-phone-manager bluedevil kppp ppp wireless-tools wpa_supplicant kernel-firmware-nonfree radeon-firmware ralink-firmware rtlwifi-firmware ipw2100-firmware ipw2200-firmware iwlwifi-3945-ucode iwlwifi-4965-ucode iwlwifi-agn-ucode b43-fwcutter b43-openfwwf atmel-firmware speedtouch-firmware zd1211-firmware isdn4k-utils rfkill);
     @unused_hardware_packages = difference2(\@unused_hardware_packages, \@wanted_hardware_packages);
 
     @unused_hardware_packages || @unselected_locales or return;