diff options
| -rw-r--r-- | config/live.cfg | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/config/live.cfg b/config/live.cfg index 441cd10..0f404f8 100644 --- a/config/live.cfg +++ b/config/live.cfg @@ -33,14 +33,6 @@ my $_l = { if_($live->{settings}{default_user}, preselect_kdm_user => $live->{settings}{default_user}), langs_always => [ 'en_US' ], files => [ - if_($live->{settings}{product} =~ /liveusb-rw/i && $live->{settings}{commercial}, - [ 'files/xdg-email-hook.sh', '/usr/bin/xdg-email-hook.sh', { mode => 0755, no_install => 1 } ], - [ 'files/portable-directories-liveusb-rw', '/etc/X11/xinit.d/portable-directories-liveusb-rw', { mode => 0755, no_install => 1 } ], - ), - if_($live->{settings}{media} eq 'usb', - [ 'files/desktop-directories-liveusb-rw', '/etc/X11/xinit.d/xx_desktop-directories-liveusb-rw', { mode => 0755, no_install => 1 } ], - [ 'files/draklive-install.usb', '/etc/sysconfig/draklive-install', { mode => 0755 } ], - ), # fix gnome-shell not showing draklive-install and register icons on desktop in live mode if_($live->{settings}{desktop} eq 'GNOME', [ 'files/register.desktop', '/usr/share/applications/register.desktop', { mode => 0644 } ], @@ -184,24 +176,15 @@ my $_l = { 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", - #- used by liveusb-rw - "/usr/sbin/compute-i18n-list.pl --ooo=${ooo_version}", - if_($live->{settings}{product} =~ /liveusb-rw/i && $live->{settings}{desktop} =~ /^KDE/, - #- FIXME: check if still valid for PLASMA5 - "perl -pi -e 's,kde[/-]KMail,mageia-mozilla-thunderbird,' /var/lib/mageia/kde-profiles/common/share/config/kickerrc" - ), #- 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}"), - #- rpath removal will be "lost" on update - #- but not important since all packages files would be on the same loopback - #- should not be needed with latest unionfs which resolves /proc/self/exe correctly - #- FIXME: test with live USB r/w - #"chrpath -d /usr/lib/ooo-${ooo_version}/program/soffice.bin", - #- workaround rpm bug that leaves a corrupted rpm DB in chroot - #"rm -f /var/lib/rpm/__db.*", + "$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', |