From 548523823efec3a6f8a11ed588df558f39356595 Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Sun, 26 Nov 2017 11:25:08 +0000 Subject: Fix white space errors and apply consistent indentation. Don't use hard tabs for indentation, as that was more common. --- config/auto_inst.cfg.pl | 442 ++++++++++++++++++++++++------------------------ config/live.cfg | 216 ++++++++++++----------- 2 files changed, 329 insertions(+), 329 deletions(-) diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl index 6abdab6..a12150d 100644 --- a/config/auto_inst.cfg.pl +++ b/config/auto_inst.cfg.pl @@ -1,5 +1,5 @@ #!/usr/bin/perl -cw -# +# # You should check the syntax of this file before using it in an auto-install. # You can do this with 'perl -cw auto_inst.cfg.pl' or by executing this file # (note the '#!/usr/bin/perl -cw' on the first line). @@ -16,246 +16,248 @@ my $has_lxde = member('LXDE', @desktops); my $has_enlightenment = member('Enlightenment', @desktops); $o = { - 'media' => [ - { - type => 'media_cfg', - url => 'drakx://media', - selected_names => join(',', - 'Core Release', 'Core Updates', - 'Nonfree Release', 'Nonfree Updates', - ), - }, - if_($ENV{DRAKLIVE_ADDITIONAL_REPOSITORY}, - { type => 'media', url => $ENV{DRAKLIVE_ADDITIONAL_REPOSITORY} }, - ), - ], - # temporary (?) fix for mga#12299 - 'enabled_media' => [ - 'Core Release', - 'Core Updates', - 'Nonfree Release', - 'Nonfree Updates', - ], - 'rpmsrate_flags_chosen' => { - LIVE => 1, - (map { ("CAT_$_" => 1) } ( - # office - qw(OFFICE SPELLCHECK PIM ARCHIVING PRINTER), - # multimedia - qw(AUDIO VIDEO GRAPHICS), - # internet - qw(NETWORKING_WWW NETWORKING_MAIL NETWORKING_NEWS COMMUNICATIONS NETWORKING_CHAT), - qw(NETWORKING_FILE_TRANSFER NETWORKING_IRC NETWORKING_INSTANT_MESSAGING NETWORKING_DNS), - # network - qw(NETWORKING_REMOTE_ACCESS NETWORKING_FILE), - qw(NETWORKING_REMOTE_ACCESS_SERVER), - # config - qw(CONFIG), - # console - qw(EDITORS TERMINALS TEXT_TOOLS SHELLS FILE_TOOLS), - # system - qw(SYSTEM MINIMAL_DOCS X ACCESSIBILITY THEMES), - if_($has_plasma, qw(PLASMA5)), - if_($has_gnome, qw(GNOME)), - if_($has_xfce, qw(XFCE)), - if_($has_lxde, qw(LXDE)), - if_($has_enlightenment, qw(E17)), - )), - }, - # so that rpmsrate flags are really used - 'compssListLevel' => 5, # default from install_steps_interactive - 'skipped_packages' => [ + 'media' => [ + { + type => 'media_cfg', + url => 'drakx://media', + selected_names => join(',', + 'Core Release', + 'Core Updates', + 'Nonfree Release', + 'Nonfree Updates', + ), + }, + if_($ENV{DRAKLIVE_ADDITIONAL_REPOSITORY}, + { type => 'media', url => $ENV{DRAKLIVE_ADDITIONAL_REPOSITORY} }, + ), + ], + # temporary (?) fix for mga#12299 + 'enabled_media' => [ + 'Core Release', + 'Core Updates', + 'Nonfree Release', + 'Nonfree Updates', + ], + 'rpmsrate_flags_chosen' => { + LIVE => 1, + (map { ("CAT_$_" => 1) } ( + # office + qw(OFFICE SPELLCHECK PIM ARCHIVING PRINTER), + # multimedia + qw(AUDIO VIDEO GRAPHICS), + # internet + qw(NETWORKING_WWW NETWORKING_MAIL NETWORKING_NEWS COMMUNICATIONS NETWORKING_CHAT), + qw(NETWORKING_FILE_TRANSFER NETWORKING_IRC NETWORKING_INSTANT_MESSAGING NETWORKING_DNS), + # network + qw(NETWORKING_REMOTE_ACCESS NETWORKING_FILE), + qw(NETWORKING_REMOTE_ACCESS_SERVER), + # config + qw(CONFIG), + # console + qw(EDITORS TERMINALS TEXT_TOOLS SHELLS FILE_TOOLS), + # system + qw(SYSTEM MINIMAL_DOCS X ACCESSIBILITY THEMES), + if_($has_plasma, qw(PLASMA5)), + if_($has_gnome, qw(GNOME)), + if_($has_xfce, qw(XFCE)), + if_($has_lxde, qw(LXDE)), + if_($has_enlightenment, qw(E17)), + )), + }, + # so that rpmsrate flags are really used + 'compssListLevel' => 5, # default from install_steps_interactive + 'skipped_packages' => [ - # i586 arch specific - if_($ENV{DRAKLIVE_ARCH} eq 'i586', - '/^kernel-desktop-/', '/^vboxadditions-kernel-.*-desktop-/', - '/^libatlas3-/', - ), + # i586 arch specific + if_($ENV{DRAKLIVE_ARCH} eq 'i586', + '/^kernel-desktop-/', '/^vboxadditions-kernel-.*-desktop-/', + '/^libatlas3-/', + ), - # x86_64 arch specific - if_($ENV{DRAKLIVE_ARCH} eq 'x86_64', - '/^lib64atlas3-/', - ), + # x86_64 arch specific + if_($ENV{DRAKLIVE_ARCH} eq 'x86_64', + '/^lib64atlas3-/', + ), - # no server kernels - '/^kernel-server-/', '/^vboxadditions-kernel-.*-server-/', - # no legacy bootloaders, we default to grub2 - 'grub', 'lilo', - # no efi stuff - only needed for install, and shipped in live core repo - 'grub2-efi', 'efibootmgr', 'efivar', + # no server kernels + '/^kernel-server-/', '/^vboxadditions-kernel-.*-server-/', + # no legacy bootloaders, we default to grub2 + 'grub', 'lilo', + # no efi stuff - only needed for install, and shipped in live core repo + 'grub2-efi', 'efibootmgr', 'efivar', - # no devel packages on live media - 'glibc-devel', 'gdb', 'gcc', 'gcc3.3', 'dkms', - 'empathy', 'gnome-builder', # pulls devel stuff + # no devel packages on live media + 'glibc-devel', 'gdb', 'gcc', 'gcc3.3', 'dkms', + 'empathy', 'gnome-builder', # pulls devel stuff - # shipped in live nonfree repo - 'dkms-broadcom-wl', 'broadcom-wl-common', - 'broadcom-bcma-config', 'broadcom-ssb-config', - '/^x11-driver-video-fglrx/', - '/^x11-driver-video-nvidia/', + # shipped in live nonfree repo + 'dkms-broadcom-wl', 'broadcom-wl-common', + 'broadcom-bcma-config', 'broadcom-ssb-config', + '/^x11-driver-video-fglrx/', + '/^x11-driver-video-nvidia/', - # huge deps - 'denemo', # pulls in lilypond and texlive - 'virtuoso-opensource', # not needed on live media - 'mono', # bloat + # huge deps + 'denemo', # pulls in lilypond and texlive + 'virtuoso-opensource', # not needed on live media + 'mono', # bloat - # old stuff - 'aspell', 'aspell-en', - 'asihpi-firmware', 'hdsploader', 'mixartloader', 'pcxhrloader', 'usx2yloader', 'vxloader', - 'drakfax', 'efax', 'rxvt', - 'nspluginwrapper','nspluginwrapper-i386', # not needed anymore (mga #2001) + # old stuff + 'aspell', 'aspell-en', + 'asihpi-firmware', 'hdsploader', 'mixartloader', 'pcxhrloader', 'usx2yloader', 'vxloader', + 'drakfax', 'efax', 'rxvt', + 'nspluginwrapper','nspluginwrapper-i386', # not needed anymore (mga #2001) - # broken stuff - 'audacity', 'xguest', 'apper', + # broken stuff + 'audacity', 'xguest', 'apper', - # not wanted - 'al-anvar', # (mga #9752) - #'mate-polkit', - 'openssh-server', - 'manatools-gui', + # not wanted + 'al-anvar', # (mga #9752) + #'mate-polkit', + 'openssh-server', + 'manatools-gui', - #- no distribution license - 'flash-player-plugin', + #- no distribution license + 'flash-player-plugin', - # Gnome specific stuff - if_($has_gnome, - 'beagle', 'inkscape', - 'bluedevil', #- bluez-pin provide - 'pinentry-qt4', #- qt4 app - '/noatun/', #- prefer amarok - 'polkit-kde-agent-1', - ), + # Gnome specific stuff + if_($has_gnome, + 'beagle', 'inkscape', + 'bluedevil', #- bluez-pin provide + 'pinentry-qt4', #- qt4 app + '/noatun/', #- prefer amarok + 'polkit-kde-agent-1', + ), - # Plasma specific stuff - if_($has_plasma, - ), - ], + # Plasma specific stuff + if_($has_plasma, + ), + ], - 'default_packages' => [ - if_($has_lxde, "mageia-lxde-config-$distro_release"), + 'default_packages' => [ + if_($has_lxde, "mageia-lxde-config-$distro_release"), - # i586 arch specific - if_($ENV{DRAKLIVE_ARCH} eq 'i586', - 'vboxadditions-kernel-desktop586-latest', - ), + # i586 arch specific + if_($ENV{DRAKLIVE_ARCH} eq 'i586', + 'vboxadditions-kernel-desktop586-latest', + ), - # x86_64 arch specific - if_($ENV{DRAKLIVE_ARCH} eq 'x86_64', - 'vboxadditions-kernel-desktop-latest', - ), + # x86_64 arch specific + if_($ENV{DRAKLIVE_ARCH} eq 'x86_64', + 'vboxadditions-kernel-desktop-latest', + ), - # try to protect base packages from rpmlib/urpmi cascade bug - 'basesystem', 'x11-server-common','x11-driver-video', 'x11-driver-input', - 'x11-driver-video-vboxvideo', - - # utils wanted - 'mc', 'btrfs-progs', 'shorewall-ipv6', 'hdparm', 'parted', 'glxinfo', 'patch', - 'bind-utils', 'mdadm', 'dmraid', 'usbutils', # we want lsusb - 'shared-mime-info', # needed for .desktop files to work atleast in gnome - 'vim-enhanced', # full ediitor - 'dnf', 'dnf-plugins-core', # some users want dnf - 'manatools', # just the ncurses version - 'simple-scan', # s-c-p wants this if it detects a combined printer/scanner - 'Xdialog', # provides nicer UI for lxcontrol + # try to protect base packages from rpmlib/urpmi cascade bug + 'basesystem', 'x11-server-common','x11-driver-video', 'x11-driver-input', + 'x11-driver-video-vboxvideo', - 'bluez-firmware', # missed firmware + # utils wanted + 'mc', 'btrfs-progs', 'shorewall-ipv6', 'hdparm', 'parted', 'glxinfo', 'patch', + 'bind-utils', 'mdadm', 'dmraid', 'usbutils', # we want lsusb + 'shared-mime-info', # needed for .desktop files to work atleast in gnome + 'vim-enhanced', # full ediitor + 'dnf', 'dnf-plugins-core', # some users want dnf + 'manatools', # just the ncurses version + 'simple-scan', # s-c-p wants this if it detects a combined printer/scanner + 'Xdialog', # provides nicer UI for lxcontrol - # mageia specific - 'mageiawelcome', # nice helper app - 'mageia-doc-mcc-en', # some nice docs + 'bluez-firmware', # missed firmware - # Gnome specific stuff - if_($has_gnome, - 'task-gnome', 'gdm', # sometimes gets nuked during build - 'gnome-shell', 'caribou', 'caribou-gtk3', 'brasero', 'gparted', 'gnome-classic-session', 'hexchat', - 'adwaita-gtk2-theme', - ), + # mageia specific + 'mageiawelcome', # nice helper app + 'mageia-doc-mcc-en', # some nice docs - # Plasma specific stuff - if_($has_plasma, - 'task-plasma5', 'sddm', # sometimes gets nuked during build - ), - # Xfce specific stuff - if_($has_xfce, - 'task-xfce4', - 'gparted', # provides some options not currently supported in diskdrake - ), - ], + # Gnome specific stuff + if_($has_gnome, + 'task-gnome', 'gdm', # sometimes gets nuked during build + 'gnome-shell', 'caribou', 'caribou-gtk3', 'brasero', 'gparted', 'gnome-classic-session', 'hexchat', + 'adwaita-gtk2-theme', + ), - 'preferred_packages' => join(',', $has_plasma ? 'sddm' : 'gdm'), - 'meta_class' => 'desktop', - 'desktop' => first(@desktops), - if_($ENV{DRAKLIVE_DEFAULT_USER}, 'autologin' => $ENV{DRAKLIVE_DEFAULT_USER}), - # explicitely specify the security level, so that environment of the build machine doesn't take precedence - 'security' => 1, - 'useSupermount' => 'magicdev', - 'users' => [ - if_($ENV{DRAKLIVE_DEFAULT_USER}, { - 'icon' => 'default', - 'realname' => '', - 'uid' => '', - 'groups' => [], - 'name' => $ENV{DRAKLIVE_DEFAULT_USER}, - 'shell' => '/bin/bash', - 'gid' => '' - }), - ], - 'locale' => { - 'country' => 'US', - 'IM' => undef, - 'lang' => 'en_US', - 'langs' => +{ - $ENV{DRAKLIVE_REGION} eq 'all' ? (all => 1) : (map { $_ => 1 } split(':', $ENV{DRAKLIVE_LANGS})) - }, - 'utf8' => 1 - }, - 'authentication' => { - 'shadow' => 1, - 'local' => 1, - 'blowfish' => 1 - }, - 'superuser' => { - 'pw' => '', - 'realname' => 'root', - 'uid' => '0', - 'shell' => '/bin/bash', - 'home' => '/root', - 'gid' => '0' - }, - 'keyboard' => { - 'GRP_TOGGLE' => '', - 'KBCHARSET' => 'C', - 'KEYBOARD' => 'us', - 'KEYTABLE' => 'us' - }, - 'timezone' => { - 'ntp' => undef, - 'timezone' => 'America/New_York', - 'UTC' => 1 - }, - 'X' => { disabled => 1 }, #- disable auto-configuration that may install unwanted packages - 'match_all_hardware' => 1, - 'excludedocs' => 0, - 'postInstallNonRooted' => join(";", - # drakx-in-chroot roots the mount point one level higher when - # the build system arch matches DRAKLIVE_ARCH. - "if [ -d /tmp/media/$ENV{DRAKLIVE_ARCH} ]", - "then cp /tmp/media/$ENV{DRAKLIVE_ARCH}/release-notes.* /mnt", - "else cp /tmp/media/release-notes.* /mnt", - "fi", - "chmod 0644 /mnt/release-notes.*", - ), - 'postInstall' => join(";", - # systemd boots by default to multiuser.target (old init 3), so change to graphical (old init 5) - "ln -sf /lib/systemd/system/graphical.target /etc/systemd/system/default.target", - # have inittab match systemd defaulting to init 5 - "perl -pi -e 's/^id:3:initdefault:/id:5:initdefault:/' '/etc/inittab'", - #- FIXME: in any::set_autologin, unlink if gdm/sddm conf file and binary exist - if_($has_xfce || $has_lxde, "rm -f /etc/sysconfig/autologin"), - ), - 'autoExitInstall' => 1, - 'keep_unrequested_dependencies' => 0, - }; + # Plasma specific stuff + if_($has_plasma, + 'task-plasma5', 'sddm', # sometimes gets nuked during build + ), + # Xfce specific stuff + if_($has_xfce, + 'task-xfce4', + 'gparted', # provides some options not currently supported in diskdrake + ), + ], + + 'preferred_packages' => join(',', $has_plasma ? 'sddm' : 'gdm'), + 'meta_class' => 'desktop', + 'desktop' => first(@desktops), + if_($ENV{DRAKLIVE_DEFAULT_USER}, 'autologin' => $ENV{DRAKLIVE_DEFAULT_USER}), + # explicitely specify the security level, so that environment of the build machine doesn't take precedence + 'security' => 1, + 'useSupermount' => 'magicdev', + 'users' => [ + if_($ENV{DRAKLIVE_DEFAULT_USER}, { + 'icon' => 'default', + 'realname' => '', + 'uid' => '', + 'groups' => [], + 'name' => $ENV{DRAKLIVE_DEFAULT_USER}, + 'shell' => '/bin/bash', + 'gid' => '' + }), + ], + 'locale' => { + 'country' => 'US', + 'IM' => undef, + 'lang' => 'en_US', + 'langs' => +{ + $ENV{DRAKLIVE_REGION} eq 'all' ? (all => 1) : (map { $_ => 1 } split(':', $ENV{DRAKLIVE_LANGS})) + }, + 'utf8' => 1 + }, + 'authentication' => { + 'shadow' => 1, + 'local' => 1, + 'blowfish' => 1 + }, + 'superuser' => { + 'pw' => '', + 'realname' => 'root', + 'uid' => '0', + 'shell' => '/bin/bash', + 'home' => '/root', + 'gid' => '0' + }, + 'keyboard' => { + 'GRP_TOGGLE' => '', + 'KBCHARSET' => 'C', + 'KEYBOARD' => 'us', + 'KEYTABLE' => 'us' + }, + 'timezone' => { + 'ntp' => undef, + 'timezone' => 'America/New_York', + 'UTC' => 1 + }, + 'X' => { disabled => 1 }, #- disable auto-configuration that may install unwanted packages + 'match_all_hardware' => 1, + 'excludedocs' => 0, + 'postInstallNonRooted' => join(";", + # drakx-in-chroot roots the mount point one level higher when + # the build system arch matches DRAKLIVE_ARCH. + "if [ -d /tmp/media/$ENV{DRAKLIVE_ARCH} ]", + "then cp /tmp/media/$ENV{DRAKLIVE_ARCH}/release-notes.* /mnt", + "else cp /tmp/media/release-notes.* /mnt", + "fi", + "chmod 0644 /mnt/release-notes.*", + ), + 'postInstall' => join(";", + # systemd boots by default to multiuser.target (old init 3), so change to graphical (old init 5) + "ln -sf /lib/systemd/system/graphical.target /etc/systemd/system/default.target", + # have inittab match systemd defaulting to init 5 + "perl -pi -e 's/^id:3:initdefault:/id:5:initdefault:/' '/etc/inittab'", + #- FIXME: in any::set_autologin, unlink if gdm/sddm conf file and binary exist + if_($has_xfce || $has_lxde, "rm -f /etc/sysconfig/autologin"), + ), + 'autoExitInstall' => 1, + 'keep_unrequested_dependencies' => 0, +}; my $old = \&install::pkgs::empty_packages; undef *install::pkgs::empty_packages; diff --git a/config/live.cfg b/config/live.cfg index 46dc76f..6e80509 100644 --- a/config/live.cfg +++ b/config/live.cfg @@ -7,11 +7,11 @@ my $use_modules = to_bool($live->{settings}{pack}); my @user_config_dirs = ('/etc/skel', if_($live->{settings}{default_user}, '/home/' . $live->{settings}{default_user})); sub build_one_label { - my ($live) = @_; + my ($live) = @_; - my ($version, $extra) = split(/-/, $live->{settings}{version}); - $version .= "S" if $extra eq 'spring'; - "LABEL=" . join("-", "Mageia", $version, $live->{settings}{desktop}, $live->{settings}{product}); + my ($version, $extra) = split(/-/, $live->{settings}{version}); + $version .= "S" if $extra eq 'spring'; + "LABEL=" . join("-", "Mageia", $version, $live->{settings}{desktop}, $live->{settings}{product}); } my $_l = { @@ -33,15 +33,15 @@ my $_l = { if_($live->{settings}{default_user}, preselect_kdm_user => $live->{settings}{default_user}), langs_always => [ 'en_US' ], files => [ - if_($live->{settings}{desktop} eq 'GNOME', - # add draklive-install icon to favourites in live mode and disable screen locking - # (override files are processed in alphabetical order - make sure this one comes last) - [ 'files/live.gschema.override', '/usr/share/glib-2.0/schemas/live.gschema.override', { mode => 0644, no_install => 1 } ], - # disable Wayland when we know it won't work (workaround for mga#20079) - [ 'files/50gdm-disable-wayland.xsetup', '/etc/X11/xsetup.d/50gdm-disable-wayland.xsetup', { mode => 0755 } ], + if_($live->{settings}{desktop} eq 'GNOME', + # add draklive-install icon to favourites in live mode and disable screen locking + # (override files are processed in alphabetical order - make sure this one comes last) + [ 'files/live.gschema.override', '/usr/share/glib-2.0/schemas/live.gschema.override', { mode => 0644, no_install => 1 } ], + # disable Wayland when we know it won't work (workaround for mga#20079) + [ 'files/50gdm-disable-wayland.xsetup', '/etc/X11/xsetup.d/50gdm-disable-wayland.xsetup', { mode => 0755 } ], ), - # provide a noxorgconf boot command option to try to fix issues with nouveau driver on some hardware - [ 'files/10no-xorg-conf.xsetup', '/etc/X11/xsetup.d/10no-xorg-conf.xsetup', { mode => 0755 } ], + # provide a noxorgconf boot command option to try to fix issues with nouveau driver on some hardware + [ 'files/10no-xorg-conf.xsetup', '/etc/X11/xsetup.d/10no-xorg-conf.xsetup', { mode => 0755 } ], # blacklist pata_acpi [ 'files/blacklist_ide.conf', '/etc/modprobe.d/blacklist_ide.conf', { mode => 0644 } ], @@ -50,16 +50,16 @@ my $_l = { [ 'files/live.51-mageia-resume.conf', '/etc/dracut.conf.d/51-mageia-resume.conf', { mode => 0644 } ], [ 'files/live.modprobe.conf', '/etc/modprobe.conf', { mode => 0644 } ], - # add local repos - if_($live->{settings}{arch} eq 'i586', - [ 'files/mga_rpms/i586/mga_rpms', '/var/local' ], - ), - if_($live->{settings}{arch} eq 'x86_64', - [ 'files/mga_rpms/x86_64/mga_rpms', '/var/local' ], - ), + # add local repos + if_($live->{settings}{arch} eq 'i586', + [ 'files/mga_rpms/i586/mga_rpms', '/var/local' ], + ), + if_($live->{settings}{arch} eq 'x86_64', + [ 'files/mga_rpms/x86_64/mga_rpms', '/var/local' ], + ), - # add initial dns resolver for online medias - [ 'files/resolv.conf', '/etc/resolv.conf', { mode => 0644 } ], + # add initial dns resolver for online medias + [ 'files/resolv.conf', '/etc/resolv.conf', { mode => 0644 } ], # disable suspend and hibernate in live mode [ 'files/50-disable-suspend.pkla', '/etc/polkit-1/localauthority/50-local.d/50-disable-suspend.pkla', { mode => 0644, no_install => 1 } ], @@ -80,14 +80,14 @@ my $_l = { [ "files/finish-install.$live->{settings}{media}", '/etc/sysconfig/finish-install', { mode => 0644 } ], # fix for sometimes wrong permissions [ 'files/draklive-install.d/run.d/home-live-permissions.sh', '/etc/draklive-install.d/run.d/home-live-permissions.sh', { mode => 755 } ], - # fix for /var/lib/gdm sometimes ending up as root:root - if_($live->{settings}{desktop} eq 'GNOME', - [ 'files/draklive-install.d/run.d/gdm-permissions.sh', '/etc/draklive-install.d/run.d/gdm-permissions.sh', { mode => 755 } ] - ), - if_($live->{settings}{desktop} eq 'Plasma', - [ 'files/draklive-install.d/run.d/generate-gtk-icon-cache.sh', '/etc/draklive-install.d/run.d/generate-gtk-icon-cache.sh', { mode => 755 } ], - [ 'files/draklive-install.d/remove.d/clear-sddm-state', '/etc/draklive-install.d/remove.d/clear-sddm-state', { mode => 0644 } ], - ), + # fix for /var/lib/gdm sometimes ending up as root:root + if_($live->{settings}{desktop} eq 'GNOME', + [ 'files/draklive-install.d/run.d/gdm-permissions.sh', '/etc/draklive-install.d/run.d/gdm-permissions.sh', { mode => 755 } ] + ), + if_($live->{settings}{desktop} eq 'Plasma', + [ 'files/draklive-install.d/run.d/generate-gtk-icon-cache.sh', '/etc/draklive-install.d/run.d/generate-gtk-icon-cache.sh', { mode => 755 } ], + [ '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 [ '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 } ], @@ -109,7 +109,8 @@ my $_l = { module_options => { loop => "max_loop=64", }, - exclude_modules => [], + exclude_modules => [ + ], additional_modules => [ ], stage2_updates => [ @@ -121,12 +122,12 @@ my $_l = { rpms => [ ], disable_services => [ - # uncommon hardware - qw(bpalogin capi4linux cpqarrayd mdadm oki4daemon pcscd), - # unneeded software - qw(chronyd ntpd snmpd), - # slows down basic usage and install, reenabled after install - qw(crond msec), + # uncommon hardware + qw(bpalogin capi4linux cpqarrayd mdadm oki4daemon pcscd), + # unneeded software + qw(chronyd ntpd snmpd), + # slows down basic usage and install, reenabled after install + qw(crond msec), ], disable_timers => [ ], @@ -135,77 +136,77 @@ my $_l = { initrd_post => join("\n", ), postInstall => join(';', - if_($live->{settings}{default_user}, "echo $live->{settings}{default_user} > /etc/draklive-install.d/user"), - "perl -pi -e 's,,$live->{settings}{default_user},' /etc/draklive-install.d/sysconfig/finish-install", + if_($live->{settings}{default_user}, "echo $live->{settings}{default_user} > /etc/draklive-install.d/user"), + "perl -pi -e 's,,$live->{settings}{default_user},' /etc/draklive-install.d/sysconfig/finish-install", - if_($live->{settings}{desktop} eq 'Xfce' && $live->{settings}{default_user}, - # add a desktop icon to run draklive-install - "mkdir -p /home/$live->{settings}{default_user}/Desktop", - "cp /usr/share/applications/mageia-draklive-install.desktop /home/$live->{settings}{default_user}/Desktop/draklive-install.desktop", - ), + if_($live->{settings}{desktop} eq 'Xfce' && $live->{settings}{default_user}, + # add a desktop icon to run draklive-install + "mkdir -p /home/$live->{settings}{default_user}/Desktop", + "cp /usr/share/applications/mageia-draklive-install.desktop /home/$live->{settings}{default_user}/Desktop/draklive-install.desktop", + ), - #- 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}" - ), + #- 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}" + ), - # remove readahead - "rm -f /.readahead_collect", + # 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', - if_($live->{settings}{desktop} eq 'Plasma', - "rm -f /usr/share/icons/*/icon-theme.cache", - "cp -a /etc/akonadi/mysql-global.conf /etc/akonadi/mysql-global-standard.conf", - "cp /etc/akonadi/mysql-global-mobile.conf /etc/akonadi/mysql-global.conf", - "ak=/etc/draklive-install.d/run.d/restore-akonadi-config.sh; echo -e '#!/bin/sh\ncp /etc/akonadi/mysql-global-standard.conf /etc/akonadi/mysql-global.conf' > \$ak; chmod +x \$ak", - ), - if_($live->{settings}{desktop} eq 'GNOME', - # modify and compile schema to get draklive-install and Firefox in menu - "sed -i 's/epiphany.desktop/firefox.desktop/' /usr/share/glib-2.0/schemas/glib2-branding.gschema.override", - "glib-compile-schemas /usr/share/glib-2.0/schemas/", - # fix permissions to enable GDM to rerun if the user logs out - "chown -R gdm:gdm /var/lib/gdm", - # switch to NetworkManager - "systemctl disable network", - "systemctl disable network-up", - "systemctl enable NetworkManager.service", - "systemctl enable NetworkManager-wait-online.service", - "sed -i 's/NETWORK=yes/NETWORK=no/' /etc/draklive-install.d/sysconfig/finish-install", - "echo 'AUTOSTART=FALSE' > /home/live/.net_applet", - ), + #- adduser seems to create a sparse lastlog with a slot for all available users + #- which can be huge + '> /var/log/lastlog', + if_($live->{settings}{desktop} eq 'Plasma', + "rm -f /usr/share/icons/*/icon-theme.cache", + "cp -a /etc/akonadi/mysql-global.conf /etc/akonadi/mysql-global-standard.conf", + "cp /etc/akonadi/mysql-global-mobile.conf /etc/akonadi/mysql-global.conf", + "ak=/etc/draklive-install.d/run.d/restore-akonadi-config.sh; echo -e '#!/bin/sh\ncp /etc/akonadi/mysql-global-standard.conf /etc/akonadi/mysql-global.conf' > \$ak; chmod +x \$ak", + ), + if_($live->{settings}{desktop} eq 'GNOME', + # modify and compile schema to get draklive-install and Firefox in menu + "sed -i 's/epiphany.desktop/firefox.desktop/' /usr/share/glib-2.0/schemas/glib2-branding.gschema.override", + "glib-compile-schemas /usr/share/glib-2.0/schemas/", + # fix permissions to enable GDM to rerun if the user logs out + "chown -R gdm:gdm /var/lib/gdm", + # switch to NetworkManager + "systemctl disable network", + "systemctl disable network-up", + "systemctl enable NetworkManager.service", + "systemctl enable NetworkManager-wait-online.service", + "sed -i 's/NETWORK=yes/NETWORK=no/' /etc/draklive-install.d/sysconfig/finish-install", + "echo 'AUTOSTART=FALSE' > /home/live/.net_applet", + ), - # 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", + # 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", - # disable HPLIP systray startup - "echo 'Hidden=true' >> /etc/xdg/autostart/hplip-systray.desktop", + # disable HPLIP systray startup + "echo 'Hidden=true' >> /etc/xdg/autostart/hplip-systray.desktop", - # remove pre-installed grub2, we need to be able to select grub2 vs grub2-efi at install time - "rpm -e --nodeps grub2", + # remove pre-installed grub2, we need to be able to select grub2 vs grub2-efi at install time + "rpm -e --nodeps grub2", - # allow draklive-install to spawn subtasks that access the display - "echo 'session optional pam_xauth.so # for draklive-install' >> /etc/pam.d/polkit-1", + # allow draklive-install to spawn subtasks that access the display + "echo 'session optional pam_xauth.so # for draklive-install' >> /etc/pam.d/polkit-1", - # set the timestamp on the font directories to be a whole second - # fc-cache looks at the nano second portion which may be non-zero - # as we are on ext4, but then it will compare against the stamps - # on the squashfs live image which have whole second resolution - # (adapted from fix descrived in OpenMandriva bug 1764) - "find /usr/share/fonts -type d -exec touch -t \$(date +%Y%m%d%H%M.%S) '{}' ';'", - # now update the cache for the new timestamps - "fc-cache -rf", + # set the timestamp on the font directories to be a whole second + # fc-cache looks at the nano second portion which may be non-zero + # as we are on ext4, but then it will compare against the stamps + # on the squashfs live image which have whole second resolution + # (adapted from fix descrived in OpenMandriva bug 1764) + "find /usr/share/fonts -type d -exec touch -t \$(date +%Y%m%d%H%M.%S) '{}' ';'", + # now update the cache for the new timestamps + "fc-cache -rf", - # set the initial wireless regulatory domain to "world", enabling - # all possible wireless channels to be used. - "sed -i -r 's/CRDA_DOMAIN=.*/CRDA_DOMAIN=00/' /etc/sysconfig/network", + # set the initial wireless regulatory domain to "world", enabling + # all possible wireless channels to be used. + "sed -i -r 's/CRDA_DOMAIN=.*/CRDA_DOMAIN=00/' /etc/sysconfig/network", - # try to avoid plymouth falling back to text mode (mga#19984) - "sed -i -r 's/DeviceTimeout=[0-9]+/DeviceTimeout=10/' /usr/share/plymouth/plymouthd.defaults", - ), + # try to avoid plymouth falling back to text mode (mga#19984) + "sed -i -r 's/DeviceTimeout=[0-9]+/DeviceTimeout=10/' /usr/share/plymouth/plymouthd.defaults", + ), additional_media => [ if_($live->{settings}{updates_repository}, { @@ -228,7 +229,7 @@ my $_l = { ], }, if_($use_modules, modules => [ - { type => 'squashfs', source => '/root/drakx/i18n-*.lst', rooted => 1 }, + { type => 'squashfs', source => '/root/drakx/i18n-*.lst', rooted => 1 }, ]), }, regions => { @@ -242,7 +243,7 @@ my $_l = { media => { storage => 'cdrom', bootloader_timeout => 10, - boot_entries => [ "live" => " xdriver=free", + boot_entries => [ "live" => " xdriver=free", "live-nf" => " nokmsboot", "linux" => " install xdriver=free", "linux-nf" => " install nokmsboot", @@ -251,18 +252,15 @@ my $_l = { 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 ehci_hcd ehci_pci ehci_platform ohci_hcd ohci_pci ohci_platform uhci_hcd xhci_hcd xhci_pci xhci_plat_hcd) ], - files => [ - if_($live->{settings}{arch} eq 'x86_64', - [ 'files/UEFI/EFI', '' ], - ), - # FIXME: add doc and autorun - #[ 'extra/livecd/autorun/*', ''], - #map { [ 'extra/livecd/' . $_, $_ ] } qw(LISEZMOI.pdf README.pdf) - ], + files => [ + if_($live->{settings}{arch} eq 'x86_64', + [ 'files/UEFI/EFI', '' ], + ), + # FIXME: add doc and autorun + #[ 'extra/livecd/autorun/*', ''], + #map { [ 'extra/livecd/' . $_, $_ ] } qw(LISEZMOI.pdf README.pdf) + ], ), - - - }, mount => MDV::Draklive::Mounts::volatile_squash_union($use_modules), ), -- cgit v1.2.1