summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <blino@mageia.org>2011-11-10 12:08:12 +0000
committerOlivier Blin <blino@mageia.org>2011-11-10 12:08:12 +0000
commit32ae3956f3cc481dacc03aa61e9ef815c0b35c6c (patch)
tree73ecfce90a3bd47225c7a0ae8d8220c19f4988be
parentbb37fef986123ec73d84f6566d20d9a2e3781836 (diff)
downloaddraklive-config-32ae3956f3cc481dacc03aa61e9ef815c0b35c6c.tar
draklive-config-32ae3956f3cc481dacc03aa61e9ef815c0b35c6c.tar.gz
draklive-config-32ae3956f3cc481dacc03aa61e9ef815c0b35c6c.tar.bz2
draklive-config-32ae3956f3cc481dacc03aa61e9ef815c0b35c6c.tar.xz
draklive-config-32ae3956f3cc481dacc03aa61e9ef815c0b35c6c.zip
remove workaround to force exclusion of KDE HTML docs, most is now properly split out in handbooks subpackages
-rw-r--r--config/live.cfg5
1 files changed, 3 insertions, 2 deletions
diff --git a/config/live.cfg b/config/live.cfg
index 7f6ecfc..e9dd2b6 100644
--- a/config/live.cfg
+++ b/config/live.cfg
@@ -152,7 +152,6 @@ 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",
- 'find /usr/share/doc/HTML -mindepth 1 -maxdepth 1 -type d > /root/drakx/HTML.skipped',
#- used by liveusb-rw
"/usr/sbin/compute-i18n-list.pl --ooo=${ooo_version}",
if_($live->{settings}{product} =~ /liveusb-rw/i && $live->{settings}{desktop} =~ /^KDE/,
@@ -201,7 +200,9 @@ my $_l = {
type => 'squashfs',
files => [
{ path => '/root/drakx' },
- { source => '/root/drakx/HTML.skipped', rooted => 1 },
+ #- 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 => [