Switch to using draklive2 (merge branch 'user/martinw/use-grub2')

55 files changed, 384 insertions, 1306 deletions

diff --git a/tools/build_live.sh b/build_all.sh
index dce0430..9a7c3f1 100755
--- a/tools/build_live.sh
+++ b/build_all.sh
@@ -1,10 +1,8 @@
 #!/bin/bash
-# Run this script from the draklive-config directory:
-#  ./tools/build_live.sh
 
 declare -A desktops
 
-release=6-rc
+release=6
 
 archs="i586 x86_64"
 
@@ -12,15 +10,13 @@ desktops[i586]="Xfce"
 
 desktops[x86_64]="GNOME Plasma Xfce"
 
-pushd files/mga_rpms
-./update_media.sh
-popd
+./update_bootloader_files.sh
 for arch in $archs; do
   for desktop in ${desktops[$arch]}; do
-    sudo -u draklive sudo /usr/sbin/draklive --clean --all --define arch=$arch --define desktop=$desktop
+    sudo -u draklive sudo /usr/bin/draklive2 --clean --all --define arch=$arch --define desktop=$desktop
     sudo -u bcd mkdir -p /home/bcd/public_html/isos/trial-builds/Mageia-${release}-LiveDVD-${desktop}-${arch}-DVD
     sudo -u bcd cp /home/draklive/var-data/build/Mageia-${release}-LiveDVD-${desktop}-${arch}-DVD/dist/* /home/bcd/public_html/isos/trial-builds/Mageia-${release}-LiveDVD-${desktop}-${arch}-DVD
     # not enough space on rabbit's RAM disk for all four variants, so delete as we go
-    sudo -u draklive sudo /usr/sbin/draklive --clean --define arch=$arch --define desktop=$desktop
+    sudo -u draklive sudo /usr/bin/draklive2 --clean --define arch=$arch --define desktop=$desktop
   done
 done
diff --git a/build_one.sh b/build_one.sh
new file mode 100755
index 0000000..161030e
--- /dev/null
+++ b/build_one.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+./update_bootloader_files.sh
+if [ $# -gt 0 ] ; then
+  draklive2 $*
+else
+  draklive2 --clean --all
+fi
diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl
deleted file mode 100644
index 6abdab6..0000000
--- a/config/auto_inst.cfg.pl
+++ /dev/null
@@ -1,266 +0,0 @@
-#!/usr/bin/perl -cw
-# 
-# You should check the syntax of this file before using it in an auto-install.
-# You can do this with 'perl -cw auto_inst.cfg.pl' or by executing this file
-# (note the '#!/usr/bin/perl -cw' on the first line).
-
-my $distro_theme = 'Default';
-my $distro_release = 'Default';
-my $distro_config = lc($distro_release);
-
-my @desktops = split(/\|/, $ENV{DRAKLIVE_DESKTOP});
-my $has_plasma = member('Plasma', @desktops);
-my $has_gnome = member('GNOME', @desktops);
-my $has_xfce = member('Xfce', @desktops);
-my $has_lxde = member('LXDE', @desktops);
-my $has_enlightenment = member('Enlightenment', @desktops);
-
-$o = {
-       'media' => [
-           {
-               type => 'media_cfg',
-               url => 'drakx://media',
-               selected_names => join(',',
-                                      'Core Release', 'Core Updates',
-                                      'Nonfree Release', 'Nonfree Updates',
-                                  ),
-           },
-           if_($ENV{DRAKLIVE_ADDITIONAL_REPOSITORY}, 
-               { type => 'media', url => $ENV{DRAKLIVE_ADDITIONAL_REPOSITORY} },
-           ),
-       ],
-       # temporary (?) fix for mga#12299
-       'enabled_media' => [
-           'Core Release',
-           'Core Updates',
-           'Nonfree Release',
-           'Nonfree Updates',
-       ],
-       'rpmsrate_flags_chosen' => {
-           LIVE => 1,
-           (map { ("CAT_$_" => 1) } (
-               # office
-               qw(OFFICE SPELLCHECK PIM ARCHIVING PRINTER),
-               # multimedia
-               qw(AUDIO VIDEO GRAPHICS),
-               # internet
-               qw(NETWORKING_WWW NETWORKING_MAIL NETWORKING_NEWS COMMUNICATIONS NETWORKING_CHAT),
-               qw(NETWORKING_FILE_TRANSFER NETWORKING_IRC NETWORKING_INSTANT_MESSAGING NETWORKING_DNS),
-               # network
-               qw(NETWORKING_REMOTE_ACCESS NETWORKING_FILE),
-               qw(NETWORKING_REMOTE_ACCESS_SERVER),
-               # config
-               qw(CONFIG),
-               # console
-               qw(EDITORS TERMINALS TEXT_TOOLS SHELLS FILE_TOOLS),
-               # system
-               qw(SYSTEM MINIMAL_DOCS X ACCESSIBILITY THEMES),
-               if_($has_plasma, qw(PLASMA5)),
-               if_($has_gnome, qw(GNOME)),
-               if_($has_xfce, qw(XFCE)),
-               if_($has_lxde, qw(LXDE)),
-               if_($has_enlightenment, qw(E17)),
-           )),
-       },
-       # so that rpmsrate flags are really used
-       'compssListLevel' => 5, # default from install_steps_interactive
-       'skipped_packages' => [
-
-	    # i586 arch specific
-	    if_($ENV{DRAKLIVE_ARCH} eq 'i586',
-		'/^kernel-desktop-/', '/^vboxadditions-kernel-.*-desktop-/',
-		'/^libatlas3-/',
-	    ),
-
-            # x86_64 arch specific
-            if_($ENV{DRAKLIVE_ARCH} eq 'x86_64',
-                '/^lib64atlas3-/',
-            ),
-
-            # no server kernels
-            '/^kernel-server-/', '/^vboxadditions-kernel-.*-server-/',
-            # no legacy bootloaders, we default to grub2
-            'grub', 'lilo',
-            # no efi stuff - only needed for install, and shipped in live core repo
-            'grub2-efi', 'efibootmgr', 'efivar',
-
-	    # no devel packages on live media
-	    'glibc-devel', 'gdb', 'gcc', 'gcc3.3', 'dkms',
-	    'empathy', 'gnome-builder', # pulls devel stuff
-
-            # shipped in live nonfree repo
-	    'dkms-broadcom-wl', 'broadcom-wl-common',
-            'broadcom-bcma-config', 'broadcom-ssb-config',
-	    '/^x11-driver-video-fglrx/',
-	    '/^x11-driver-video-nvidia/',
-
-	    # huge deps
-	    'denemo', # pulls in lilypond and texlive
-	    'virtuoso-opensource', # not needed on live media
-            'mono', # bloat
-
-	    # old stuff
-	    'aspell', 'aspell-en',
-	    'asihpi-firmware', 'hdsploader', 'mixartloader', 'pcxhrloader', 'usx2yloader', 'vxloader',
-            'drakfax', 'efax', 'rxvt',
-            'nspluginwrapper','nspluginwrapper-i386', # not needed anymore (mga #2001)
-
-    	    # broken stuff
-            'audacity', 'xguest', 'apper',
-
-            # not wanted
-            'al-anvar', #  (mga #9752)
-            #'mate-polkit',
-            'openssh-server',
-	    'manatools-gui',
-
-            #- no distribution license
-            'flash-player-plugin',
-
-            # Gnome specific stuff
-            if_($has_gnome,
-        	'beagle', 'inkscape',
-        	'bluedevil', #- bluez-pin provide
-        	'pinentry-qt4', #- qt4 app
-        	'/noatun/', #- prefer amarok
-		'polkit-kde-agent-1',
-            ),
-
-            # Plasma specific stuff
-            if_($has_plasma,
-            ),
-       ],
-
-       'default_packages' => [
-            if_($has_lxde, "mageia-lxde-config-$distro_release"),
-
-	    # i586 arch specific
-	    if_($ENV{DRAKLIVE_ARCH} eq 'i586',
-		'vboxadditions-kernel-desktop586-latest',
-	    ),
-
-            # x86_64 arch specific
-            if_($ENV{DRAKLIVE_ARCH} eq 'x86_64',
-		'vboxadditions-kernel-desktop-latest',
-            ),
-
-	    # try to protect base packages from rpmlib/urpmi cascade bug
-	    'basesystem', 'x11-server-common','x11-driver-video', 'x11-driver-input',
-	    'x11-driver-video-vboxvideo',
-	    
-	    # utils wanted
-	    'mc', 'btrfs-progs', 'shorewall-ipv6', 'hdparm', 'parted', 'glxinfo', 'patch',
-	    'bind-utils', 'mdadm', 'dmraid', 'usbutils', # we want lsusb
-	    'shared-mime-info', # needed for .desktop files to work atleast in gnome
-	    'vim-enhanced', # full ediitor
-	    'dnf', 'dnf-plugins-core', # some users want dnf
-	    'manatools', # just the ncurses version
-	    'simple-scan', # s-c-p wants this if it detects a combined printer/scanner
-	    'Xdialog', # provides nicer UI for lxcontrol
-
-	    'bluez-firmware', # missed firmware
-
-	    # mageia specific
-	    'mageiawelcome', # nice helper app
-	    'mageia-doc-mcc-en', # some nice docs
-
-            # Gnome specific stuff
-            if_($has_gnome,
-        	'task-gnome', 'gdm', # sometimes gets nuked during build
-        	'gnome-shell', 'caribou', 'caribou-gtk3', 'brasero', 'gparted', 'gnome-classic-session', 'hexchat',
-		'adwaita-gtk2-theme',
-            ),
-
-            # Plasma specific stuff
-            if_($has_plasma,
-        	'task-plasma5', 'sddm', # sometimes gets nuked during build
-            ),
-	    # Xfce specific stuff
-	    if_($has_xfce,
-		'task-xfce4',
-		'gparted', # provides some options not currently supported in diskdrake
-	    ),
-       ],
-
-       'preferred_packages' => join(',', $has_plasma ? 'sddm' : 'gdm'),
-       'meta_class' => 'desktop',
-       'desktop' => first(@desktops),
-       if_($ENV{DRAKLIVE_DEFAULT_USER}, 'autologin' => $ENV{DRAKLIVE_DEFAULT_USER}),
-       # explicitely specify the security level, so that environment of the build machine doesn't take precedence
-       'security' => 1,
-       'useSupermount' => 'magicdev',
-       'users' => [
-		    if_($ENV{DRAKLIVE_DEFAULT_USER}, {
-		      'icon' => 'default',
-		      'realname' => '',
-		      'uid' => '',
-		      'groups' => [],
-		      'name' => $ENV{DRAKLIVE_DEFAULT_USER},
-		      'shell' => '/bin/bash',
-		      'gid' => ''
-		    }),
-		  ],
-       'locale' => {
-                     'country' => 'US',
-                     'IM' => undef,
-                     'lang' => 'en_US',
-                     'langs' => +{
-                         $ENV{DRAKLIVE_REGION} eq 'all' ? (all => 1) : (map { $_ => 1 } split(':', $ENV{DRAKLIVE_LANGS}))
-                      },
-                     'utf8' => 1
-                   },
-       'authentication' => {
-			     'shadow' => 1,
-			     'local' => 1,
-			     'blowfish' => 1
-			   },
-       'superuser' => {
-			'pw' => '',
-			'realname' => 'root',
-			'uid' => '0',
-			'shell' => '/bin/bash',
-			'home' => '/root',
-			'gid' => '0'
-		      },
-       'keyboard' => {
-		       'GRP_TOGGLE' => '',
-		       'KBCHARSET' => 'C',
-		       'KEYBOARD' => 'us',
-		       'KEYTABLE' => 'us'
-		     },
-       'timezone' => {
-		       'ntp' => undef,
-		       'timezone' => 'America/New_York',
-		       'UTC' => 1
-		     },
-       'X' => { disabled => 1 }, #- disable auto-configuration that may install unwanted packages
-       'match_all_hardware' => 1,
-       'excludedocs' => 0,
-       'postInstallNonRooted' => join(";",
-                                      # drakx-in-chroot roots the mount point one level higher when
-                                      # the build system arch matches DRAKLIVE_ARCH.
-                                      "if [ -d /tmp/media/$ENV{DRAKLIVE_ARCH} ]",
-                                      "then cp /tmp/media/$ENV{DRAKLIVE_ARCH}/release-notes.* /mnt",
-                                      "else cp /tmp/media/release-notes.* /mnt",
-                                      "fi",
-                                      "chmod 0644 /mnt/release-notes.*",
-                                 ),
-       'postInstall' => join(";",
-			     # systemd boots by default to multiuser.target (old init 3), so change to graphical (old init 5)
-                             "ln -sf /lib/systemd/system/graphical.target /etc/systemd/system/default.target",
-                             # have inittab match systemd defaulting to init 5
-                             "perl -pi -e 's/^id:3:initdefault:/id:5:initdefault:/' '/etc/inittab'",
-                             #- FIXME: in any::set_autologin, unlink if gdm/sddm conf file and binary exist
-                             if_($has_xfce || $has_lxde, "rm -f /etc/sysconfig/autologin"),
-                         ),
-       'autoExitInstall' => 1,
-       'keep_unrequested_dependencies' => 0,
-     };
-
-my $old = \&install::pkgs::empty_packages;
-undef *install::pkgs::empty_packages;
-*install::pkgs::empty_packages = sub {
-    my $packages = &$old;
-    $packages->{debug_URPM} = sub { log::l("XXX: $_[0]") };
-    $packages;
-};
diff --git a/config/build.cfg b/config/build.cfg
new file mode 100644
index 0000000..71ffa02
--- /dev/null
+++ b/config/build.cfg
@@ -0,0 +1,332 @@
+my $distro          = $build->{settings}{distro};
+my $version         = $build->{settings}{version};
+my $product         = $build->{settings}{product};
+my $arch            = $build->{settings}{arch};
+my $default_user    = $build->{settings}{default_user};
+
+my @desktops        = split(/\|/, $build->{settings}{desktop});
+my $has_gnome       = member('GNOME',  @desktops);
+my $has_lxde        = member('LXDE',   @desktops);
+my $has_plasma      = member('Plasma', @desktops);
+my $has_xfce        = member('Xfce',   @desktops);
+
+my @user_config_dirs = ('/etc/skel', '/home/' . $default_user);
+
+sub build_label {
+    my ($build) = @_;
+
+    join('-', $distro, $version, $product, $desktops[0], $arch);
+}
+
+sub build_title {
+    my ($build) = @_;
+
+    join(' ', $distro, $version, $product, $desktops[0]);
+}
+
+my $default_append = 'root=mgalive:LABEL=' . build_label($build) . ' splash quiet noiswmd audit=0 rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0';
+
+my $config = {
+    system => {
+        enabled_media => [
+            'Core Release',
+            'Core Updates',
+            'Nonfree Release',
+            'Nonfree Updates',
+        ],
+
+        rpmsrate_flags => [
+            'LIVE',
+            (map { "CAT_$_" } (
+                # office
+                qw(OFFICE SPELLCHECK PIM ARCHIVING PRINTER),
+                # multimedia
+                qw(AUDIO VIDEO GRAPHICS),
+                # internet
+                qw(NETWORKING_WWW NETWORKING_MAIL NETWORKING_NEWS COMMUNICATIONS NETWORKING_CHAT),
+                qw(NETWORKING_FILE_TRANSFER NETWORKING_IRC NETWORKING_INSTANT_MESSAGING NETWORKING_DNS),
+                # network
+                qw(NETWORKING_REMOTE_ACCESS NETWORKING_FILE),
+                # config
+                qw(CONFIG),
+                # console
+                qw(EDITORS TERMINALS TEXT_TOOLS SHELLS FILE_TOOLS),
+                # system
+                qw(SYSTEM MINIMAL_DOCS X ACCESSIBILITY THEMES),
+                # desktop
+                if_($has_gnome,  qw(GNOME)),
+                if_($has_lxde,   qw(LXDE)),
+                if_($has_plasma, qw(PLASMA5)),
+                if_($has_xfce,   qw(XFCE)),
+            ))
+        ],
+        rpmsrate_level => 5,
+
+        include_packages => [
+            # Satisfy the basesystem bootloader requirement.
+            'drakiso-null-bootloader',
+
+            # Some extra admin tools.
+            'bind-utils', 'btrfs-progs', 'dmraid', 'gparted', 'hdparm',
+            'manatools', 'mc', 'mdadm', 'vim-enhanced',
+
+            # Mageia docs.
+            'mageia-doc-mcc-en', 'mageia-doc-draklive-en',
+
+            # Allow patching during customisation.
+            'patch',
+
+            # s-c-p wants this if it detects a combined printer/scanner.
+            'simple-scan',
+
+            # Provide a nicer UI for lxcontrol.
+            'Xdialog',
+
+            if_($has_gnome,
+                'task-gnome',
+                'adwaita-gtk2-theme', # Temporary fix for mga#20868.
+                'hexchat', # Alternative IRC client.
+            ),
+
+            if_($has_lxde,
+                'mageia-lxde-config-Default'
+            ),
+
+            if_($has_plasma,
+                'task-plasma5',
+            ),
+
+            if_($has_xfce,
+                'task-xfce',
+            ),
+        ],
+        exclude_packages => [
+            if_($arch eq 'i586',
+                # We want the desktop586 kernel for maximum hardware compatibility.
+                '/^kernel-desktop-/', '/^vboxadditions-kernel-.*-desktop-/',
+            ),
+
+            # No server kernels.
+            '/^kernel-server-/', '/^vboxadditions-kernel-.*-server-/',
+
+            # No bootloaders. The GRUB2 bootloaders are needed for install, so we add
+            # them to the local repo, which means they are automatically excluded.
+            'grub', 'lilo',
+
+            # No distribution license.
+            'flash-player-plugin',
+
+            # Unwanted stuff.
+            'efax',
+
+            # Not yet ready.
+            'manatools-gui',
+
+            if_($has_gnome,
+                'gnome-builder',
+                'inkscape',
+                'polkit-kde-agent-1',
+            ),
+        ],
+        preferred_packages => [
+            if_($has_gnome,  'gdm'),
+            if_($has_plasma, 'sddm'),
+        ],
+        local_repo_packages => [
+            # core
+            'broadcom-bcma-config',
+            'broadcom-ssb-config',
+            'dkms',
+            'efibootmgr', 'efivar', 'refind',
+            'grub2', 'grub2-efi', 'grub2-mageia-theme', 'os-prober',
+            if_($arch eq 'i586',   'kernel-desktop586-devel-latest'),
+            if_($arch eq 'x86_64', 'kernel-desktop-devel-latest'),
+
+            # nonfree
+            'dkms-broadcom-wl',
+            'dkms-nvidia340', 'x11-driver-video-nvidia340',
+            'dkms-nvidia390', 'x11-driver-video-nvidia390',
+            'dkms-nvidia-current', 'x11-driver-video-nvidia-current',
+        ],
+
+        langs_always => [ 'en_US' ],
+
+        post_install => join(";",
+            # systemd boots by default to multiuser.target (old init 3), so change to graphical (old init 5).
+            "ln -sf /lib/systemd/system/graphical.target /etc/systemd/system/default.target",
+        ),
+
+        disable_services => [
+            # Uncommon hardware.
+            qw(bpalogin capi4linux cpqarrayd mdadm oki4daemon pcscd),
+            # Unneeded software.
+            qw(chronyd snmpd),
+            if_($has_gnome, qw(ntpd)),
+            # Slows down basic usage and install, reenabled after install.
+            qw(crond msec),
+        ],
+        disable_timers => [
+        ],
+        files => [
+            # Clean configuration files.
+            [ 'files/empty.conf', '/etc/dracut.conf.d/51-mageia-resume.conf', { mode => 0644 } ],
+            [ 'files/empty.conf', '/etc/modprobe.conf', { mode => 0644 } ],
+
+            # Provide a noxorgconf boot command option to try to fix issues with nouveau driver on some hardware.
+            [ 'files/10no-xorg-conf.xsetup', '/etc/X11/xsetup.d/10no-xorg-conf.xsetup', { mode => 0755 } ],
+
+            # Blacklist pata_acpi (mga#3395).
+            [ 'files/blacklist-ide.conf', '/etc/modprobe.d/blacklist-ide.conf', { mode => 0644 } ],
+
+            # Live media specific initrd.
+            [ 'files/dracut-live.conf', '/etc/dracut.conf.d/60-live.conf', { mode => 0644, no_install => 1 } ],
+
+            # Enable drakx-finish-install at live boot.
+            [ "files/finish-install", '/etc/sysconfig/finish-install', { mode => 0644 } ],
+
+            # Disable mgaonline in live mode.
+            (map { [ 'files/mgaonlinerc', $_ . '/.MgaOnline/mgaonline', { mode => 0644, no_install => 1 } ] } @user_config_dirs),
+
+            # Disable suspend and hibernate in live mode.
+            [ 'files/50-disable-suspend.pkla', '/etc/polkit-1/localauthority/50-local.d/50-disable-suspend.pkla', { mode => 0644, no_install => 1 } ],
+
+            # sysconfig files for first boot after install.
+            [ 'files/draklive-install.d/finish-install', '/etc/draklive-install.d/sysconfig/finish-install', { mode => 0644 } ],
+
+            # Reenable services in installed system.
+            [ 'files/draklive-install.d/services', '/etc/draklive-install.d/services', { mode => 0644 } ],
+
+            # Fix for sometimes wrong permissions after install.
+            [ 'files/draklive-install.d/run.d/home-live-permissions.sh', '/etc/draklive-install.d/run.d/home-live-permissions.sh', { mode => 755 } ],
+
+            if_($has_gnome,
+                # Add draklive-install icon to favourites in live mode and disable screen locking
+                # (override files are processed in alphabetical order - make sure this one comes last).
+                [ 'files/live.gschema.override', '/usr/share/glib-2.0/schemas/live.gschema.override', { mode => 0644, no_install => 1 } ],
+
+                # Disable Wayland when we know it won't work (workaround for mga#20079).
+                [ 'files/50gdm-disable-wayland.xsetup', '/etc/X11/xsetup.d/50gdm-disable-wayland.xsetup', { mode => 0755 } ],
+            ),
+
+            if_($has_plasma,
+                [ 'files/draklive-install.d/run.d/generate-gtk-icon-cache.sh', '/etc/draklive-install.d/run.d/generate-gtk-icon-cache.sh', { mode => 755 } ],
+
+                # Remove live user from SDDM greeter.
+                [ 'files/draklive-install.d/remove.d/clear-sddm-state', '/etc/draklive-install.d/remove.d/clear-sddm-state', { mode => 0644 } ],
+
+                # Disable Korganiser autostart.
+                [ 'files/korgacrc', '/etc/kde/korgacrc', { mode => 0644 } ],
+            ),
+
+        ],
+        remove_files => [
+            (map { "/etc/modprobe.preload.d/$_" } qw(cpufreq pcmcia rfswitch)),
+            "/etc/udev/rules.d/70-persistent-*.rules",
+            "/var/lib/dbus/machine-id",
+            "/etc/ssh/ssh_host_*",
+        ],
+        patches => [
+        ],
+        final_fixes => join(';',
+            if_($has_gnome,
+                # Modify and compile schema to get draklive-install and Firefox in menu.
+                "sed -i 's/epiphany.desktop/firefox.desktop/' /usr/share/glib-2.0/schemas/glib2-branding.gschema.override",
+                "glib-compile-schemas /usr/share/glib-2.0/schemas/",
+
+                # Fix permissions to enable GDM to rerun if the user logs out.
+                "chown -R gdm:gdm /var/lib/gdm",
+
+                # Switch to NetworkManager.
+                "systemctl -q disable network",
+                "systemctl -q disable network-up",
+                "systemctl -q enable NetworkManager.service",
+                "systemctl -q enable NetworkManager-wait-online.service",
+                "sed -i 's/NETWORK=yes/NETWORK=no/' /etc/draklive-install.d/sysconfig/finish-install",
+                "echo 'AUTOSTART=FALSE' > /home/live/.net_applet",
+            ),
+
+            if_($has_plasma,
+                "rm -f /usr/share/icons/*/icon-theme.cache",
+                "cp -a /etc/akonadi/mysql-global.conf /etc/akonadi/mysql-global-standard.conf",
+                "cp /etc/akonadi/mysql-global-mobile.conf /etc/akonadi/mysql-global.conf",
+                "ak=/etc/draklive-install.d/run.d/restore-akonadi-config.sh; echo -e '#!/bin/sh\ncp /etc/akonadi/mysql-global-standard.conf /etc/akonadi/mysql-global.conf' > \$ak; chmod +x \$ak",
+            ),
+
+            if_($has_xfce,
+                # Add a desktop icon to run draklive-install.
+                "mkdir -p /home/$default_user/Desktop",
+                "cp /usr/share/applications/mageia-draklive-install.desktop /home/$default_user/Desktop/draklive-install.desktop",
+                "chmod 750 /home/$default_user/Desktop/draklive-install.desktop",
+            ),
+
+            # Fix permissions for copied files.
+            "chown -R $default_user.$default_user /home/$default_user",
+
+            # Set default user name for draklive-install.
+            "echo $default_user > /etc/draklive-install.d/user",
+            "sed -i s/DEFAULT_USER/$default_user/ /etc/draklive-install.d/sysconfig/finish-install",
+
+            # Allow draklive-install to spawn subtasks that access the display.
+            "echo 'session    optional     pam_xauth.so # for draklive-install' >> /etc/pam.d/polkit-1",
+
+            # Disable HPLIP systray startup.
+            "echo 'Hidden=true' >> /etc/xdg/autostart/hplip-systray.desktop",
+
+            # Set the timestamp on the font directories to be a whole second
+            # fc-cache looks at the nano second portion which may be non-zero
+            # as we are on ext4, but then it will compare against the stamps
+            # on the squashfs live image which have whole second resolution
+            # (adapted from fix descrived in OpenMandriva bug 1764).
+            "find /usr/share/fonts -type d -exec touch -t \$(date +%Y%m%d%H%M.%S) '{}' ';'",
+            # Now update the cache for the new timestamps.
+            "fc-cache -rf",
+
+            # Set the initial wireless regulatory domain to "world", enabling
+            # all possible wireless channels to be used.
+            "sed -i -r 's/CRDA_DOMAIN=.*/CRDA_DOMAIN=00/' /etc/sysconfig/network",
+        ),
+
+        vga_mode => 788,
+    },
+    loopbacks => {
+        exclude => [
+            { path => '/root/drakx' },
+        ],
+    },
+    regions => {
+        int => [qw(en)],
+    },
+    media => {
+        label               => build_label($build),
+        overlay_label       => 'mgalive-persist',
+        bootloader_title    => build_title($build),
+        bootloader_theme    => 'bootloader/maggy',
+        bootloader_font     => 'bootloader/unicode.pf2',
+        bootloader_langs    => 'bootloader/lang-names.txt',
+        bootloader_messages => 'bootloader/messages',
+        bootloader_default  => 0,
+        bootloader_timeout  => 10,
+        bootloader_entries  => [
+            'Boot Mageia Live'                               => { append => $default_append . ' xdriver=free' },
+            ' + use non-free video drivers (slower to boot)' => { append => $default_append . ' nokmsboot' },
+            'Install Mageia Live'                            => { append => $default_append . ' xdriver=free install' },
+            ' + use non-free video drivers (slower to boot)' => { append => $default_append . ' nokmsboot install' },
+            'Memory Test'                                    => { command => 'linux16', image  => '/boot/memtest', initrd => 'none' },
+        ],
+        mbr_boot_img        => 'bootloader/images/boot_hybrid.img',
+        eltorito_img        => 'bootloader/images/eltorito.img',
+        if_($arch eq 'i586',
+            efi_type        => '32bit',
+            boot32_efi      => 'bootloader/images/bootia32.efi'
+        ),
+        if_($arch eq 'x86_64',
+            efi_type        => '64bit',
+            boot64_efi      => 'bootloader/images/bootx64.efi'
+        ),
+        copy_from_repo => [
+            'autorun.inf'       => 'files/autorun.inf',
+            'dosutils'          => 'files/dosutils',
+            'isolinux/memtest'  => "boot/memtest",
+        ],
+    },
+};
diff --git a/config/live.cfg b/config/live.cfg
deleted file mode 100644
index 30cce52..0000000
--- a/config/live.cfg
+++ /dev/null
@@ -1,332 +0,0 @@
-#!/usr/bin/perl -cw
-
-use MDK::Common;
-
-my $ooo_version = '3.0';
-my $use_modules = to_bool($live->{settings}{pack});
-my @user_config_dirs = ('/etc/skel', if_($live->{settings}{default_user}, '/home/' . $live->{settings}{default_user}));
-
-sub build_one_label {
-	my ($live) = @_;
-
-        my ($version, $extra) =  split(/-/, $live->{settings}{version});
-	$version .= "S" if $extra eq 'spring';
-	"LABEL=" . join("-", "Mageia", $version, $live->{settings}{desktop}, $live->{settings}{product});
-}
-
-my $_l = {
-    workdir => $live->{settings}{workdir},
-    system => {
-        root => $live->{settings}{chroot},
-        repository => $live->{settings}{repository},
-        auto_install => 'config/auto_inst.cfg.pl',
-        install_env => {
-            DRAKLIVE_DESKTOP => $live->{settings}{desktop},
-            DRAKLIVE_MEDIA => $live->{settings}{media},
-            DRAKLIVE_PRODUCT => $live->{settings}{product},
-            DRAKLIVE_ARCH => $live->{settings}{arch},
-            DRAKLIVE_ADDITIONAL_REPOSITORY => $live->{settings}{additional_repository},
-            DRAKLIVE_COMMERCIAL => $live->{settings}{commercial},
-            DRAKLIVE_DEFAULT_USER => $live->{settings}{default_user},
-        },
-        hide_media_dirs => to_bool($live->{settings}{product} =~ /liveusb-rw/i),
-        if_($live->{settings}{default_user}, preselect_kdm_user => $live->{settings}{default_user}),
-        langs_always => [ 'en_US' ],
-        files => [
-	    if_($live->{settings}{desktop} eq 'GNOME',
-		# fix gnome-shell not showing draklive-install icon in menu in live mode
-		[ '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 } ],
-		# disable Wayland when we know it won't work (workaround for mga#20079)
-		[ 'files/50gdm-disable-wayland.xsetup', '/etc/X11/xsetup.d/50gdm-disable-wayland.xsetup', { mode => 0755 } ],
-            ),
-	    # provide a noxorgconf boot command option to try to fix issues with nouveau driver on some hardware
-	    [ 'files/10no-xorg-conf.xsetup', '/etc/X11/xsetup.d/10no-xorg-conf.xsetup', { mode => 0755 } ],
-
-            # blacklist pata_acpi
-            [ 'files/blacklist_ide.conf', '/etc/modprobe.d/blacklist_ide.conf', { mode => 0644 } ],
-
-            # 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',
-		[ 'files/mga_rpms/i586/mga_rpms', '/var/local' ],
-	    ),
-	    if_($live->{settings}{arch} eq 'x86_64',
-		[ 'files/mga_rpms/x86_64/mga_rpms', '/var/local' ],
-	    ),
-
-	    # add initial dns resolver for online medias
-	    [ 'files/resolv.conf', '/etc/resolv.conf', { mode => 0644 } ],
-
-            # disable suspend and hibernate in live mode
-            [ 'files/50-disable-suspend.pkla', '/etc/polkit-1/localauthority/50-local.d/50-disable-suspend.pkla', { mode => 0644, no_install => 1 } ],
-            #- make cups the default spooler
-            [ 'files/defaultspooler', '/etc/foomatic/defaultspooler', { mode => 0644 } ],
-            if_(member($live->{settings}{media}, 'CD', 'DVD'),
-                #- eject eject cd medium before halt/reboot
-                [ 'files/halt-local.service', '/etc/systemd/system/halt-local.service', { mode => 0644, no_install => 1 } ],
-                [ 'files/halt.local.CD', '/sbin/halt.local', { mode => 0755, no_install => 1 } ],
-                #- do not load usblp and trigger autosetupprintqueues in live since cups is not available
-                [ 'files/live.modprobe.CD', '/etc/modprobe.d/live.conf', { mode => 0644, no_install => 1 } ],
-                # live media specific initrd
-                [ 'files/live-dracut.conf', '/etc/dracut.conf.d/60-live.conf', { mode => 0644, no_install => 1 } ],
-            ),
-            #- disable first boot wizard at live boot
-            [ 'files/firstboot', '/etc/sysconfig/firstboot', { mode => 0644 } ],
-            #- enable drakx-finish-install at live boot
-            [ "files/finish-install.$live->{settings}{media}", '/etc/sysconfig/finish-install', { mode => 0644 } ],
-            #- disable speedboot for first boot after disk installation
-            [ 'files/draklive-install.d/remove.d/disable-speedboot', '/etc/draklive-install.d/remove.d/disable-speedboot', { mode => 0644 } ],
-            # fix for sometimes wrong permissions
-            [ 'files/draklive-install.d/run.d/home-live-permissions.sh', '/etc/draklive-install.d/run.d/home-live-permissions.sh', { mode => 755 } ],
-	    # fix for /var/lib/gdm sometimes ending up as root:root
-	    if_($live->{settings}{desktop} eq 'GNOME',
-		[ 'files/draklive-install.d/run.d/gdm-permissions.sh', '/etc/draklive-install.d/run.d/gdm-permissions.sh', { mode => 755 } ]
-	    ),
-	    if_($live->{settings}{desktop} eq 'Plasma',
-		[ 'files/draklive-install.d/run.d/generate-gtk-icon-cache.sh', '/etc/draklive-install.d/run.d/generate-gtk-icon-cache.sh', { mode => 755 } ],
-		[ 'files/draklive-install.d/remove.d/clear-sddm-state', '/etc/draklive-install.d/remove.d/clear-sddm-state', { mode => 0644 } ],
-	    ),
-            #- sysconfig files for first boot
-            [ $live->{settings}{media} eq 'usb' ?
-                "files/finish-install.$live->{settings}{media}" :
-                'files/draklive-install.d/finish-install',
-              '/etc/draklive-install.d/sysconfig/finish-install', { mode => 0644 } ],
-            [ 'files/draklive-install.d/firstboot', '/etc/draklive-install.d/sysconfig/firstboot', { mode => 0644 } ],
-            [ 'files/draklive-install.d/services', '/etc/draklive-install.d/services', { mode => 0644 } ],
-            if_($live->{settings}{media} eq 'usb',
-                [ 'files/draklive-install.d/draklive-resize', '/etc/draklive-install.d/sysconfig/draklive-resize', { mode => 0644 } ],
-            ),
-            #- don't make kbluetoothrc display an annoying and useless popup window, and disable it by default
-            [ 'files/kbluetoothrc', '/etc/kde/kbluetoothrc', { mode => 0644 } ],
-            [ 'files/korgacrc', '/etc/kde/korgacrc', { mode => 0644 } ],
-            (map { [ 'files/mgaonlinerc', $_ . '/.MgaOnline/mgaonline', { mode => 0644, no_install => 1 } ] } @user_config_dirs),
-            (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 } ],
-        ],
-        remove_files => [
-            (map { "/etc/modprobe.preload.d/$_" } qw(cpufreq pcmcia rfswitch)),
-            "/etc/udev/rules.d/70-persistent-*.rules",
-            "/var/lib/dbus/machine-id",
-            "/etc/ssh/ssh_host_*",
-        ],
-        module_options => {
-            loop => "max_loop=64",
-        },
-        exclude_modules => [],
-        additional_modules => [
-            #'modules/i586/unionfs.ko',
-        ],
-        stage2_updates => [
-            # [ "files/pkgs.pm", "/usr/lib/libDrakX/install/pkgs.pm" ],
-        ],
-        patches => [
-        ],
-        erase_rpms => [
-        ],
-        rpms => [
-        ],
-        disable_services => [
-	    # uncommon hardware
-	    qw(bpalogin capi4linux cpqarrayd mdadm oki4daemon pcscd),
-	    # unneeded software
-	    qw(chronyd ntpd snmpd),
-	    # slows down basic usage and install, reenabled after install
-	    qw(crond msec),
-        ],
-        disable_timers => [
-        ],
-        vga_mode => 788,
-        gfxboot => $live->{settings}{media} ne 'usb', #- disable gfxboot on USB, buggy with grub on some systems
-        if_($live->{settings}{media} eq 'usb',
-            initrd_pre_pivot =>
-              #- keep an unmodified live tree for draklive-install
-              #- hack: mount it rw with a dummy branch and remount it ro later, current unionfs fails to mount ro directly
-              #- hack: the union can not be "stacked" (i.e. mounted) over another union, so do it early in initrd, and use a tmpfs for the dummy branch, so it can be moved in the real root
-              join("\n", map { "sh -c '$_'" }
-                   'mkdir -p /live/source /live/dummy',
-                   'mount -o mode=755,rw -t tmpfs none /live/dummy',
-                   'mount -o dirs=/live/dummy=rw' . if_($use_modules, ':$(cat /live/modules.lst)') . ':/live/distrib=ro -t unionfs unionfs /live/source',
-               ),
-        ),
-        initrd_post =>
-          join("\n",
-               if_($live->{settings}{media} eq 'usb', do {
-                   my $tmp = "/live/tmp";
-                   my @sticky = qw(/var/tmp /tmp);
-                   (
-                       "sh -c 'mkdir -p $tmp'",
-                       "mount -t tmpfs none $tmp",
-                       "mkdir $tmp/var",
-                       (map {
-                           ("mkdir $tmp$_", "mount -o dirs=$tmp$_=rw:/live/distrib$_=ro -t unionfs unionfs $_");
-                       } (qw(/var/log), @sticky)),
-                       "chmod 1777 @sticky",
-                   );
-               }),
-          ),
-        postInstall => join(';',
-                            if_($live->{settings}{default_user}, "echo $live->{settings}{default_user} > /etc/draklive-install.d/user"),
-                            "perl -pi -e 's,<DEFAULT_USER>,$live->{settings}{default_user},' /etc/draklive-install.d/sysconfig/finish-install",
-
-                            if_($live->{settings}{desktop} eq 'Xfce' && $live->{settings}{default_user},
-				# add a desktop icon to run draklive-install
-				"mkdir -p /home/$live->{settings}{default_user}/Desktop",
-				"cp /usr/share/applications/mageia-draklive-install.desktop /home/$live->{settings}{default_user}/Desktop/draklive-install.desktop",
-                            ),
-
-                            #- fix user perms for copied files
-                            if_($live->{settings}{default_user}, "chown -R " .
-                                  "$live->{settings}{default_user}.$live->{settings}{default_user}" .
-                                  " /home/$live->{settings}{default_user}"
-                            ),
-
-                            # remove readahead
-			    "rm -f /.readahead_collect",
-
-                            #- adduser seems to create a sparse lastlog with a slot for all available users
-                            #- which can be huge
-                            '> /var/log/lastlog',
-                            if_($live->{settings}{desktop} eq 'Plasma', 
-                                "rm -f /usr/share/icons/*/icon-theme.cache",
-                                "cp -a /etc/akonadi/mysql-global.conf /etc/akonadi/mysql-global-standard.conf",
-                                "cp /etc/akonadi/mysql-global-mobile.conf /etc/akonadi/mysql-global.conf",
-                                "ak=/etc/draklive-install.d/run.d/restore-akonadi-config.sh; echo -e '#!/bin/sh\ncp /etc/akonadi/mysql-global-standard.conf /etc/akonadi/mysql-global.conf' > \$ak; chmod +x \$ak",
-                            ),
-                            if_($live->{settings}{desktop} eq 'GNOME',
-                                # compile schema to get draklive-install in menu
-                                "glib-compile-schemas /usr/share/glib-2.0/schemas/",
-                                # fix permissions to enable GDM to rerun if the user logs out
-                                "chown -R gdm:gdm /var/lib/gdm",
-                                # switch to NetworkManager
-                                "systemctl disable network",
-                                "systemctl disable network-up",
-                                "systemctl enable NetworkManager.service",
-                                "systemctl enable NetworkManager-wait-online.service",
-				"sed -i 's/NETWORK=yes/NETWORK=no/' /etc/draklive-install.d/sysconfig/finish-install",
-				"echo 'AUTOSTART=FALSE' > /home/live/.net_applet",
-                            ),
-
-                            # add local medias
-                            "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",
-
-                            # disable HPLIP systray startup
-			    "echo 'Hidden=true' >> /etc/xdg/autostart/hplip-systray.desktop",
-
-                            # remove pre-installed grub2, we need to be able to select grub2 vs grub2-efi at install time
-                            "rpm -e --nodeps grub2",
-
-			    # allow draklive-install to spawn subtasks that access the display
-			    "echo 'session    optional     pam_xauth.so # for draklive-install' >> /etc/pam.d/polkit-1",
-
-			    # set the timestamp on the font directories to be a whole second
-			    # fc-cache looks at the nano second portion which may be non-zero
-			    # as we are on ext4, but then it will compare against the stamps
-			    # on the squashfs live image which have whole second resolution
-			    # (adapted from fix descrived in OpenMandriva bug 1764)
-			    "find /usr/share/fonts -type d -exec touch -t \$(date +%Y%m%d%H%M.%S) '{}' ';'",
-			    # now update the cache for the new timestamps
-			    "fc-cache -rf",
-
-			    # set the initial wireless regulatory domain to "world", enabling
-			    # all possible wireless channels to be used.
-			    "sed -i -r 's/CRDA_DOMAIN=.*/CRDA_DOMAIN=00/' /etc/sysconfig/network",
-
-			    # try to avoid plymouth falling back to text mode (mga#19984)
-			    "sed -i -r 's/DeviceTimeout=[0-9]+/DeviceTimeout=10/' /usr/share/plymouth/plymouthd.defaults",
-                        ),
-        additional_media => [
-          if_($live->{settings}{updates_repository},
-            {
-                name => 'core_updates_testing',
-                path => $live->{settings}{updates_repository} . '/' . $live->{settings}{arch} . '/media/core/updates_testing',
-                packages => [
-                ],
-            },
-          ),
-        ],
-    },
-    loopbacks => {
-        exclude => {
-            type => 'squashfs',
-            files => [
-                { path => '/root/drakx' },
-                #- to skip a file list generated with:
-                #- find /usr/share/doc/HTML -mindepth 1 -maxdepth 1 -type d > /root/drakx/HTML.skipped
-                #{ source => '/root/drakx/HTML.skipped', rooted => 1 },
-            ],
-        },
-        if_($use_modules, modules  => [
-           { type => 'squashfs', source => '/root/drakx/i18n-*.lst', rooted => 1 },
-        ]),
-    },
-    regions => {
-        #- the "all" region has a magical behavior and selects all langs
-        int => [qw(en)],
-    },
-    packs => {
-        int => [ map { "i18n-$_" } qw(en) ],
-    },
-    if_(member($live->{settings}{media}, 'CD', 'DVD'),
-        media => {
-            storage => 'cdrom',
-            bootloader_timeout => 10,
-            boot_entries => [ "live"     => " xdriver=free", 
-                              "live-nf"  => " nokmsboot",
-                              "linux"    => " install xdriver=free",
-                              "linux-nf" => " install nokmsboot",
-                            ],
-            if_($live->{settings}{product} =~ /LiveCD|LiveDVD/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' ],
-                extra_modules => [ qw(vfat sd_mod usb_storage ehci_hcd ehci_pci ehci_platform ohci_hcd ohci_pci ohci_platform uhci_hcd xhci_hcd xhci_pci xhci_plat_hcd) ],
-		files => [
-			 if_($live->{settings}{arch} eq 'x86_64',
-			    [ 'files/UEFI/EFI', '' ],
-			 ),
-			    # FIXME: add doc and autorun
-			    #[ 'extra/livecd/autorun/*', ''],
-			    #map { [ 'extra/livecd/' . $_, $_ ] } qw(LISEZMOI.pdf README.pdf) 
-			 ],
-            ),
-
-	
-
-        },
-        #extra_media => [ { storage => 'usb' } ],
-        mount => MDV::Draklive::Mounts::volatile_squash_union($use_modules),
-    ),
-    if_($live->{settings}{media} eq 'usb',
-        media => {
-            storage => 'usb',
-            bootloader_timeout => 1,
-            mount_options => 'dmask=0000,fmask=0111',
-            extra_boot => [ qw(cdrom) ],
-            if_($live->{settings}{product} =~ /liveusb-rw/i,
-                source => "LABEL=Mga_USB",
-                title => "Mageia Live USB",
-                boot_entries => [ "" => "" ],
-                files => [
-                    [ 'extra/liveusb-rw-common/*', '' ],
-                    ($live->{settings}{commercial} ?
-                       [ 'extra/liveusb-rw-commercial/*', '' ] :
-                       [ 'extra/liveusb-rw/*', '' ]
-                    ),
-                ],
-		partitions => [
-		    {
-			size => common::MB(8000),
-			mntpoint => '/',
-		    },
-		],
-                remove_files => [ '.svn', '*~' ],
-            ),
-        },
-        mount => MDV::Draklive::Mounts::squash_union('1000M', '150M', $use_modules),
-    ),
-};
diff --git a/config/settings-livecd.cfg b/config/settings-livecd.cfg
deleted file mode 100644
index 7f3bdbe..0000000
--- a/config/settings-livecd.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-repository=/home/bcd/build_bcd/pieces/cauldron
-additional_repository=
-arch=x86_64
-desktop=GNOME
-media=DVD
-region=all
-pack=
-name=Mageia
-product=LiveDVD
-version=6
-commercial=0
-default_user=live
-builddir=/home/draklive/var-data/build
-chroot=/home/draklive/var-data/chroot
diff --git a/config/settings-liveusb-rw-GUADEC.cfg b/config/settings-liveusb-rw-GUADEC.cfg
deleted file mode 100644
index 11a38d1..0000000
--- a/config/settings-liveusb-rw-GUADEC.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-repository=/mnt/BIG/dis/official/2008.1
-additional_repository=http://192.168.100.8/dis/official/2008.1
-arch=i586
-desktop=GNOME
-media=usb
-region=guadec
-pack=
-name=mageia
-product=liveusb-guadec
-version=1
-commercial=0
-default_user=guest
diff --git a/config/settings-liveusb-rw.cfg b/config/settings-liveusb-rw.cfg
deleted file mode 100644
index 20569d8..0000000
--- a/config/settings-liveusb-rw.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-repository=/mnt/BIG/dis/official/2010.0
-updates_repository=
-additional_repository=
-arch=i586
-desktop=KDE4
-media=usb
-region=all
-pack=int
-name=mageia
-product=liveusb
-version=1
-commercial=1
-default_user=
diff --git a/config/settings.cfg b/config/settings.cfg
index 6342e22..cbe4e04 120000..100644
--- a/config/settings.cfg
+++ b/config/settings.cfg
@@ -1 +1,10 @@
-settings-livecd.cfg
\ No newline at end of file
+vendor=Mageia
+distro=Mageia
+product=Live
+desktop=Xfce
+version=7
+arch=x86_64
+region=all
+default_user=live
+repository=/home/bcd/build_bcd/pieces/cauldron
+workdir=/home/draklive/var-data
diff --git a/files/01_gsettings-desktop-schemas.gschema.override b/files/01_gsettings-desktop-schemas.gschema.override
deleted file mode 100644
index 5702350..0000000
--- a/files/01_gsettings-desktop-schemas.gschema.override
+++ /dev/null
@@ -1,5 +0,0 @@
-[org.gnome.shell]
-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']
-
-[org.gnome.desktop.screensaver]
-lock-enabled=false
diff --git a/files/GUADEC-booklet.desktop b/files/GUADEC-booklet.desktop
deleted file mode 100644
index ca2492e..0000000
--- a/files/GUADEC-booklet.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Icon=distributor-logo
-Encoding=UTF-8
-Name=GUADEC Booklet
-Type=Link
-URL=http://assets.expectnation.com/9/eventprovider/9/booklet.pdf
diff --git a/files/UEFI/EFI/BOOT/bootx64.efi b/files/UEFI/EFI/BOOT/bootx64.efi
deleted file mode 100644
index bb2352c..0000000
--- a/files/UEFI/EFI/BOOT/bootx64.efi
+++ /dev/null
diff --git a/files/UEFI/EFI/BOOT/fonts/unicode.pf2 b/files/UEFI/EFI/BOOT/fonts/unicode.pf2
deleted file mode 100755
index 57b682a..0000000
--- a/files/UEFI/EFI/BOOT/fonts/unicode.pf2
+++ /dev/null
diff --git a/files/UEFI/EFI/BOOT/grub.cfg b/files/UEFI/EFI/BOOT/grub.cfg
deleted file mode 100644
index 529ca74..0000000
--- a/files/UEFI/EFI/BOOT/grub.cfg
+++ /dev/null
@@ -1,47 +0,0 @@
-
-insmod efi_gop
-insmod efi_uga
-insmod video_bochs
-insmod video_cirrus
-insmod video_fb
-
-insmod font
-if loadfont ${prefix}/fonts/unicode.pf2
-then
-   insmod gfxterm
-   set gfxmode=1024x768,800x600,auto
-   set gfxpayload=keep
-   terminal_output gfxterm
-fi
-
-insmod png
-set theme=/EFI/BOOT/themes/maggy/theme.txt
-export theme
-loadfont /EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2
-loadfont /EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2
-loadfont /EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2
-loadfont /EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2
-
-set timeout=10
-
-search --no-floppy --set=root -l 'VOLUME_LABEL'
-
-menuentry 'Boot Mageia 6 Live' {
-        linux /boot/vmlinuz root=mgalive:LABEL=VOLUME_LABEL splash quiet noiswmd audit=0 rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 xdriver=free
-        initrd /boot/cdrom/initrd.gz
-}
-
-menuentry ' + use non-free video drivers (slower to boot)' {
-        linux /boot/vmlinuz root=mgalive:LABEL=VOLUME_LABEL splash quiet noiswmd audit=0 rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 nokmsboot
-        initrd /boot/cdrom/initrd.gz
-}
-
-menuentry 'Install Mageia 6 Live' {
-        linux /boot/vmlinuz root=mgalive:LABEL=VOLUME_LABEL splash quiet noiswmd audit=0 rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 install xdriver=free
-        initrd /boot/cdrom/initrd.gz
-}
-
-menuentry ' + use non-free video drivers (slower to boot)' {
-        linux /boot/vmlinuz root=mgalive:LABEL=VOLUME_LABEL splash quiet noiswmd audit=0 rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 install nokmsboot
-        initrd /boot/cdrom/initrd.gz
-}
diff --git a/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2 b/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2
deleted file mode 100755
index 2fd329b..0000000
--- a/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2
+++ /dev/null
diff --git a/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2 b/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2
deleted file mode 100755
index 6e619c9..0000000
--- a/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2
+++ /dev/null
diff --git a/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2 b/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2
deleted file mode 100755
index 605406f..0000000
--- a/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2
+++ /dev/null
diff --git a/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2 b/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2
deleted file mode 100755
index 5cb52f4..0000000
--- a/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2
+++ /dev/null
diff --git a/files/UEFI/EFI/BOOT/themes/maggy/grub2-mageia-default.png b/files/UEFI/EFI/BOOT/themes/maggy/grub2-mageia-default.png
deleted file mode 100644
index df9c862..0000000
--- a/files/UEFI/EFI/BOOT/themes/maggy/grub2-mageia-default.png
+++ /dev/null
diff --git a/files/UEFI/EFI/BOOT/themes/maggy/theme.txt b/files/UEFI/EFI/BOOT/themes/maggy/theme.txt
deleted file mode 100755
index 598612f..0000000
--- a/files/UEFI/EFI/BOOT/themes/maggy/theme.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-# GRUB gfxmenu theme "maggy".
-
-title-text: "Mageia 6 UEFI"
-title-font: "MageiaLogo Bold 28"
-title-color: "white"
-
-desktop-image: "grub2-mageia-default.png"
-terminal-font: "Unknown Regular 16"
-
-+ boot_menu {
-   left = 5%
-   top = 15%
-   width = 75%
-   height = 55%
-  item_font = "MageiaLogo Regular 20"
-   selected_item_font = "MageiaLogo Bold 20"
-   color_normal="black/black"
-    item_color = "#0e1a27"
-   selected_item_color = "white"
-   item_height = 24
-   item_spacing = 10
-}
-
-+ progress_bar
-{
-   id = "__timeout__"
-   left = 20%
-   top = 70%
-   width = 60%
-   height = 2%
-   fg_color = "lightskyblue"
-   bg_color = "dodgerblue"
-   border_color = "midnightblue"
-}
-
-# Informational message bar.
-+ vbox {
-   left = 10%
-   top = 84%-35
-   width = 50%
-   height = 35
-   + label { 
-      text="Select an item with the arrow keys and press Enter to boot."
-      font="MageiaLogo Bold 16" color="white"
-   }
-   + label { 
-      text="Press 'c' for command line, 'e' to edit."
-      font="MageiaLogo Bold 16" color="white"
-   }
-}
diff --git a/files/blacklist_ide.conf b/files/blacklist-ide.conf
index 146e357..146e357 100644
--- a/files/blacklist_ide.conf
+++ b/files/blacklist-ide.conf
diff --git a/files/compute-i18n-list.pl b/files/compute-i18n-list.pl
deleted file mode 100755
index 914585b..0000000
--- a/files/compute-i18n-list.pl
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/usr/bin/perl
-
-use MDK::Common;
-use Getopt::Long;
-use lib qw(/usr/lib/libDrakX);
-use run_program;
-
-# alleged i18n packages for french (useful to spot missing requires on locales-fr)
-# rpm -qa \*-fr\* --qf '%{name}\n' | perl -n -e '/^(.*)-fr(_.+)?$/ and print "$1\n"' | sort -u
-# my @packages = (
-#  aspell
-#  kde-i18n
-#  locales
-#  mozilla-firefox
-#  myspell
-#  myspell-hyph
-#  openoffice.org-l10n
-# ); 
-
-my ($prefix, $ooo_version);
-GetOptions(
-    "prefix=s" => \$prefix,
-    "ooo=s" => \$ooo_version,
-);
-
-my @misowned_dirs = qw(
-/usr/lib/ooo-${ooo_version}
-/usr/lib/ooo-${ooo_version}/help
-/usr/share/apps
-/usr/share/apps/khangman
-/usr/share/apps/khangman/data
-/usr/share/apps/ktuberling
-/usr/share/apps/ktuberling/sounds
-/usr/share/doc/HTML
-/usr/share/locale
-);
-
-my @dirs = qw(
-/usr/share/man
-/usr/share/doc/HTML
-);
-
-my @files = qw(
-/usr/lib/ooo-${ooo_version}/share/dict/$L.*
-/usr/lib/ooo-${ooo_version}/share/dict/$L_comb.*
-/usr/lib/ooo-${ooo_version}/share/dict/hyph_$L.*
-/usr/lib/ooo-${ooo_version}/share/dict/th_$L.*
-/usr/lib/ooo-${ooo_version}/share/dict/th_$L_v2.*
-);
-
-my %per_locale_files = (
-    zh => [
-        #- disables anti-aliasing by default
-        '/etc/fonts/conf.d/99-ttf-arphic-uming-bitmaps.conf'
-    ],
-);
-
-my @locale_packages = run_program::rooted_get_stdout($prefix, 'rpm', '-qa', 'locales-*', '--qf', '%{name}\n');
-my @locales = sort(map { s/^locales-//; chomp; $_ } @locale_packages);
-
-sub expand_files {
-    my ($p, $o_lang) = @_;
-    $p =~ s/\$L/$o_lang/ if $o_lang;
-    map { s/^$prefix//; $_ } grep { -e $_ } glob($prefix . $p);
-}
-
-foreach my $l (@locales) {
-    my @list;
-    my $locale_pkg = "locales-$l";
-    #my $l_pattern = qr/^$l([_.@].+)?$/;
-    #my @l_packages = map { ("$_-$l", "$_-${l}_*") } @packages;
-    my @l_packages = chomp_(run_program::rooted_get_stdout($prefix, 'rpm', '-q', '--qf', '%{name}\n', '--whatrequires', $locale_pkg));
-    unshift @l_packages, $locale_pkg;
-    my @list = chomp_(run_program::rooted_get_stdout($prefix, 'rpm', '-ql', @l_packages));
-    my @all_locales = map { m!^/usr/share/locale/([^/]+)$! } chomp_(run_program::rooted_get_stdout($prefix, 'rpm', '-ql', $locale_pkg));
-    # skip misowned directories such as /usr/share/locale
-    @list = grep { ! -d $prefix . $_ || member(basename($_), @all_locales) } @list;
-    #@list = difference2(\@list, \@misowned_dirs);
-    foreach my $l2 (@all_locales) {
-	foreach my $d (@dirs) {
-	    my $l_d = $d . '/' . $l2;
-	    push @list, $l_d if -e $prefix . $l_d;
-	}
-	push @list, expand_files($_, $l2) foreach @files;
-    }
-    push @list, expand_files($_) foreach @{$per_locale_files{$l} || []};
-    output_p($prefix . "/root/drakx/i18n-$l.lst", map { "$_\n" } sort(@list));
-}
diff --git a/files/compute-ooo-dicts.pl b/files/compute-ooo-dicts.pl
deleted file mode 100755
index d9968c5..0000000
--- a/files/compute-ooo-dicts.pl
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/perl
-
-use MDK::Common;
-use Getopt::Long;
-use lib qw(/usr/lib/libDrakX);
-use run_program;
-
-my $prefix;
-my $check_locale;
-GetOptions(
-    "prefix=s" => \$prefix,
-    "check-locale" => \$check_locale,
-);
-my $dictd = $ARGV[0] or die "syntax: $0 [--check-locale] [--prefix <prefix>] <dictionary dir>";
-
-my $dictf = "dictionary.lst";
-my $dicts = "dictionary.src";
-my $dictu = "dictionary.unused";
-
-my @dictl;
-my @unused;
-
-my @available_langs = map {
-    /^locales-(\S+)/ ? $1 : ();
-} chomp_(run_program::rooted_get_stdout($prefix, 'rpm', '-qa', '--provides', 'locales-*'));
-
-sub add_dict {
-    my ($type, $name, $file, $add) = @_;
-    my ($lang, $country) = $name =~ /^([^_]+)_([^_]+)/;
-    my ($root_name) = $file =~ /^(.*)\.(.*?)$/;
-    if (!$check_locale || member($lang, @available_langs)) {
-	push @dictl, [ $type, $lang, $country, $root_name ] if $add;
-    } else {
-	push @unused, "$dictd/$file";
-    }
-}
-
-rename("$prefix$dictd/$dictf", "$prefix$dictd/$dicts") if ! -e "$prefix$dictd/$dicts";
-foreach (all("$prefix/$dictd")) {
-    if (/^hyph_(.+)\.(.*?)$/) {
-	add_dict('HYPH', $1, $_, $2 eq 'dic');
-    } elsif (/^th_(.+)\.(.*?)$/) {
-	add_dict('THES', $1, $_, $2 eq 'idx');
-    } elsif (/^(.+_.+)\.(.*?)$/) {
-	add_dict('DICT', $1, $_, $2 eq 'dic');
-    }
-}
-
-output_p("$prefix$dictd/$dictf",
-	 join('', grep { /^#/ } cat_("$prefix$dictd/$dicts")),
-	 "\n",
-	 map { join(' ', @$_) . "\n" } @dictl,
-    );
-
-output_p("$prefix$dictd/$dictu", map { "$_\n" } @unused);
diff --git a/files/defaultspooler b/files/defaultspooler
deleted file mode 100644
index 462d36c..0000000
--- a/files/defaultspooler
+++ /dev/null
@@ -1 +0,0 @@
-cups
diff --git a/files/desktop-directories-liveusb-rw b/files/desktop-directories-liveusb-rw
deleted file mode 100755
index 3fd7635..0000000
--- a/files/desktop-directories-liveusb-rw
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-LIVEUSB_LOCK="$HOME/.liveusb-folders"
-LIVEUSB_ROOT=/live/media
-[ -e "$LIVEUSB_ROOT/My Documents" ] && LIVEUSB_ALA_WINDOWS=1
-
-[ -e $LIVEUSB_LOCK ] && exit
-
-while pidof -x xdg-user-dirs-update; do
-    [ "$SECONDS" -le 60 ] || return
-    sleep 1
-done
-
-function create_link() {
-	NAME=$1
-	SRC=$2
-	[ -z "$SRC" ] && SRC=$($NAME)
-	XDG_DIR=$(xdg-user-dir $NAME)
-	LIVEUSB_DIR="$LIVEUSB_ROOT/$SRC"
-	mkdir -p "$LIVEUSB_DIR"
-	mv $XDG_DIR/{.??,}* "$LIVEUSB_DIR"
-	rmdir $XDG_DIR && ln -sf "$LIVEUSB_DIR" "$XDG_DIR"
-}
-
-if [ -n "$LIVEUSB_ALA_WINDOWS" ]; then
-	create_link "DOCUMENTS" "My Documents"
-	create_link "DOWNLOAD"  "My Documents/My Downloads"
-	create_link "MUSIC"     "My Documents/My Music"
-	create_link "PICTURES"  "My Documents/My Images"
-	create_link "VIDEOS"     "My Documents/My Video"
-else
-    for d in DOWNLOAD DOCUMENTS MUSIC PICTURES VIDEOS; do
-	create_link $d $(echo $d | tr A-Z a-z)
-    done
-fi
-
-touch $LIVEUSB_LOCK
diff --git a/files/live-dracut.conf b/files/dracut-live.conf
index 67ed54e..67ed54e 100644
--- a/files/live-dracut.conf
+++ b/files/dracut-live.conf
diff --git a/files/draklive-install.d/draklive-resize b/files/draklive-install.d/draklive-resize
deleted file mode 100644
index 5d33155..0000000
--- a/files/draklive-install.d/draklive-resize
+++ /dev/null
@@ -1 +0,0 @@
-DRAKLIVE_RESIZE=no
diff --git a/files/draklive-install.d/finish-install b/files/draklive-install.d/finish-install
index ba93dd9..28fe550 100644
--- a/files/draklive-install.d/finish-install
+++ b/files/draklive-install.d/finish-install
@@ -8,6 +8,6 @@ NETWORK=yes
 URPMI=yes
 AUTHENTICATION=no
 USERS=with_root
-USER_RENAME_FROM=live
+USER_RENAME_FROM=DEFAULT_USER
 USER_AUTOLOGIN_FIRST=no
 GLX=no
diff --git a/files/draklive-install.d/firstboot b/files/draklive-install.d/firstboot
deleted file mode 100644
index a842497..0000000
--- a/files/draklive-install.d/firstboot
+++ /dev/null
@@ -1 +0,0 @@
-FIRSTBOOT=no
diff --git a/files/draklive-install.d/remove.d/disable-speedboot b/files/draklive-install.d/remove.d/disable-speedboot
deleted file mode 100644
index 7bc22d6..0000000
--- a/files/draklive-install.d/remove.d/disable-speedboot
+++ /dev/null
@@ -1 +0,0 @@
-/var/lib/speedboot/status
diff --git a/files/draklive-install.d/run.d/gdm-permissions.sh b/files/draklive-install.d/run.d/gdm-permissions.sh
deleted file mode 100755
index 62d37d1..0000000
--- a/files/draklive-install.d/run.d/gdm-permissions.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-if [ -d "/var/lib/gdm" ]; then
-    /usr/bin/chown -R gdm:gdm /var/lib/gdm
-fi
diff --git a/files/draklive-install.desktop b/files/draklive-install.desktop
deleted file mode 100755
index 7671a60..0000000
--- a/files/draklive-install.desktop
+++ /dev/null
@@ -1,38 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=/usr/bin/draklive-install-lock-storage
-Icon=draklive-install
-Terminal=false
-Type=Application
-StartupNotify=true
-Name=Install on Hard Disk
-Name[ar]=التنصيب إلى القرص الصلب
-Name[br]=Staliañ war ar bladenn kalet
-Name[ca]=Instal·la al Disc Dur
-Name[cs]=Instalace na pevný disk
-Name[da]=Installér på harddisk
-Name[de]=Auf die Festplatte installieren
-Name[el]=Εγκατάσταση στο σκληρό δίσκο
-Name[es]=Instalar en el Disco Duro
-Name[et]=Paigaldamine kõvakettale
-Name[eu]=Instalatu disko zurrunean
-Name[fi]=Asenna kiintolevylle
-Name[fr]=Installer sur disque dur
-Name[hu]=Telepítés a merevlemezre
-Name[id]=Install ke Hard Disk
-Name[it]=Installa sul disco fisso
-Name[ky]=Катуу дискке орнотуу
-Name[nb]=Installer på harddisk
-Name[nl]=Installeer op de harde schijf
-Name[nn]=Installer på harddisken
-Name[pl]=Zainstaluj na dysku twardym
-Name[pt]=Instalar no Disco Rígido
-Name[pt_BR]=Instalar no Disco Rígido
-Name[ro]=Instalare pe discul dur
-Name[ru]=Установка на жесткий диск
-Name[sl]=Namestitev na trdi disk
-Name[sv]=Installera på hårddisk
-Name[tr]=Sabit diske kur
-Name[uk]=Встановити на жорсткий диск
-Name[zh_CN]=安装到硬盘
-Name[zh_TW]=安裝在硬碟上
diff --git a/files/draklive-install.usb b/files/draklive-install.usb
deleted file mode 100644
index fbfa41c..0000000
--- a/files/draklive-install.usb
+++ /dev/null
@@ -1 +0,0 @@
-SOURCE=/live/source
diff --git a/files/draksnapshot.sysconfig b/files/draksnapshot.sysconfig
deleted file mode 100644
index cca41e8..0000000
--- a/files/draksnapshot.sysconfig
+++ /dev/null
@@ -1 +0,0 @@
-AUTOSTART=FALSE
diff --git a/files/live.51-mageia-resume.conf b/files/empty.conf
index e69de29..e69de29 100644
--- a/files/live.51-mageia-resume.conf
+++ b/files/empty.conf
diff --git a/files/finish-install.CD b/files/finish-install
index fed1dd5..fed1dd5 100644
--- a/files/finish-install.CD
+++ b/files/finish-install
diff --git a/files/finish-install.DVD b/files/finish-install.DVD
deleted file mode 100644
index fed1dd5..0000000
--- a/files/finish-install.DVD
+++ /dev/null
@@ -1,7 +0,0 @@
-FINISH_INSTALL=yes
-NETWORK=no
-URPMI=no
-AUTHENTICATION=no
-USERS=no
-TIMEZONE=simplified
-COUNTRY=simplified
diff --git a/files/finish-install.usb b/files/finish-install.usb
deleted file mode 100644
index 467f1ac..0000000
--- a/files/finish-install.usb
+++ /dev/null
@@ -1,6 +0,0 @@
-FINISH_INSTALL=yes
-USERS=with_root
-AUTHENTICATION=no
-USER_AUTOLOGIN_FIRST=yes
-TIMEZONE=simplified
-COUNTRY=simplified
diff --git a/files/firstboot b/files/firstboot
deleted file mode 100644
index a842497..0000000
--- a/files/firstboot
+++ /dev/null
@@ -1 +0,0 @@
-FIRSTBOOT=no
diff --git a/files/glib2-branding.gschema.override b/files/glib2-branding.gschema.override
deleted file mode 100644
index b4184eb..0000000
--- a/files/glib2-branding.gschema.override
+++ /dev/null
@@ -1,73 +0,0 @@
-[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/halt-local.service b/files/halt-local.service
deleted file mode 100644
index bc7f284..0000000
--- a/files/halt-local.service
+++ /dev/null
@@ -1,23 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=/sbin/halt.local Compatibility
-ConditionFileIsExecutable=/sbin/halt.local
-DefaultDependencies=no
-After=shutdown.target
-Before=final.target
-
-[Service]
-Type=oneshot
-ExecStartPre=-/bin/kill -54 1
-ExecStartPre=-/usr/bin/plymouth quit
-ExecStartPre=-/usr/bin/chvt 1
-ExecStart=/sbin/halt.local
-TimeoutSec=0
-StandardOutput=tty
-RemainAfterExit=yes
diff --git a/files/halt.local.CD b/files/halt.local.CD
deleted file mode 100755
index e27ad1d..0000000
--- a/files/halt.local.CD
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/perl
-
-use lib qw(/usr/lib/libDrakX);
-use MDK::Common;
-use detect_devices;
-use c;
-
-my ($device) = cat_("/proc/mounts") =~ m!(/dev/\S+)\s+/live/media\s+iso9660!;
-$device or exit;
-
-# try to put halt/reboot in cache, if not called directly from them
-# mount is also needed by end of /etc/init.d/halt
-system("$_ --help &>/dev/null") foreach qw(halt mount reboot);
-
-my $f = detect_devices::tryOpen($device);
-# see openCdromTray() from install::any
-ioctl($f, c::CDROM_LOCKDOOR(), 0); # unlock door
-ioctl($f, c::CDROMEJECT(), 0);
-
-system("clear");
-print "\n\n\nPlease press <Enter> (or <CTRL><J>) once the medium is removed.\n";
-system("read < /dev/console");
-
-ioctl($f, c::CDROMCLOSETRAY(), 0);
diff --git a/files/halt.local.DVD b/files/halt.local.DVD
deleted file mode 100755
index e27ad1d..0000000
--- a/files/halt.local.DVD
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/perl
-
-use lib qw(/usr/lib/libDrakX);
-use MDK::Common;
-use detect_devices;
-use c;
-
-my ($device) = cat_("/proc/mounts") =~ m!(/dev/\S+)\s+/live/media\s+iso9660!;
-$device or exit;
-
-# try to put halt/reboot in cache, if not called directly from them
-# mount is also needed by end of /etc/init.d/halt
-system("$_ --help &>/dev/null") foreach qw(halt mount reboot);
-
-my $f = detect_devices::tryOpen($device);
-# see openCdromTray() from install::any
-ioctl($f, c::CDROM_LOCKDOOR(), 0); # unlock door
-ioctl($f, c::CDROMEJECT(), 0);
-
-system("clear");
-print "\n\n\nPlease press <Enter> (or <CTRL><J>) once the medium is removed.\n";
-system("read < /dev/console");
-
-ioctl($f, c::CDROMCLOSETRAY(), 0);
diff --git a/files/interfaces b/files/interfaces
deleted file mode 100644
index 6d2f918..0000000
--- a/files/interfaces
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# 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/kbluetoothrc b/files/kbluetoothrc
deleted file mode 100644
index 2680caa..0000000
--- a/files/kbluetoothrc
+++ /dev/null
@@ -1,5 +0,0 @@
-[General]
-AutoStart=false
-
-[Notification Messages]
-kbluepinLocInfo-usr-lib-kdebluetooth=false
diff --git a/files/live.gschema.override b/files/live.gschema.override
new file mode 100644
index 0000000..a5622b7
--- /dev/null
+++ b/files/live.gschema.override
@@ -0,0 +1,5 @@
+[org.gnome.shell]
+favorite-apps = [ 'mageia-draklive-install.desktop', 'firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'gnome-documents.desktop', 'mageia-drakconf.desktop' ]
+
+[org.gnome.desktop.screensaver]
+lock-enabled=false
diff --git a/files/live.modprobe.CD b/files/live.modprobe.CD
deleted file mode 100644
index 5bb2345..0000000
--- a/files/live.modprobe.CD
+++ /dev/null
@@ -1 +0,0 @@
-install usblp /bin/true
diff --git a/files/live.modprobe.DVD b/files/live.modprobe.DVD
deleted file mode 100644
index 5bb2345..0000000
--- a/files/live.modprobe.DVD
+++ /dev/null
@@ -1 +0,0 @@
-install usblp /bin/true
diff --git a/files/live.modprobe.conf b/files/live.modprobe.conf
deleted file mode 100644
index e69de29..0000000
--- a/files/live.modprobe.conf
+++ /dev/null
diff --git a/files/mga_rpms/update_media.sh b/files/mga_rpms/update_media.sh
deleted file mode 100755
index 0d5bddf..0000000
--- a/files/mga_rpms/update_media.sh
+++ /dev/null
@@ -1,87 +0,0 @@
-
-bcdmedia=/home/bcd/build_bcd/pieces/cauldron
-
-copy_latest()
-{
-  repo=$1
-  for arch in i586 x86_64 ; do
-    if [ $2 = "lib" ] ; then
-      if [ $arch = "x86_64" ] ; then
-        name=lib64$3
-      else
-        name=lib$3
-      fi
-    else
-      name=$2
-    fi
-    if [ $arch = "i586" ] ; then
-      name=${name/-desktop-/-desktop586-}
-    fi
-    path=`ls -1v $bcdmedia/$arch/media/$repo/{release,updates}/$name.rpm 2> /dev/null | tail -1`
-    if [ -z $path ] ; then
-      echo "Couldn't find $name for $arch"
-      exit 1
-    else
-      cp $path $arch/mga_rpms/$repo/
-    fi
-  done
-}
-
-# create dirs if non-existant
-mkdir -p {i586,x86_64}/mga_rpms/{core,nonfree}/media_info
-
-# clean dirs
-rm -f {i586,x86_64}/mga_rpms/{core,nonfree}/*.rpm
-rm -f {i586,x86_64}/mga_rpms/{core,nonfree}/media_info/*
-
-# add grub2
-copy_latest core grub2-2*
-copy_latest core grub2-efi-2*
-copy_latest core grub2-mageia-theme-2*
-copy_latest core lib efivar0-*
-copy_latest core efibootmgr-*
-copy_latest core efivar-*
-
-# add dkms
-copy_latest core dkms-2*
-copy_latest core binutils-2*
-copy_latest core gcc-5*
-copy_latest core gcc-cpp-5*
-copy_latest core glibc-devel-*
-copy_latest core isl-0*
-copy_latest core kernel-desktop-devel-4*
-copy_latest core kernel-desktop-devel-latest-4*
-copy_latest core kernel-userspace-headers-4*
-copy_latest core lib isl15-0*
-copy_latest core lib mpc3-1*
-copy_latest core lib ncurses-devel-*
-copy_latest core libstdc++-devel-*
-copy_latest core make-4*
-
-# add nvidia
-copy_latest nonfree dkms-nvidia304-*
-copy_latest nonfree dkms-nvidia340-*
-copy_latest nonfree dkms-nvidia-current-*
-copy_latest nonfree x11-driver-video-nvidia304-*
-copy_latest nonfree x11-driver-video-nvidia340-*
-copy_latest nonfree x11-driver-video-nvidia-current-*
-
-# add broadcom-wl
-copy_latest nonfree dkms-broadcom-wl-*
-copy_latest nonfree broadcom-wl-common-*
-
-# add broadcom wireless configs
-copy_latest core broadcom-bcma-config-*
-copy_latest core broadcom-ssb-config-*
-
-# add repo pubkeys
-for arch in i586 x86_64 ; do
-  cp $bcdmedia/$arch/media/core/release/media_info/pubkey $arch/mga_rpms/core/media_info/
-  cp $bcdmedia/$arch/media/nonfree/release/media_info/pubkey $arch/mga_rpms/nonfree/media_info/
-done
-
-# create hdlists
-for arch in i586 x86_64 ; do
-  genhdlist2 $arch/mga_rpms/core
-  genhdlist2 $arch/mga_rpms/nonfree
-done
diff --git a/files/portable-directories-flash-liveusb-rw b/files/portable-directories-flash-liveusb-rw
deleted file mode 100755
index dbdda92..0000000
--- a/files/portable-directories-flash-liveusb-rw
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-function create_mozilla_profile() {
-    USER_DIR=$1
-    PORTABLE_DIR=$2
-    [ -d $USER_DIR ] && return
-    mkdir -p $USER_DIR
-    ln -sf "$PORTABLE_DIR/Data/profile" $USER_DIR
-    cat > "$USER_DIR/profiles.ini" <<EOF
-[General]
-StartWithLastProfile=1
-
-[Profile0]
-Name=default
-IsRelative=1
-Path=profile
-EOF
-}
-
-PORTABLE_ROOT=/live/media/.apps
-create_mozilla_profile "$HOME/.mozilla/firefox" "$PORTABLE_ROOT/FirefoxPortable"
-create_mozilla_profile "$HOME/.thunderbird" "$PORTABLE_ROOT/ThunderbirdPortable"
diff --git a/files/register.desktop b/files/register.desktop
deleted file mode 100755
index de4425d..0000000
--- a/files/register.desktop
+++ /dev/null
@@ -1,27 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Icon=register-mga
-Name=Join Mageia Community
-Name[br]=Mont davet kumuniezh Mageia
-Name[de]=Trete in die Mageia-Community ein
-Name[el]=Συμμετοχή στην κοινότητα της Mageia
-Name[et]=Mageia kogukond
-Name[fi]=Liity Mageia-yhteisöön
-Name[fr]=Rejoignez la communauté Mageia
-Name[id]=Bergabung dengan Komunitas Mageia
-Name[it]=Unisciti alla comunità Mageia
-Name[nl]=Mageia-community
-GenericName[nl]=Mageia-community
-Comment[nl]=Doe mee met de Mageia-community
-Name[sl]=Pridružite se skupnosti Mageia
-Name[sv]=Gå med i Mageia Communityn
-Name[tr]=Mageia Topluluğuna Katılın
-Name[uk]=Спільнота Mageia
-GenericName[uk]=Спільнота Mageia
-Comment[uk]=Приєднатися до спільноти Mageia
-Name[zh_CN]=加入 Mageia 社区
-Name[ru]=Сообщество Mageia
-GenericName[ru]=Сообщество Mageia
-Comment[ru]=Присоединиться к сообществу Mageia
-Type=Link
-URL=http://mageia.org/contribute
diff --git a/files/resolv.conf b/files/resolv.conf
deleted file mode 100644
index 1941dae..0000000
--- a/files/resolv.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dynamic resolv.conf(5) file for glibc resolver(3) generated by resolvconf(8)
-#     DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
-
-nameserver 8.8.8.8
-nameserver 8.8.4.4
diff --git a/files/xdg-email-hook.sh b/files/xdg-email-hook.sh
deleted file mode 100755
index 254ba27..0000000
--- a/files/xdg-email-hook.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-[ -z "$MAILER" ] && MAILER=`which thunderbird 2> /dev/null`
-[ -z "$MAILER" ] && MAILER=/usr/bin/xdg-email
-exec $MAILER $@
diff --git a/update_bootloader_files.sh b/update_bootloader_files.sh
new file mode 100755
index 0000000..7655012
--- /dev/null
+++ b/update_bootloader_files.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+repository=$(grep repository config/settings.cfg | sed s/repository=//)
+echo "Fetching bootloader files from $repository"
+
+# Remove old files
+rm -rf bootloader
+mkdir bootloader
+
+archs="i586 x86_64"
+for arch in $archs; do
+  path=`ls -1v $repository/$arch/media/core/{release,updates}/drakiso-bootloader-files*.rpm 2> /dev/null | tail -1`
+  if [ -z $path ] ; then
+    echo "ERROR: couldn't find $arch drakiso-bootloader-files RPM in $repository."
+    exit 1
+  else
+    echo "Extracting $arch bootloader files from repository."
+    rpm2cpio $path | cpio -idm --quiet
+    if [ $? -ne 0 ] ; then
+      echo "ERROR: failed to extract files from archive."
+      exit 1
+    fi
+  fi
+  cp -ru usr/share/drakiso/bootloader/* bootloader
+  rm -r usr
+done