Remove some more redundant items, add extra white space for readability.

2 files changed, 21 insertions, 2 deletions

diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl
index a12150d..6e9bb0c 100644
--- a/config/auto_inst.cfg.pl
+++ b/config/auto_inst.cfg.pl
@@ -81,8 +81,10 @@ $o = {
 
         # 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',
 
@@ -112,7 +114,6 @@ $o = {
 
         # not wanted
         'al-anvar', #  (mga #9752)
-        #'mate-polkit',
         'openssh-server',
         'manatools-gui',
 
@@ -177,6 +178,7 @@ $o = {
         if_($has_plasma,
             'task-plasma5', 'sddm', # sometimes gets nuked during build
         ),
+
         # Xfce specific stuff
         if_($has_xfce,
             'task-xfce4',
@@ -250,8 +252,10 @@ $o = {
     '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"),
     ),
diff --git a/config/live.cfg b/config/live.cfg
index cb9fae6..e978bb3 100644
--- a/config/live.cfg
+++ b/config/live.cfg
@@ -2,7 +2,6 @@
 
 use MDK::Common;
 
-my $ooo_version = '3.0';
 my $use_modules = to_bool($live->{settings}{pack});
 my @user_config_dirs = ('/etc/skel', if_($live->{settings}{default_user}, '/home/' . $live->{settings}{default_user}));
 
@@ -29,6 +28,7 @@ my $_l = {
                 # 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 } ],
             ),
@@ -55,35 +55,47 @@ my $_l = {
 
             # 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 } ],
+
             #- make cups the default spooler
             [ 'files/defaultspooler', '/etc/foomatic/defaultspooler', { mode => 0644 } ],
+
             #- eject eject medium before halt/reboot
             [ 'files/halt-local.service', '/etc/systemd/system/halt-local.service', { mode => 0644, no_install => 1 } ],
             [ 'files/halt.local', '/sbin/halt.local', { mode => 0755, no_install => 1 } ],
+
             #- do not load usblp and trigger autosetupprintqueues in live since cups is not available
             [ 'files/live.modprobe', '/etc/modprobe.d/live.conf', { mode => 0644, no_install => 1 } ],
+
             # live media specific initrd
             [ 'files/live-dracut.conf', '/etc/dracut.conf.d/60-live.conf', { mode => 0644, no_install => 1 } ],
+
             #- disable first boot wizard at live boot
             [ 'files/firstboot', '/etc/sysconfig/firstboot', { mode => 0644 } ],
+
             #- enable drakx-finish-install at live boot
             [ "files/finish-install", '/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 } ],
             ),
+
             #- 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 } ],
             [ 'files/draklive-install.d/services', '/etc/draklive-install.d/services', { 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 } ],
             (map { [ 'files/mgaonlinerc', $_ . '/.MgaOnline/mgaonline', { mode => 0644, no_install => 1 } ] } @user_config_dirs),
             (map { [ 'files/draksnapshot.sysconfig', $_ . '/.draksnapshot', { mode => 0644, no_install => 1 } ] } @user_config_dirs),
@@ -147,6 +159,7 @@ my $_l = {
             #- 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",
@@ -157,8 +170,10 @@ my $_l = {
                 # 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",