summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2017-11-26 00:40:55 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2017-11-26 09:39:25 +0000
commit13cc2c8f810bc74e09bbde788df71b9cff091727 (patch)
tree2ce97af064be905f9442d698915af2f8507c2749 /config
parent9035e779ef7f3d3ed009a617326fa8c0017ad1d9 (diff)
downloaddraklive-config-13cc2c8f810bc74e09bbde788df71b9cff091727.tar
draklive-config-13cc2c8f810bc74e09bbde788df71b9cff091727.tar.gz
draklive-config-13cc2c8f810bc74e09bbde788df71b9cff091727.tar.bz2
draklive-config-13cc2c8f810bc74e09bbde788df71b9cff091727.tar.xz
draklive-config-13cc2c8f810bc74e09bbde788df71b9cff091727.zip
Remove more obsolete configuration values.
Mostly stuff that used to be needed when we had separate USB media, plus a few lines that had been commented out rather than deleted.
Diffstat (limited to 'config')
-rw-r--r--config/live.cfg70
1 files changed, 4 insertions, 66 deletions
diff --git a/config/live.cfg b/config/live.cfg
index 2d55926..46dc76f 100644
--- a/config/live.cfg
+++ b/config/live.cfg
@@ -29,7 +29,7 @@ my $_l = {
DRAKLIVE_COMMERCIAL => $live->{settings}{commercial},
DRAKLIVE_DEFAULT_USER => $live->{settings}{default_user},
},
- hide_media_dirs => to_bool($live->{settings}{product} =~ /liveusb-rw/i),
+ hide_media_dirs => 0,
if_($live->{settings}{default_user}, preselect_kdm_user => $live->{settings}{default_user}),
langs_always => [ 'en_US' ],
files => [
@@ -89,15 +89,9 @@ my $_l = {
[ '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/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 } ],
@@ -117,10 +111,8 @@ my $_l = {
},
exclude_modules => [],
additional_modules => [
- #'modules/i586/unionfs.ko',
],
stage2_updates => [
- # [ "files/pkgs.pm", "/usr/lib/libDrakX/install/pkgs.pm" ],
],
patches => [
],
@@ -139,34 +131,9 @@ my $_l = {
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',
- ),
+ gfxboot => 1,
+ initrd_post => join("\n",
),
- 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",
@@ -297,35 +264,6 @@ my $_l = {
},
- #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),
- ),
};