From 51f6d026b4ba4fb7f3607240664d015c7b4d00a3 Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Wed, 23 May 2018 18:27:29 +0100 Subject: Final tweaks to example configuration files. - set the release to 7 - use a public repository - set workdir to the current directory --- examples/gui/config/build.cfg | 4 ++-- examples/gui/config/settings.cfg | 6 +++--- examples/minimal/config/build.cfg | 9 ++++----- examples/minimal/config/settings.cfg | 6 +++--- examples/xfce/config/build.cfg | 4 ++-- examples/xfce/config/settings.cfg | 6 +++--- 6 files changed, 17 insertions(+), 18 deletions(-) diff --git a/examples/gui/config/build.cfg b/examples/gui/config/build.cfg index c235c1f..4cbaa67 100644 --- a/examples/gui/config/build.cfg +++ b/examples/gui/config/build.cfg @@ -24,9 +24,9 @@ my $config = { system => { enabled_media => [ 'Core Release', -# 'Core Updates', + 'Core Updates', 'Nonfree Release', -# 'Nonfree Updates', + 'Nonfree Updates', ], include_packages => [ diff --git a/examples/gui/config/settings.cfg b/examples/gui/config/settings.cfg index 4785f94..0085504 100644 --- a/examples/gui/config/settings.cfg +++ b/examples/gui/config/settings.cfg @@ -2,7 +2,7 @@ vendor=Custom distro=Mageia product=Live desktop=Custom -version=6 +version=7 arch=x86_64 -repository=ftp://192.168.1.10/mageia/distrib/6 -workdir=/home/draklive/var-data +repository=http://mirrors.kernel.org/mageia/distrib/7 +workdir= diff --git a/examples/minimal/config/build.cfg b/examples/minimal/config/build.cfg index 0149e44..9419d10 100644 --- a/examples/minimal/config/build.cfg +++ b/examples/minimal/config/build.cfg @@ -26,9 +26,9 @@ my $config = { system => { enabled_media => [ 'Core Release', -# 'Core Updates', + 'Core Updates', 'Nonfree Release', -# 'Nonfree Updates', + 'Nonfree Updates', ], rpmsrate_flags => [ @@ -71,9 +71,8 @@ my $config = { 'dkms-nvidia340', 'x11-driver-video-nvidia340', 'dkms-nvidia-current', 'x11-driver-video-nvidia-current', - # No bootloaders. The GRUB2 bootloaders are needed for install, so we add - # them to the local repo, which means they are automatically excluded. - 'grub', 'lilo', + # No bootloaders. + 'grub', 'grub2', 'grub2-efi', 'lilo', # Needs X 'apmd', 'draklive-install', 'drakx-finish-install', 'xterm', diff --git a/examples/minimal/config/settings.cfg b/examples/minimal/config/settings.cfg index 8a531c9..b4ee1b5 100644 --- a/examples/minimal/config/settings.cfg +++ b/examples/minimal/config/settings.cfg @@ -2,9 +2,9 @@ vendor=Custom distro=Mageia product=Live type=Minimal -version=6 +version=7 arch=x86_64 region=all default_user=live -repository=ftp://192.168.1.10/mageia/distrib/6 -workdir=/home/draklive/var-data +repository=http://mirrors.kernel.org/mageia/distrib/7 +workdir= diff --git a/examples/xfce/config/build.cfg b/examples/xfce/config/build.cfg index e09def5..53fc863 100644 --- a/examples/xfce/config/build.cfg +++ b/examples/xfce/config/build.cfg @@ -25,9 +25,9 @@ my $config = { system => { enabled_media => [ 'Core Release', -# 'Core Updates', + 'Core Updates', 'Nonfree Release', -# 'Nonfree Updates', + 'Nonfree Updates', ], rpmsrate_flags => [ diff --git a/examples/xfce/config/settings.cfg b/examples/xfce/config/settings.cfg index 3802295..4318f8b 100644 --- a/examples/xfce/config/settings.cfg +++ b/examples/xfce/config/settings.cfg @@ -2,9 +2,9 @@ vendor=Custom distro=Mageia product=Live desktop=Xfce -version=6 +version=7 arch=x86_64 region=all default_user=live -repository=ftp://192.168.1.10/mageia/distrib/6 -workdir=/home/draklive/var-data +repository=http://mirrors.kernel.org/mageia/distrib/7 +workdir= -- cgit v1.2.1