diff options
| -rw-r--r-- | config/live.cfg | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/config/live.cfg b/config/live.cfg index 0f404f8..30d3441 100644 --- a/config/live.cfg +++ b/config/live.cfg @@ -64,7 +64,7 @@ my $_l = { [ '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 } ], - # livecd specific initrd + # 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 @@ -207,13 +207,6 @@ my $_l = { 'd=/var/lib/flash-player-plugin/; [ -d $d ] && rm -f $d/*.rpm', - # remove some firmwares not needed on liveCD to free up space - if_($live->{settings}{media} eq 'CD', - "rm -rf /lib/firmware/iwlwifi-*-12.ucode", - "rm -rf /lib/firmware/iwlwifi-*-13.ucode", - "rm -rf /lib/firmware/c*w-3.2.1.1.bin", - ), - # 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", @@ -255,25 +248,7 @@ my $_l = { storage => 'cdrom', bootloader_timeout => 10, 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' ], - extra_modules => [ qw(vfat sd_mod usb_storage uhci_hcd ohci_hcd ehci_hcd xhci_hcd) ], - files => [ - if_($live->{settings}{arch} eq 'x86_64', - if_($live->{settings}{desktop} eq 'PLASMA5', - [ 'files/UEFI/PLASMA5/*', '' ], - ), - if_($live->{settings}{desktop} eq 'GNOME', - [ 'files/UEFI/GNOME/*', '' ], - ), - ), - # FIXME: add doc and autorun - #[ 'extra/livecd/autorun/*', ''], - #map { [ 'extra/livecd/' . $_, $_ ] } qw(LISEZMOI.pdf README.pdf) - ], - ), - if_($live->{settings}{product} =~ /LiveDVD/i, + 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 uhci_hcd ohci_hcd ehci_hcd xhci_hcd) ], |