diff options
Diffstat (limited to 'config/live.cfg')
| -rw-r--r-- | config/live.cfg | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/config/live.cfg b/config/live.cfg index d1f9a2a..b25c26f 100644 --- a/config/live.cfg +++ b/config/live.cfg @@ -41,7 +41,7 @@ my $_l = { ), # fix gnome-shell not showing draklive-install and register icons on desktop in live mode if_($live->{settings}{desktop} eq 'GNOME', - #[ 'files/draklive-install.desktop', '/home/live/Desktop/draklive-install.desktop', { mode => 0755, no_install => 1 } ], + #[ '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 } ], ), @@ -49,7 +49,7 @@ my $_l = { [ '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 } ], + [ 'files/pkgs.pm', '/usr/lib/libDrakX/pkgs.pm', { mode => 0644 } ], # shorewall fixes #[ 'files/shorewall-interfaces', '/etc/shorewall/interfaces', { mode => 0644 } ], @@ -63,7 +63,7 @@ my $_l = { [ 'files/mga_rpms/x86_64/mga_rpms', '/var/local/mga_rpms' ], ), # default to grub legacy - #[ 'files/bootloader.pm', '/usr/lib/libDrakX/bootloader.pm', { mode => 0644 } ], + [ 'files/bootloader.pm', '/usr/lib/libDrakX/bootloader.pm', { 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 @@ -85,14 +85,14 @@ my $_l = { [ 'files/draklive-install.d/remove.d/disable-speedboot', '/etc/draklive-install.d/remove.d/disable-speedboot', { mode => 0644 } ], # copy mgalive fix for installer progress bar - [ 'files/90mgalive/mgalive-root.sh', '/usr/lib/dracut/modules.d/90mgalive/mgalive-root.sh', { mode => 0755 } ], - [ 'files/90mgalive/module-setup.sh', '/usr/lib/dracut/modules.d/90mgalive/module-setup.sh', { mode => 0755 } ], - [ 'files/draklive-install', '/usr/sbin/draklive-install', { mode => 0755 } ], + #[ 'files/90mgalive/mgalive-root.sh', '/usr/lib/dracut/modules.d/90mgalive/mgalive-root.sh', { mode => 0755 } ], + #[ 'files/90mgalive/module-setup.sh', '/usr/lib/dracut/modules.d/90mgalive/module-setup.sh', { mode => 0755 } ], + #[ 'files/draklive-install', '/usr/sbin/draklive-install', { mode => 0755 } ], if_($live->{settings}{desktop} eq 'KDE4', [ 'files/draklive-install.d/run.d/generate-gtk-icon-cache.sh', '/etc/draklive-install.d/run.d/generate-gtk-icon-cache.sh', { mode => 755 } ]), #if_($live->{settings}{desktop} eq 'GNOME', - # [ 'files/draklive-install.d/run.d/gsettings.sh', '/etc/draklive-install.d/run.d/gsettings.sh', { mode => 755 } ]), + #[ 'files/draklive-install.d/run.d/gsettings.sh', '/etc/draklive-install.d/run.d/gsettings.sh', { mode => 755 } ]), #- sysconfig files for first boot [ $live->{settings}{media} eq 'usb' ? "files/finish-install.$live->{settings}{media}" : @@ -275,14 +275,19 @@ my $_l = { media => { storage => 'cdrom', bootloader_timeout => 10, - boot_entries => [ "" => "", "linux" => " install", "harddisk" => "" ], + boot_entries => [ "" => "", "linux" => " install", "safe" => "", "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' ], extra_modules => [ qw(vfat sd_mod usb_storage uhci_hcd ohci_hcd ehci_hcd xhci_hcd) ], files => [ if_($live->{settings}{arch} eq 'x86_64', - [ 'files/UEFI/*', '' ], + if_($live->{settings}{desktop} eq 'KDE4', + [ 'files/UEFI/KDE4/*', '' ], + ), + if_($live->{settings}{desktop} eq 'GNOME', + [ 'files/UEFI/GNOME/*', '' ], + ), ), # FIXME: add doc and autorun #[ 'extra/livecd/autorun/*', ''], @@ -295,7 +300,12 @@ my $_l = { extra_modules => [ qw(vfat sd_mod usb_storage uhci_hcd ohci_hcd ehci_hcd xhci_hcd) ], files => [ if_($live->{settings}{arch} eq 'x86_64', - [ 'files/UEFI/*', '' ], + if_($live->{settings}{desktop} eq 'KDE4', + [ 'files/UEFI/KDE4/*', '' ], + ), + if_($live->{settings}{desktop} eq 'GNOME', + [ 'files/UEFI/GNOME/*', '' ], + ), ), # FIXME: add doc and autorun #[ 'extra/livecd/autorun/*', ''], |