Mga 4 final configsdistro/mga4

24 files changed, 140 insertions, 31 deletions

diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl
index 9ff289b..4f48f8c 100644
--- a/config/auto_inst.cfg.pl
+++ b/config/auto_inst.cfg.pl
@@ -196,8 +196,8 @@ $o = {
            'mono',
 
 	   # block the kernels we dont want
-	   if_($ENV{DRAKLIVE_ARCH} eq 'i586', '/^kernel-desktop-/', '/^fglrx-kernel-3\.12\.6-desktop-/', '/^nvidia-current-kernel-3\.12\.6-desktop-/', '/^nvidia304-kernel-3\.12\.6-desktop-', '/^nvidia173-kernel-3\.12\.6-desktop-/', '/^vboxadditions-kernel-3\.12\.6-desktop-/'),
-           '/^kernel-server-/', '/^fglrx-kernel-3\.12\.6-server-/', '/^nvidia-current-kernel-3\.12\.6-server-/', '/^nvidia304-kernel-3\.12\.6-server-/', '/^nvidia173-kernel-3\.12\.6-server-/', '/^vboxadditions-kernel-3\.12\.6-server-/',
+	   if_($ENV{DRAKLIVE_ARCH} eq 'i586', '/^kernel-desktop-/', '/^fglrx-kernel-3\.12\.8-desktop-/', '/^nvidia-current-kernel-3\.12\.8-desktop-/', '/^nvidia304-kernel-3\.12\.8-desktop-', '/^nvidia173-kernel-3\.12\.8-desktop-/', '/^vboxadditions-kernel-3\.12\.8-desktop-/'),
+           '/^kernel-server-/', '/^fglrx-kernel-3\.12\.8-server-/', '/^nvidia-current-kernel-3\.12\.8-server-/', '/^nvidia304-kernel-3\.12\.8-server-/', '/^nvidia173-kernel-3\.12\.8-server-/', '/^vboxadditions-kernel-3\.12\.8-server-/',
 	   '/^broadcom-wl-/',
 	   
 	    if_($ENV{DRAKLIVE_PRODUCT} =~ /LiveCD/i, 'libreoffice-core'),
@@ -218,6 +218,9 @@ $o = {
            # broken
            'audacity',
            
+           #  not wanted
+           'mate-polkit',
+           
            # theese are in live media
            'broadcom-bcma-config', 'broadcom-ssb-config',
            
@@ -247,7 +250,7 @@ $o = {
 	   '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',
+	   'mageia-doc-mcc-en', 'bind-utils',
 	   
 	   if_($ENV{DRAKLIVE_REGION} eq 'all', 'vim-enhanced', ),
 	   
@@ -256,7 +259,7 @@ $o = {
 
            if_($ENV{DRAKLIVE_PRODUCT} =~ /gaming/i, 'task-games'),
 
-           if_($has_gnome, 'gnome-shell', 'caribou', 'caribou-gtk3', 'gparted', 'gnome-classic-session',),
+           if_($has_gnome, 'gnome-shell', 'caribou', 'caribou-gtk3', 'brasero', 'gparted', 'gnome-classic-session',),
 
            if_($ENV{DRAKLIVE_PRODUCT} =~ /liveusb-rw/i,
                'samba-client',
@@ -337,8 +340,8 @@ $o = {
                              if_($has_xfce || $has_lxde, "rm -f /etc/sysconfig/autologin"),
                              if_($distro_theme eq 'Liveusb-Rw',
                                  #- set blue gtk theme for Liveusb-Rw in Gnome
-                                 "/usr/bin/gconftool-2 --config-source=xml::/etc/gconf/gconf.xml.local-defaults/ --direct --type=string --set /apps/metacity/general/theme 'Ia Ora Blue'",
-                                 "/usr/bin/gconftool-2 --config-source=xml::/etc/gconf/gconf.xml.local-defaults/ --direct --type=string --set /desktop/gnome/interface/gtk_theme 'Ia Ora Blue'",
+                                 #/usr/bin/gconftool-2 --config-source=xml::/etc/gconf/gconf.xml.local-defaults/ --direct --type=string --set /apps/metacity/general/theme 'Ia Ora Blue'",
+                                 #/usr/bin/gconftool-2 --config-source=xml::/etc/gconf/gconf.xml.local-defaults/ --direct --type=string --set /desktop/gnome/interface/gtk_theme 'Ia Ora Blue'",
                                  #- set blue gtk theme for Liveusb-Rw in GTK
                                  "perl -pi -e 's/META_CLASS=.*/META_CLASS=powerpack/' /etc/sysconfig/system",
                                  "echo MDV_MENU_STYLE=discovery > /etc/sysconfig/menustyle",
diff --git a/config/live.cfg b/config/live.cfg
index af07ece..5b8b4cb 100644
--- a/config/live.cfg
+++ b/config/live.cfg
@@ -44,12 +44,20 @@ my $_l = {
 		#[ 'files/draklive-install.desktop', '/usr/share/applications/mageia-draklive-install.desktop', { mode => 0755, no_install => 1 } ],
 		[ 'files/register.desktop', '/usr/share/applications/register.desktop', { mode => 0644 } ],
 		[ 'files/01_gsettings-desktop-schemas.gschema.override', '/usr/share/glib-2.0/schemas/01_gsettings-desktop-schemas.gschema.override', { mode => 0644, no_install => 1 } ],
+		[ 'files/glib2-branding.gschema.override', '/usr/share/glib-2.0/schemas/glib2-branding.gschema.override', { mode => 0644 } ],
             ),
             # blacklist pata_acpi
             [ 'files/blacklist_ide.conf', '/etc/modprobe.d/blacklist_ide.conf', { mode => 0644 } ],
 
 	    # lock bluedevil, radeon-firmware, kernel-firnware-nonfree
             [ 'files/pkgs.pm', '/usr/lib/libDrakX/pkgs.pm', { mode => 0644 } ],
+            # shorewall6
+            #[ 'files/interfaces', '/etc/shorewall6/interfaces', { mode => 0600 } ],
+            
+            # clean live files
+            [ 'files/live.51-mageia-resume.conf', '/etc/dracut.conf.d/51-mageia-resume.conf', { mode => 0644 } ],
+            [ 'files/live.modprobe.conf', '/etc/modprobe.conf', { mode => 0644 } ],
+            
             
             # add local repos
             if_($live->{settings}{arch} eq 'i586',
@@ -72,6 +80,12 @@ my $_l = {
                 [ 'files/live.modprobe.CD', '/etc/modprobe.d/live.conf', { mode => 0644, no_install => 1 } ],
                 # livecd specific initrd
                 [ 'files/live-dracut.conf', '/etc/dracut.conf.d/60-live.conf', { mode => 0644, no_install => 1 } ],
+                # live media harddrake
+#                [ 'files/harddrake2/kernel', '/etc/sysconfig/harddrake2/kernel', { mode => 0644 } ],
+#                [ 'files/harddrake2/service.conf', '/etc/sysconfig/harddrake2/service.conf', { mode => 0644, no_install => 1 } ],
+#                [ 'files/harddrake2/mandrake_everytime', '/etc/rc.d/init.d/mandrake_everytime', { mode => 0755 } ],
+#                [ 'files/harddrake2/services.pm', '/usr/lib/libDrakX/services.pm', { mode => 0644 } ],
+#                [ 'files/harddrake2/display_driver_helper', '/usr/sbin/display_driver_helper', { mode => 0755 } ],
             ),
             #- disable first boot wizard at live boot
             [ 'files/firstboot', '/etc/sysconfig/firstboot', { mode => 0644 } ],
@@ -99,8 +113,8 @@ my $_l = {
             (map { [ 'files/draksnapshot.sysconfig', $_ . '/.draksnapshot', { mode => 0644, no_install => 1 } ] } @user_config_dirs),
             [ 'files/compute-ooo-dicts.pl', '/usr/sbin/compute-ooo-dicts.pl', { mode => 0755 } ],
             [ 'files/compute-i18n-list.pl', '/usr/sbin/compute-i18n-list.pl', { mode => 0755 } ],
-            if_($live->{settings}{desktop} eq 'GNOME', 
-	        [ 'files/99dm-reload.xsetup', '/etc/X11/xsetup.d/', { mode => 0755 } ]),
+#            if_($live->{settings}{desktop} eq 'GNOME', 
+#	        [ 'files/99dm-reload.xsetup', '/etc/X11/xsetup.d/', { mode => 0755 } ]),
             if_($live->{settings}{product} =~ /guadec/i,
                 [ 'files/GUADEC-booklet.desktop', '/usr/share/nautilus/default-desktop/booklet.desktop' ],
             ),
@@ -110,6 +124,7 @@ my $_l = {
             "/etc/udev/rules.d/70-persistent-*.rules",
             "/var/lib/dbus/machine-id",
             "/etc/ssh/ssh_host_*",
+            #"/etc/X11/wmsession.d/29drak3d",
         ],
         module_options => {
             loop => "max_loop=64",
@@ -136,7 +151,7 @@ my $_l = {
             #qw(acpi acpid apmd),     # enabled by drakboot when needed
             qw(dkms),           # slows down live boot, reenabled after install
             qw(anacron crond), # slows down basic usage and install, reenabled after install
-            qw(sshd),
+            qw(sshd msec),
             qw(hcfpci hsf slmodemd),
             qw(portmap nfs-common),
             qw(kav4ws freshclam clamd),
@@ -203,6 +218,8 @@ my $_l = {
                             ),
                             if_($live->{settings}{desktop} eq 'GNOME',
                         	"glib-compile-schemas /usr/share/glib-2.0/schemas/",
+                        #	"su - live  -c xdg-user-dirs-update",
+                        #	"killall gpg-agent",
                             ),
 			    # FIXME
                             #if_($live->{settings}{desktop} eq 'GNOME',
@@ -216,7 +233,7 @@ my $_l = {
                             "urpmi.addmedia 'Live Core' /var/local/mga_rpms/core with media_info/hdlist.cz",
                             "urpmi.addmedia 'Live Nonfree' /var/local/mga_rpms/nonfree with media_info/hdlist.cz",
 
-                            #grub2
+                            # grub2
                             "urpmi --auto grub2 ||:",
                         ),
         additional_media => [
@@ -264,7 +281,7 @@ my $_l = {
         media => {
             storage => 'cdrom',
             bootloader_timeout => 10,
-            boot_entries => [ "" => "", "linux" => " install", "safe" => "", "harddisk" => "" ],
+            boot_entries => [ "" => "", "linux" => " install", "harddisk" => "" ],
             if_($live->{settings}{product} =~ /LiveCD/i,
                 source => build_one_label($live),
                 pre => [ 'for i in seq 1 5; do showlabels --removable | grep '.build_one_label($live).'; if [ $? -eq 0 ]; then break; fi; sleep 1; done' ],
diff --git a/config/settings-livecd.cfg b/config/settings-livecd.cfg
index cacbfdf..524dafa 100644
--- a/config/settings-livecd.cfg
+++ b/config/settings-livecd.cfg
@@ -11,7 +11,7 @@ region=int
 pack=
 name=Mageia
 product=LiveDVD
-version=4-RC
+version=4
 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
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;