diff options
Diffstat (limited to 'perl-install/any.pm')
| -rw-r--r-- | perl-install/any.pm | 1277 |
1 files changed, 901 insertions, 376 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index d4f74e102..025daecd2 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -9,6 +9,7 @@ use strict; use common; use detect_devices; use partition_table; +use fs::proc_partitions; use fs::type; use lang; use run_program; @@ -19,7 +20,7 @@ use fs; use c; sub facesdir() { - "$::prefix/usr/share/mdk/faces/"; + "$::prefix/usr/share/mga/faces/"; } sub face2png { my ($face) = @_; @@ -48,7 +49,7 @@ sub alloc_user_faces { } sub create_user { - my ($u, $isMD5) = @_; + my ($u, $authentication) = @_; my @existing = stat("$::prefix/home/$u->{name}"); @@ -64,24 +65,31 @@ sub create_user { } else { run_program::rooted($::prefix, 'groupadd', '-g', $gid, $u->{name}); } + } elsif ($u->{rename_from}) { + run_program::rooted($::prefix, 'groupmod', '-n', $u->{name}, $u->{rename_from}); } + require authentication; + my $symlink_home_from = $u->{rename_from} && (getpwnam($u->{rename_from}))[7]; run_program::raw({ root => $::prefix, sensitive_arguments => 1 }, - 'adduser', - '-p', authentication::user_crypted_passwd($u, $isMD5), + ($u->{rename_from} ? 'usermod' : 'adduser'), + '-p', authentication::user_crypted_passwd($u, $authentication), if_($uid, '-u', $uid), if_($gid, '-g', $gid), if_($u->{realname}, '-c', $u->{realname}), - if_($u->{home}, '-d', $u->{home}), + if_($u->{home}, '-d', $u->{home}, if_($u->{rename_from}, '-m')), if_($u->{shell}, '-s', $u->{shell}), - $u->{name}); + ($u->{rename_from} + ? ('-l', $u->{name}, $u->{rename_from}) + : $u->{name})); + symlink($u->{home}, $symlink_home_from) if $symlink_home_from; + eval { run_program::rooted($::prefix, 'systemctl', 'try-restart', 'accounts-daemon.service') }; } my (undef, undef, $uid, $gid, undef, undef, undef, $home) = getpwnam($u->{name}); if (@existing && $::isInstall && ($uid != $existing[4] || $gid != $existing[5])) { log::l("chown'ing $home from $existing[4].$existing[5] to $uid.$gid"); - require commands; - eval { commands::chown_("-r", "$uid.$gid", "$::prefix$home") }; + eval { common::chown_('recursive', $uid, $gid, "$::prefix$home") }; } } @@ -91,26 +99,118 @@ sub add_users { alloc_user_faces($users); foreach (@$users) { - create_user($_, $authentication->{md5}); + create_user($_, $authentication); run_program::rooted($::prefix, "usermod", "-G", join(",", @{$_->{groups}}), $_->{name}) if !is_empty_array_ref($_->{groups}); addKdmIcon($_->{name}, delete $_->{auto_icon} || $_->{icon}); } } -sub hdInstallPath() { - my $tail = first(readlink("/tmp/image") =~ m|^(?:/tmp/)?hdimage/*(.*)|); - my $head = first(readlink("/tmp/hdimage") =~ m|$::prefix(.*)|); - log::l("search HD install path, tail=$tail, head=$head, tail defined=" . to_bool(defined $tail)); - defined $tail && ($head ? "$head/$tail" : "/mnt/hd/$tail"); +sub install_bootloader_pkgs { + my ($do_pkgs, $b) = @_; + + bootloader::ensure_pkg_is_installed($do_pkgs, $b); + install_acpi_pkgs($do_pkgs, $b); } sub install_acpi_pkgs { my ($do_pkgs, $b) = @_; my $acpi = bootloader::get_append_with_key($b, 'acpi'); - if (!member($acpi, 'off', 'ht')) { - $do_pkgs->install('acpi', 'acpid') if !(-x "$::prefix/usr/bin/acpi" && -x "$::prefix/usr/sbin/acpid"); + my $use_acpi = !member($acpi, 'off', 'ht'); + if ($use_acpi) { + $do_pkgs->ensure_files_are_installed([ [ qw(acpi acpi) ], [ qw(acpid acpid) ] ], $::isInstall); } + require services; + services::set_status($_, $use_acpi, $::isInstall) foreach qw(acpi acpid); +} + +sub setupBootloaderBeforeStandalone { + my ($do_pkgs, $b, $all_hds, $fstab) = @_; + require keyboard; + my $keyboard = keyboard::read_or_default(); + my $allow_fb = listlength(cat_("/proc/fb")); + my $cmdline = cat_('/proc/cmdline'); + my $vga_fb = first($cmdline =~ /\bvga=(\S+)/); + my $splash = $cmdline =~ /\bsplash\b/; + my $quiet = $cmdline =~ /\bquiet\b/; + setupBootloaderBefore($do_pkgs, $b, $all_hds, $fstab, $keyboard, $allow_fb, $vga_fb, $splash, $quiet); +} + +sub setupBootloaderBefore { + my ($_do_pkgs, $bootloader, $all_hds, $fstab, $keyboard, $allow_fb, $vga_fb, $splash, $quiet) = @_; + require bootloader; + + #- auto_install backward compatibility + #- one should now use {message_text} + if ($bootloader->{message} =~ m!^[^/]!) { + $bootloader->{message_text} = delete $bootloader->{message}; + } + + if (cat_("/proc/cmdline") =~ /mem=nopentium/) { + bootloader::set_append_with_key($bootloader, mem => 'nopentium'); + } + if (cat_("/proc/cmdline") =~ /\b(pci)=(\S+)/) { + bootloader::set_append_with_key($bootloader, $1, $2); + } + if (my ($acpi) = cat_("/proc/cmdline") =~ /\bacpi=(\w+)/) { + if ($acpi eq 'ht') { + #- the user is using the default, which may not be the best + my $year = detect_devices::computer_info()->{BIOS_Year}; + if ($year >= 2002) { + log::l("forcing ACPI on recent bios ($year)"); + $acpi = ''; + } + } + bootloader::set_append_with_key($bootloader, acpi => $acpi); + } + if (cat_("/proc/cmdline") =~ /\bnoapic/) { + bootloader::set_append_simple($bootloader, 'noapic'); + } + if (cat_("/proc/cmdline") =~ /\bnoresume/) { + bootloader::set_append_simple($bootloader, 'noresume'); + } elsif (bootloader::get_append_simple($bootloader, 'noresume')) { + } else { + if (my ($biggest_swap) = sort { $b->{size} <=> $a->{size} } grep { isSwap($_) } @$fstab) { + my $biggest_swap_dev = fs::wild_device::from_part('', $biggest_swap); + bootloader::set_append_with_key($bootloader, resume => $biggest_swap_dev); + mkdir_p("$::prefix/etc/dracut.conf.d"); + output("$::prefix/etc/dracut.conf.d/51-mageia-resume.conf", qq(add_device+="$biggest_swap_dev"\n)); + } + } + + #- set nokmsboot if a conflicting driver is configured. + if (-x "$::prefix/sbin/display_driver_helper" && !run_program::rooted($::prefix, "/sbin/display_driver_helper", "--is-kms-allowed")) { + bootloader::set_append_simple($bootloader, 'nokmsboot'); + } + + #- check for valid fb mode to enable a default boot with frame buffer. + my $vga = $allow_fb && (!detect_devices::matching_desc__regexp('3D Rage LT') && + !detect_devices::matching_desc__regexp('Rage Mobility [PL]') && + !detect_devices::matching_desc__regexp('i740') && + !detect_devices::matching_desc__regexp('Matrox') && + !detect_devices::matching_desc__regexp('Tseng.*ET6\d00') && + !detect_devices::matching_desc__regexp('SiS.*SG86C2.5') && + !detect_devices::matching_desc__regexp('SiS.*559[78]') && + !detect_devices::matching_desc__regexp('SiS.*300') && + !detect_devices::matching_desc__regexp('SiS.*540') && + !detect_devices::matching_desc__regexp('SiS.*6C?326') && + !detect_devices::matching_desc__regexp('SiS.*6C?236') && + !detect_devices::matching_desc__regexp('Voodoo [35]|Voodoo Banshee') && #- 3d acceleration seems to bug in fb mode + !detect_devices::matching_desc__regexp('828[14][05].* CGC') #- i810 & i845 now have FB support during install but we disable it afterwards + ); + my $force_vga = $allow_fb && (detect_devices::matching_desc__regexp('SiS.*630') || #- SiS 630 need frame buffer. + detect_devices::matching_desc__regexp('GeForce.*Integrated') #- needed for fbdev driver (hack). + ); + + #- propose the default fb mode for kernel fb, if bootsplash is installed. + my $need_fb = -e "$::prefix/usr/share/bootsplash/scripts/make-boot-splash"; + bootloader::suggest($bootloader, $all_hds, + vga_fb => ($force_vga || $vga && $need_fb) && $vga_fb, + splash => $splash, + quiet => $quiet); + + $bootloader->{keytable} ||= keyboard::keyboard2kmap($keyboard); + log::l("setupBootloaderBefore end"); } sub setupBootloader { @@ -125,15 +225,36 @@ sub setupBootloader { setupBootloader__boot_bios_drive($in, $b, $all_hds->{hds}) or goto general; { local $::Wizard_finished = 1 if $::isStandalone; - setupBootloader__entries($in, $b, $all_hds, $fstab) or goto general; + if (bootloader::main_method($b->{method}) eq 'grub2') { + setupBootloader__grub2($in, $b, $all_hds, $fstab) or goto general; + } else { + setupBootloader__entries($in, $b, $all_hds, $fstab) or goto general; + } } 1; } +sub setupBootloaderUntilInstalled { + my ($in, $b, $all_hds, $fstab, $security) = @_; + do { + my $before = fs::fstab_to_string($all_hds); + setupBootloader($in, $b, $all_hds, $fstab, $security) or $in->exit; + if ($before ne fs::fstab_to_string($all_hds)) { + #- ovitters: This fstab comparison was needed for optionally + #- setting up /tmp using tmpfs. That code was removed. Not removing + #- this code as I'm not sure if something still relies on this + fs::write_fstab($all_hds); + } + } while !installBootloader($in, $b, $all_hds); +} + sub installBootloader { my ($in, $b, $all_hds) = @_; return if detect_devices::is_xbox(); - install_acpi_pkgs($in->do_pkgs, $b); + + return 1 if arch() =~ /arm/; + + install_bootloader_pkgs($in->do_pkgs, $b); eval { run_program::rooted($::prefix, 'echo | lilo -u') } if $::isInstall && !$::o->{isUpgrade} && -e "$::prefix/etc/lilo.conf" && glob("$::prefix/boot/boot.*"); @@ -164,11 +285,6 @@ Assign a new Volume ID?", $dev)))) { $in->ask_warn('', [ N("Installation of bootloader failed. The following error occurred:"), $err ]); return; } - } elsif (arch() =~ /ppc/) { - if (detect_devices::get_mac_model() !~ /IBM/) { - my $of_boot = bootloader::dev2yaboot($b->{boot}); - $in->ask_warn('', N("You may need to change your Open Firmware boot-device to\n enable the bootloader. If you do not see the bootloader prompt at\n reboot, hold down Command-Option-O-F at reboot and enter:\n setenv boot-device %s,\\\\:tbxi\n Then type: shut-down\nAt your next boot you should see the bootloader prompt.", $of_boot)); - } } 1; } @@ -179,13 +295,10 @@ sub setupBootloader_simple { my $hds = $all_hds->{hds}; require bootloader; - my $mixed_kind_of_disks = bootloader::mixed_kind_of_disks($hds); - #- full expert questions when there is 2 kind of disks - #- it would need a semi_auto asking on which drive the bios boots... - - $mixed_kind_of_disks || $b->{bootUnsafe} || arch() =~ /ppc/ or return 1; #- default is good enough + bootloader::ensafe_first_bios_drive($hds) + || $b->{bootUnsafe} or return 1; #- default is good enough - if (!$mixed_kind_of_disks && arch() !~ /ia64/) { + if (arch() !~ /ia64/) { setupBootloader__mbr_or_not($in, $b, $hds, $fstab) or return 0; } else { general: @@ -199,14 +312,18 @@ sub setupBootloader_simple { sub setupBootloader__boot_bios_drive { my ($in, $b, $hds) = @_; - bootloader::mixed_kind_of_disks($hds) && - $b->{boot} =~ /\d$/ && #- on a partition - is_empty_hash_ref($b->{bios}) && #- some bios mapping already there - arch() !~ /ppc/ or return 1; + if (!is_empty_hash_ref($b->{bios})) { + #- some bios mapping already there + return 1; + } elsif (bootloader::mixed_kind_of_disks($hds) && $b->{boot} =~ /\d$/) { #- on a partition + # see below + } else { + return 1; + } - log::l("mixed_kind_of_disks"); + log::l("_ask_boot_bios_drive"); my $hd = $in->ask_from_listf('', N("You decided to install the bootloader on a partition. -This implies you already have a bootloader on the hard drive you boot (eg: System Commander). +This implies you already have a bootloader on the hard disk drive you boot (eg: System Commander). On which drive are you booting?"), \&partition_table::description, $hds) or return 0; log::l("mixed_kind_of_disks chosen $hd->{device}"); @@ -214,21 +331,32 @@ On which drive are you booting?"), \&partition_table::description, $hds) or retu 1; } +sub _ask_mbr_or_not { + my ($in, $default, @l) = @_; + $in->ask_from_({ title => N("Bootloader Installation"), + interactive_help_id => 'setupBootloaderBeginner', + }, + [ + { label => N("Where do you want to install the bootloader?"), title => 1 }, + { val => \$default, list => \@l, format => sub { $_[0][0] }, type => 'list' }, + ] + ); + $default; +} + sub setupBootloader__mbr_or_not { my ($in, $b, $hds, $fstab) = @_; - if (arch() =~ /ppc/) { - if (defined $partition_table::mac::bootstrap_part) { - $b->{boot} = $partition_table::mac::bootstrap_part; - log::l("set bootstrap to $b->{boot}"); - } else { - die "no bootstrap partition - yaboot.conf creation failed"; - } - } else { + log::l("setupBootloader__mbr_or_not"); + my $floppy = detect_devices::floppy(); my @l = ( + bootloader::ensafe_first_bios_drive($hds) ? + (map { [ N("First sector (MBR) of drive %s", partition_table::description($_)) => '/dev/' . $_->{device} ] } @$hds) + : [ N("First sector of drive (MBR)") => '/dev/' . $hds->[0]{device} ], + [ N("First sector of the root partition") => '/dev/' . fs::get::root($fstab, 'boot')->{device} ], if_($floppy, [ N("On Floppy") => "/dev/$floppy" ], @@ -237,84 +365,77 @@ sub setupBootloader__mbr_or_not { ); my $default = find { $_->[1] eq $b->{boot} } @l; - $in->ask_from_({ title => N("LILO/grub Installation"), - messages => N("Where do you want to install the bootloader?"), - interactive_help_id => 'setupBootloaderBeginner', - }, - [ { val => \$default, list => \@l, format => sub { $_[0][0] }, type => 'list' } ]); - my $new_boot = $default->[1] or return; + if (!$::isInstall) { + $default = _ask_mbr_or_not($in, $default, @l); + } + my $new_boot = $default->[1]; #- remove bios mapping if the user changed the boot device - delete $b->{bios} if $new_boot ne $b->{boot}; - $b->{boot} = $new_boot; - } + delete $b->{bios} if $new_boot && $new_boot ne $b->{boot}; + $b->{boot} = $new_boot or return; 1; } sub setupBootloader__general { - my ($in, $b, $all_hds, $fstab, $security) = @_; + my ($in, $b, $all_hds, $_fstab, $_security) = @_; return if detect_devices::is_xbox(); my @method_choices = bootloader::method_choices($all_hds); my $prev_force_acpi = my $force_acpi = bootloader::get_append_with_key($b, 'acpi') !~ /off|ht/; - my $prev_force_noapic = my $force_noapic = bootloader::get_append_simple($b, 'noapic'); - my $prev_force_nolapic = my $force_nolapic = bootloader::get_append_simple($b, 'nolapic'); - my $memsize = bootloader::get_append_memsize($b); - my $prev_clean_tmp = my $clean_tmp = any { $_->{mntpoint} eq '/tmp' } @{$all_hds->{special} ||= []}; + my $prev_enable_apic = my $enable_apic = !bootloader::get_append_simple($b, 'noapic'); + my $prev_enable_lapic = my $enable_lapic = !bootloader::get_append_simple($b, 'nolapic'); + my $prev_enable_smp = my $enable_smp = !bootloader::get_append_simple($b, 'nosmp'); my $prev_boot = $b->{boot}; + my $prev_method = $b->{method}; $b->{password2} ||= $b->{password} ||= ''; $::Wizard_title = N("Boot Style Configuration"); - if (arch() !~ /ppc/) { - $in->ask_from_({ messages => N("Bootloader main options"), - title => N("Bootloader main options"), - icon => 'banner-bootL', - interactive_help_id => 'setupBootloader', - callbacks => { - complete => sub { - !$memsize || $memsize =~ /^\d+K$/ || $memsize =~ s/^(\d+)M?$/$1M/i or $in->ask_warn('', N("Give the ram size in MB")), return 1; - #- $security > 4 && length($b->{password}) < 6 and $in->ask_warn('', N("At this level of security, a password (and a good one) in lilo is requested")), return 1; - $b->{restricted} && !$b->{password} and $in->ask_warn('', N("Option ``Restrict command line options'' is of no use without a password")), return 1; - $b->{password} eq $b->{password2} or !$b->{restricted} or $in->ask_warn('', [ N("The passwords do not match"), N("Please try again") ]), return 1; - 0; - }, - }, - }, [ - { label => N("Bootloader to use"), val => \$b->{method}, list => \@method_choices, format => \&bootloader::method2text }, - if_(arch() !~ /ia64/, - { label => N("Boot device"), val => \$b->{boot}, list => [ map { "/dev/$_->{device}" } bootloader::allowed_boot_parts($b, $all_hds) ], not_edit => !$::expert }, - ), + my (@boot_devices, %boot_devices); + if (is_uefi()) { + @boot_devices = 'ESP'; + %boot_devices = (ESP => N("EFI System Partition")); + } else { + foreach (bootloader::allowed_boot_parts($b, $all_hds)) { + my $dev = "/dev/$_->{device}"; + push @boot_devices, $dev; + my $name = $_->{mntpoint} || $_->{info} || $_->{device_LABEL}; + unless ($name) { + $name = formatXiB($_->{size}*512) . " " if $_->{size}; + $name .= $_->{fs_type}; + } + $boot_devices{$dev} = $name ? "$dev ($name)" : $dev; + } + } + + $in->ask_from_({ #messages => N("Bootloader main options"), + title => N("Bootloader main options"), + interactive_help_id => 'setupBootloader', + }, [ + #title => N("Bootloader main options"), + { label => N("Bootloader"), title => 1 }, + { label => N("Bootloader to use"), val => \$b->{method}, + list => \@method_choices, format => \&bootloader::method2text }, + { label => N("Boot device"), val => \$b->{boot}, list => \@boot_devices, allow_empty_list => 1, + format => sub { $boot_devices{$_[0]} } }, + { label => N("Main options"), title => 1 }, { label => N("Delay before booting default image"), val => \$b->{timeout} }, - { text => N("Enable ACPI"), val => \$force_acpi, type => 'bool' }, - if_(!$force_nolapic, - { text => N("Force no APIC"), val => \$force_noapic, type => 'bool' }, - ), - { text => N("Force No Local APIC"), val => \$force_nolapic, type => 'bool' }, - if_($security >= 4 || $b->{password} || $b->{restricted}, - { label => N("Password"), val => \$b->{password}, hidden => 1 }, + { text => N("Enable ACPI"), val => \$force_acpi, type => 'bool', advanced => 1 }, + { text => N("Enable SMP"), val => \$enable_smp, type => 'bool', advanced => 1 }, + { text => N("Enable APIC"), val => \$enable_apic, type => 'bool', advanced => 1, + disabled => sub { !$enable_lapic } }, + { text => N("Enable Local APIC"), val => \$enable_lapic, type => 'bool', advanced => 1 }, + { label => N("Security"), title => 1 }, + { label => N("Password"), val => \$b->{password}, hidden => 1, + validate => sub { + my $ok = $b->{password} eq $b->{password2} + or $in->ask_warn('', [ N("The passwords do not match"), N("Please try again") ]); + my $ok2 = !($b->{password} && $b->{method} eq 'grub-graphic') + or $in->ask_warn('', N("You cannot use a password with %s", + bootloader::method2text($b->{method}))); + $ok && $ok2; + } }, { label => N("Password (again)"), val => \$b->{password2}, hidden => 1 }, - { text => N("Restrict command line options"), val => \$b->{restricted}, type => "bool", text => N("restrict") }, - ), - { text => N("Clean /tmp at each boot"), val => \$clean_tmp, type => 'bool', advanced => 1 }, - { label => N("Precise RAM size if needed (found %d MB)", availableRamMB()), val => \$memsize, advanced => 1 }, ]) or return 0; - } else { - $b->{boot} = $partition_table::mac::bootstrap_part; - $in->ask_from_({ messages => N("Bootloader main options"), - title => N("Bootloader main options"), - icon => 'banner-bootL', - interactive_help_id => 'setupYabootGeneral', - }, [ - { label => N("Bootloader to use"), val => \$b->{method}, list => \@method_choices, format => \&bootloader::method2text }, - { label => N("Init Message"), val => \$b->{'init-message'} }, - { label => N("Boot device"), val => \$b->{boot}, list => [ map { "/dev/$_" } (map { $_->{device} } (grep { isAppleBootstrap($_) } @$fstab)) ], not_edit => !$::expert }, - { label => N("Open Firmware Delay"), val => \$b->{delay} }, - { label => N("Kernel Boot Timeout"), val => \$b->{timeout} }, - { label => N("Enable CD Boot?"), val => \$b->{enablecdboot}, type => "bool" }, - { label => N("Enable OF Boot?"), val => \$b->{enableofboot}, type => "bool" }, - { label => N("Default OS?"), val => \$b->{defaultos}, list => [ 'linux', 'macos', 'macosx', 'darwin' ] }, - ]) or return 0; - } #- remove bios mapping if the user changed the boot device delete $b->{bios} if $b->{boot} ne $prev_boot; @@ -325,34 +446,37 @@ sub setupBootloader__general { delete $b->{'raid-extra-boot'} if $b->{'raid-extra-boot'} eq 'mbr'; } - if ($b->{method} eq 'grub') { - $in->do_pkgs->ensure_binary_is_installed('grub', "grub", 1) or return 0; - } + bootloader::ensure_pkg_is_installed($in->do_pkgs, $b) or goto &setupBootloader__general; + bootloader::suggest_message_text($b) if ! -e "$::prefix/boot/message-text"; #- in case we switch from grub to lilo - bootloader::set_append_memsize($b, $memsize); if ($prev_force_acpi != $force_acpi) { bootloader::set_append_with_key($b, acpi => ($force_acpi ? '' : 'ht')); } - if ($prev_force_noapic != $force_noapic) { - ($force_noapic ? \&bootloader::set_append_simple : \&bootloader::remove_append_simple)->($b, 'noapic'); + + if ($prev_enable_smp != $enable_smp) { + ($enable_smp ? \&bootloader::remove_append_simple : \&bootloader::set_append_simple)->($b, 'nosmp'); + } + + if ($prev_enable_apic != $enable_apic) { + ($enable_apic ? \&bootloader::remove_append_simple : \&bootloader::set_append_simple)->($b, 'noapic'); + ($enable_apic ? \&bootloader::set_append_simple : \&bootloader::remove_append_simple)->($b, 'apic'); } - if ($prev_force_nolapic != $force_nolapic) { - ($force_nolapic ? \&bootloader::set_append_simple : \&bootloader::remove_append_simple)->($b, 'nolapic'); + if ($prev_enable_lapic != $enable_lapic) { + ($enable_lapic ? \&bootloader::remove_append_simple : \&bootloader::set_append_simple)->($b, 'nolapic'); + ($enable_lapic ? \&bootloader::set_append_simple : \&bootloader::remove_append_simple)->($b, 'lapic'); } - if ($prev_clean_tmp != $clean_tmp) { - if ($clean_tmp && !fs::get::has_mntpoint('/tmp', $all_hds)) { - push @{$all_hds->{special}}, { device => 'none', mntpoint => '/tmp', fs_type => 'tmpfs' }; - } else { - @{$all_hds->{special}} = grep { $_->{mntpoint} ne '/tmp' } @{$all_hds->{special}}; - } + if (bootloader::main_method($prev_method) eq 'lilo' && + bootloader::main_method($b->{method}) eq 'grub') { + log::l("switching for lilo to grub, ensure we don't read lilo.conf anymore"); + renamef("$::prefix/etc/lilo.conf", "$::prefix/etc/lilo.conf.unused"); } 1; } sub setupBootloader__entries { - my ($in, $b, $_all_hds, $fstab) = @_; + my ($in, $b, $all_hds, $fstab) = @_; require Xconfig::resolution_and_depth; @@ -363,45 +487,43 @@ sub setupBootloader__entries { my $vga = Xconfig::resolution_and_depth::from_bios($e->{vga}); my ($append, $netprofile) = bootloader::get_append_netprofile($e); + my %hd_infos = map { $_->{device} => $_->{info} } fs::get::hds($all_hds); + my %root_descr = map { + my $info = delete $hd_infos{$_->{rootDevice}}; + my $dev = "/dev/$_->{device}"; + my $hint = $info || $_->{info} || $_->{device_LABEL}; + my $info_ = $hint ? "$dev ($hint)" : $dev; + ($dev => $info_, fs::wild_device::from_part('', $_) => $info_); + } @$fstab; + my @l; if ($e->{type} eq "image") { @l = ( { label => N("Image"), val => \$e->{kernel_or_dev}, list => [ map { "/boot/$_" } bootloader::installed_vmlinuz() ], not_edit => 0 }, -{ label => N("Root"), val => \$e->{root}, list => [ map { "/dev/$_->{device}" } @$fstab ], not_edit => !$::expert }, +{ label => N("Root"), val => \$e->{root}, list => [ map { fs::wild_device::from_part('', $_) } grep { !isSwap($_) } @$fstab ], format => sub { $root_descr{$_[0]} } }, { label => N("Append"), val => \$append }, - if_(arch() !~ /ppc|ia64/, + if_($e->{xen}, +{ label => N("Xen append"), val => \$e->{xen_append} } + ), + if_($b->{password}, { label => N("Requires password to boot"), val => \$e->{lock}, type => "bool" }), { label => N("Video mode"), val => \$vga, list => [ '', Xconfig::resolution_and_depth::bios_vga_modes() ], format => \&Xconfig::resolution_and_depth::to_string, advanced => 1 }, -), { label => N("Initrd"), val => \$e->{initrd}, list => [ map { if_(/^initrd/, "/boot/$_") } all("$::prefix/boot") ], not_edit => 0, advanced => 1 }, { label => N("Network profile"), val => \$netprofile, list => [ sort(uniq('', $netprofile, network::network::netprofile_list())) ], advanced => 1 }, ); } else { @l = ( -{ label => N("Root"), val => \$e->{kernel_or_dev}, list => [ map { "/dev/$_->{device}" } @$fstab, detect_devices::floppies() ], not_edit => !$::expert }, +{ label => N("Root"), val => \$e->{kernel_or_dev}, list => [ map { "/dev/$_->{device}" } @$fstab, detect_devices::floppies() ] }, ); } - if (arch() !~ /ppc/) { @l = ( { label => N("Label"), val => \$e->{label} }, @l, { text => N("Default"), val => \$default, type => 'bool' }, ); - } else { - unshift @l, { label => N("Label"), val => \$e->{label}, list => ['macos', 'macosx', 'darwin'] }; - if ($e->{type} eq "image") { - @l = ({ label => N("Label"), val => \$e->{label} }, - $::expert ? @l[1..4] : (@l[1..2], { label => N("Append"), val => \$append }), - if_($::expert, { label => N("Initrd-size"), val => \$e->{initrdsize}, list => [ '', '4096', '8192', '16384', '24576' ] }), - if_($::expert, $l[5]), - { label => N("NoVideo"), val => \$e->{novideo}, type => 'bool' }, - { text => N("Default"), val => \$default, type => 'bool' } - ); - } - } $in->ask_from_( { - interactive_help_id => arch() =~ /ppc/ ? 'setupYabootAddEntry' : 'setupBootloaderAddEntry', + interactive_help_id => 'setupBootloaderAddEntry', callbacks => { complete => sub { $e->{label} or $in->ask_warn('', N("Empty label not allowed")), return 1; @@ -411,9 +533,13 @@ sub setupBootloader__entries { } } }, \@l) or return; $b->{default} = $old_default || $default ? $default && $e->{label} : $b->{default}; - $e->{vga} = ref($vga) ? $vga->{bios} : $vga; + my $new_vga = ref($vga) ? $vga->{bios} : $vga; + if ($new_vga ne $e->{vga}) { + $e->{vga} = $new_vga; + $e->{initrd} and bootloader::add_boot_splash($e->{initrd}, $e->{vga}); + } bootloader::set_append_netprofile($e, $append, $netprofile); - bootloader::configure_entry($e); #- hack to make sure initrd file are built. + bootloader::configure_entry($b, $e); #- hack to make sure initrd file are built. 1; }; @@ -421,8 +547,7 @@ sub setupBootloader__entries { my @labels = map { $_->{label} } @{$b->{entries}}; my ($e, $prefix); if ($in->ask_from_list_('', N("Which type of entry do you want to add?"), - [ N_("Linux"), arch() =~ /sparc/ ? N_("Other OS (SunOS...)") : arch() =~ /ppc/ ? - N_("Other OS (MacOS...)") : N_("Other OS (Windows...)") ] + [ N_("Linux"), N_("Other OS (Windows...)") ] ) eq "Linux") { $e = { type => 'image', root => '/dev/' . fs::get::root($fstab)->{device}, #- assume a good default. @@ -430,7 +555,7 @@ sub setupBootloader__entries { $prefix = "linux"; } else { $e = { type => 'other' }; - $prefix = arch() =~ /sparc/ ? "sunos" : arch() =~ /ppc/ ? "macos" : "windows"; + $prefix = "windows"; } $e->{label} = $prefix; for (my $nb = 0; member($e->{label}, @labels); $nb++) { @@ -448,17 +573,37 @@ sub setupBootloader__entries { 1; }; + my $Up = sub { + my ($e) = @_; + my @entries = @{$b->{entries}}; + my ($index) = grep { $entries[$_]{label} eq $e->{label} } 0..$#entries; + if ($index > 0) { + ($b->{entries}[$index - 1], $b->{entries}[$index]) = ($b->{entries}[$index], $b->{entries}[$index - 1]); + } + 1; + }; + + my $Down = sub { + my ($e) = @_; + my @entries = @{$b->{entries}}; + my ($index) = grep { $entries[$_]{label} eq $e->{label} } 0..$#entries; + if ($index < $#entries) { + ($b->{entries}[$index + 1], $b->{entries}[$index]) = ($b->{entries}[$index], $b->{entries}[$index + 1]); + } + 1; + }; + my @prev_entries = @{$b->{entries}}; - if ($in->ask_from__add_modify_remove('', + if ($in->ask_from__add_modify_remove(N("Bootloader Configuration"), N("Here are the entries on your boot menu so far. You can create additional entries or change the existing ones."), [ { format => sub { my ($e) = @_; ref($e) ? - "$e->{label} ($e->{kernel_or_dev})" . ($b->{default} eq $e->{label} && " *") : + ($b->{default} eq $e->{label} ? " * " : " ") . "$e->{label} ($e->{kernel_or_dev})" : translate($e); }, list => $b->{entries}, - } ], Add => $Add, Modify => $Modify, Remove => $Remove)) { + } ], Add => $Add, Modify => $Modify, Remove => $Remove, Up => $Up, Down => $Down)) { 1; } else { @{$b->{entries}} = @prev_entries; @@ -466,49 +611,193 @@ You can create additional entries or change the existing ones."), [ { } } +sub setupBootloader__grub2 { + my ($in, $b, $_all_hds, $_fstab) = @_; + + # update entries (so that we can display their list below): + my $error; + run_program::rooted($::prefix, 'update-grub2', '2>', \$error) or die "update-grub2 failed: $error"; + + # read grub2 auto-generated entries (instead of keeping eg: grub/lilo ones): + my $b2 = bootloader::read_grub2(); + + # get default parameters: + my $append = $b->{default_append} || $b->{entries}[0]{append} || bootloader::get_grub2_append($b2); + my $default = $b2->{default}; + + require Xconfig::resolution_and_depth; + + require network::network; #- to list network profiles + my $vga = Xconfig::resolution_and_depth::from_bios($b->{vga}); + my $os_prober = $in->do_pkgs->is_installed('os-prober', '/usr/bin/os-prober'); + + my $res = $in->ask_from_( + { + title => N("Bootloader Configuration"), + interactive_help_id => 'setupBootloaderAddEntry', + }, + [ + { label => N("Default"), val => \$default, + list => [ map { $_->{label} } @{$b2->{entries}} ] }, + { label => N("Append"), val => \$append }, + { label => N("Video mode"), val => \$vga, list => [ '', Xconfig::resolution_and_depth::bios_vga_modes() ], + format => \&Xconfig::resolution_and_depth::to_string, advanced => 1 }, + { text => N("Do not touch ESP or MBR"), val => \$b->{no_esp_or_mbr}, type => 'bool', advanced => 1, + validate => sub { + $b->{no_esp_or_mbr} and $in->ask_warn(N("Warning"), + N("Not installing on ESP or MBR means that the installation is not bootable unless chain loaded from another OS!")); + 1; + }, + }, + { text => N("Probe Foreign OS"), val => \$os_prober, type => 'bool', + help => N("If grub2 takes too long to install, you can use this option to skip detecting other OSes and make it fast"), + }, + ]); + if ($res) { + $b->{entries} = $b2->{entries}; + $b->{default} = $default; + $b->{vga} = ref($vga) ? $vga->{bios} : $vga; + $b->{default_append} = $append; + if ($os_prober) { + $in->do_pkgs->ensure_is_installed('os-prober', '/usr/bin/os-prober'); + } else { + $in->do_pkgs->remove('os-prober'); + } + 1; + } else { + ''; + } +} + +sub adapt_desktop_for_plasma { + my ($desktop) = @_; + my %h = ( + 'Plasma' => '01plasma', + 'GNOMEClassic' => 'gnome-classic', + ); + return $desktop ? ($h{$desktop} || lc($desktop)) . '.desktop' : ''; +} + sub get_autologin() { my %desktop = getVarsFromSh("$::prefix/etc/sysconfig/desktop"); - my $desktop = $desktop{DESKTOP} || 'KDE'; - my $autologin = do { - if (($desktop{DISPLAYMANAGER} || $desktop) eq 'GNOME') { - my %conf = read_gnomekderc("$::prefix/etc/X11/gdm/gdm.conf", 'daemon'); - text2bool($conf{AutomaticLoginEnable}) && $conf{AutomaticLogin}; - } else { # KDM / MdkKDM - my %conf = read_gnomekderc("$::prefix/usr/share/config/kdm/kdmrc", 'X-:0-Core'); - text2bool($conf{AutoLoginEnable}) && $conf{AutoLoginUser}; - } - }; - { autologin => $autologin, desktop => $desktop }; + my $gdm_file = "$::prefix/etc/X11/gdm/custom.conf"; + my $sddm_file = "$::prefix/etc/sddm.conf"; + my $lightdm_conffile = "$::prefix/etc/lightdm/lightdm.conf.d/50-mageia-autologin.conf"; + my $lxdm_conffile = "$::prefix/etc/lxdm/lxdm.conf"; + my $autologin_file = "$::prefix/etc/sysconfig/autologin"; + my $desktop = $desktop{DESKTOP} || first(sessions()); + my %desktop_to_dm = ( + GNOME => 'gdm', + PLASMA => 'sddm', + xfce4 => 'lightdm', + LXDE => 'lxdm', + ); + my %dm_canonical = ( + gnome => 'gdm', + plasma => 'sddm', + ); + my $dm = + lc($desktop{DISPLAYMANAGER}) || + $desktop_to_dm{$desktop} || + basename(chomp_(run_program::rooted_get_stdout($::prefix, "/etc/X11/lookupdm"))); + $dm = $dm_canonical{$dm} if exists $dm_canonical{$dm}; + + my $autologin_user; + if ($dm eq "gdm") { + my %conf = read_gnomekderc($gdm_file, 'daemon'); + $autologin_user = text2bool($conf{AutomaticLoginEnable}) && $conf{AutomaticLogin}; + } elsif ($dm eq "sddm") { + my %conf = read_gnomekderc($sddm_file, 'Autologin'); + $autologin_user = $conf{User}; + } elsif ($dm eq "lightdm") { + my %conf = read_gnomekderc($lightdm_conffile, 'Seat:*'); + $autologin_user = text2bool($conf{'#dummy-autologin'}) && $conf{"autologin-user"}; + } elsif ($dm eq "lxdm") { + my %conf = read_gnomekderc($lxdm_conffile, 'base'); + $autologin_user = $conf{autologin}; + $autologin_user =~ s/^.//; + } else { + my %conf = getVarsFromSh($autologin_file); + $autologin_user = text2bool($conf{AUTOLOGIN}) && $conf{USER}; + } + + { user => $autologin_user, desktop => $desktop, dm => $dm }; +} + +sub is_standalone_autologin_needed { + my ($dm) = @_; + return member($dm, qw(slim xdm)); } sub set_autologin { - my ($o_user, $o_wm) = @_; - log::l("set_autologin $o_user $o_wm"); - my $autologin = bool2text($o_user); + my ($do_pkgs, $autologin, $o_auto) = @_; + log::l("set_autologin $autologin->{user} $autologin->{desktop}"); + my $do_autologin = bool2text($autologin->{user}); + + $autologin->{dm} ||= 'xdm'; + $do_pkgs->ensure_is_installed($autologin->{dm}, undef, $o_auto) + or return; + if ($autologin->{user} && is_standalone_autologin_needed($autologin->{dm})) { + $do_pkgs->ensure_is_installed('autologin', '/usr/bin/startx.autologin', $o_auto) + or return; + } - #- Configure KDM / MDKKDM - eval { update_gnomekderc("$::prefix/usr/share/config/kdm/kdmrc", 'X-:0-Core' => ( - AutoLoginEnable => $autologin, - AutoLoginUser => $o_user, - )) }; + #- Configure SDDM + my $sddm_conffile = "$::prefix/etc/sddm.conf"; + eval { common::update_gnomekderc_no_create($sddm_conffile, 'Autologin' => ( + Session => adapt_desktop_for_plasma($autologin->{desktop}), + User => $autologin->{user}, + )) } if -e $sddm_conffile; #- Configure GDM - eval { update_gnomekderc("$::prefix/etc/X11/gdm/gdm.conf", daemon => ( - AutomaticLoginEnable => $autologin, - AutomaticLogin => $o_user, - )) }; - + my $gdm_conffile = "$::prefix/etc/X11/gdm/custom.conf"; + eval { update_gnomekderc($gdm_conffile, daemon => ( + AutomaticLoginEnable => $do_autologin, + AutomaticLogin => $autologin->{user}, + )) } if -e $gdm_conffile; + + #- Configure LIGHTDM + my $lightdm_conffile = "$::prefix/etc/lightdm/lightdm.conf.d/50-mageia-autologin.conf"; + eval { update_gnomekderc($lightdm_conffile, 'Seat:*' => ( + '#dummy-autologin' => $do_autologin, + 'autologin-user' => $autologin->{user} + )) } if -e $lightdm_conffile; + + #- Configure LXDM + my $lxdm_conffile = "$::prefix/etc/lxdm/lxdm.conf"; + eval { update_gnomekderc($lxdm_conffile, 'base' => ( + 'autologin' => $autologin->{user} ? '@' . $autologin->{user} : '' + )); + if ($autologin->{user} && $autologin->{desktop} && !member($autologin->{desktop}, qw(default failsafe))) { + my $xsession_file = find { + my %xsession = read_gnomekderc($_, 'Desktop Entry'); + $xsession{Name} eq $autologin->{desktop}; + } glob("$::prefix/usr/share/xsessions/*.desktop"); + $xsession_file =~ s!\.[^.]+$!!; + $xsession_file =~ s!.*/!!; + $xsession_file ||= $autologin->{desktop}; + update_gnomekderc($lxdm_conffile, $autologin->{user} => ( + 'user' => $autologin->{user}, + 'session' => $xsession_file, + )) } } if -e $lxdm_conffile; + my $xdm_autologin_cfg = "$::prefix/etc/sysconfig/autologin"; - if (member($o_wm, 'KDE', 'GNOME')) { - unlink $xdm_autologin_cfg; - } else { + if (is_standalone_autologin_needed($autologin->{dm})) { setVarsInShMode($xdm_autologin_cfg, 0644, - { USER => $o_user, AUTOLOGIN => bool2yesno($o_user), EXEC => '/usr/X11R6/bin/startx.autologin' }); + { USER => $autologin->{user}, AUTOLOGIN => bool2yesno($autologin->{user}), EXEC => '/usr/bin/startx.autologin' }); + } else { + unlink $xdm_autologin_cfg; } - if ($o_user) { - my $home = (getpwnam($o_user))[7]; - set_window_manager($home, $o_wm); + my $sys_conffile = "$::prefix/etc/sysconfig/desktop"; + my %desktop = getVarsFromSh($sys_conffile); + $desktop{DESKTOP} = $autologin->{desktop}; + $desktop{DISPLAYMANAGER} = $autologin->{dm}; + setVarsInSh($sys_conffile, \%desktop); + + if ($autologin->{user}) { + my $home = (getpwnam($autologin->{user}))[7]; + set_window_manager($home, $autologin->{desktop}); } } sub set_window_manager { @@ -521,6 +810,7 @@ sub set_window_manager { update_gnomekderc("$p_home/.dmrc", 'Desktop', Session => "$wm_number$wm"); my $user = find { $home eq $_->[7] } list_passwd(); chown($user->[2], $user->[3], "$p_home/.dmrc"); + chmod(0644, "$p_home/.dmrc"); #- for startx/autologin { @@ -540,7 +830,7 @@ sub rotate_log { } sub rotate_logs { my ($prefix) = @_; - rotate_log("$prefix/root/drakx/$_") foreach qw(ddebug.log install.log); + rotate_log("$prefix/root/drakx/$_") foreach qw(stage1.log ddebug.log install.log updates.log); } sub writeandclean_ldsoconf { @@ -549,7 +839,7 @@ sub writeandclean_ldsoconf { my @l = chomp_(cat_($file)); my @default = ('/lib', '/usr/lib'); #- no need to have /lib and /usr/lib in ld.so.conf - my @suggest = ('/usr/X11R6/lib', '/usr/lib/qt3/lib'); #- needed for upgrade where package renaming can cause this to disappear + my @suggest = ('/usr/lib/qt3/lib'); #- needed for upgrade where package renaming can cause this to disappear if (arch() =~ /x86_64/) { @default = map { $_, $_ . '64' } @default; @@ -592,10 +882,28 @@ sub inspect { $h; } -sub ask_user_one { - my ($in, $users, $security, $u, %options) = @_; +sub ask_user { + my ($in, $users, $security, %options) = @_; + + ask_user_and_root($in, undef, $users, $security, %options); +} + +sub is_xguest_installed() { + -e "$::prefix/etc/security/namespace.d/xguest.conf"; +} + +sub ask_user_and_root { + my ($in, $superuser, $users, $security, %options) = @_; + + my $xguest = is_xguest_installed(); + + $options{needauser} ||= $security >= 3; my @icons = facesnames(); + my @suggested_names = $::isInstall ? do { + my @l = grep { !/^\./ && $_ ne 'lost+found' && -d "$::prefix/home/$_" } all("$::prefix/home"); + grep { ! defined getpwnam($_) } @l; + } : (); my %high_security_groups = ( xgrp => N("access to X programs"), @@ -606,95 +914,162 @@ sub ask_user_one { ctools => N("access to compilation tools"), ); + my $u = {}; $u->{password2} ||= $u->{password} ||= ''; $u->{shell} ||= '/bin/bash'; my $names = @$users ? N("(already added %s)", join(", ", map { $_->{realname} || $_->{name} } @$users)) : ''; my %groups; - my $verif = sub { - $u->{password} eq $u->{password2} or $in->ask_warn('', [ N("The passwords do not match"), N("Please try again") ]), return 1,2; - $security > 3 && length($u->{password}) < 6 and $in->ask_warn('', N("This password is too simple")), return 1,2; - $u->{name} or $in->ask_warn('', N("Please give a user name")), return 1,0; - $u->{name} =~ /^[a-z]+?[a-z0-9_-]*?$/ or $in->ask_warn('', N("The user name must contain only lower cased letters, numbers, `-' and `_'")), return 1,0; - length($u->{name}) <= 32 or $in->ask_warn('', N("The user name is too long")), return 1,0; - member($u->{name}, 'root', map { $_->{name} } @$users) and $in->ask_warn('', N("This user name has already been added")), return 1,0; - foreach ([ $u->{uid}, N("User ID") ], - [ $u->{gid}, N("Group ID") ]) { - my ($id, $name) = @$_; - $id or next; - $id =~ /^\d+$/ or $in->ask_warn('', N("%s must be a number", $name)), return 1; - $id >= 500 or $in->ask_yesorno('', N("%s should be above 500. Accept anyway?", $name)) or return 1; - } - return 0; + + require authentication; + my $validate_name = sub { + $u->{name} or $in->ask_warn('', N("Please give a user name")), return; + $u->{name} =~ /^[a-z]+[a-z0-9_-]*$/ or $in->ask_warn('', N("The user name must start with a lower case letter followed by only lower cased letters, numbers, `-' and `_'")), return; + length($u->{name}) <= 32 or $in->ask_warn('', N("The user name is too long")), return; + defined getpwnam($u->{name}) || member($u->{name}, map { $_->{name} } @$users) and $in->ask_warn('', N("This user name has already been added")), return; + 'ok'; + }; + my $validate_uid_gid = sub { + my ($field) = @_; + my $id = $u->{$field} or return 'ok'; + my $name = $field eq 'uid' ? N("User ID") : N("Group ID"); + $id =~ /^\d+$/ or $in->ask_warn('', N("%s must be a number", $name)), return; + $id >= 1000 or $in->ask_yesorno('', N("%s should be above 1000. Accept anyway?", $name)) or return; + 'ok'; }; my $ret = $in->ask_from_( - { title => N("Add user"), - icon => 'banner-adduser', - messages => N("Enter a user\n%s", $options{additional_msg} || $names), + { title => N("User management"), interactive_help_id => 'addUser', - focus_first => 1, - if_(!$::isInstall, ok => N("Done")), - cancel => $options{noaccept} ? '' : N("Accept user"), - callbacks => { - focus_out => sub { - if ($_[0] eq '0') { - $u->{name} ||= lc first($u->{realname} =~ /([a-zA-Z0-9_-]+)/); - } - }, - complete => sub { $u->{name} ? &$verif : 0 }, - canceled => $verif, - ok_disabled => sub { $security >= 4 && !@$users || $options{needauser} && !$u->{name} }, - } }, [ - { label => N("Real name"), val => \$u->{realname} }, - { label => N("Login name"), val => \$u->{name} }, - { label => N("Password"),val => \$u->{password}, hidden => 1 }, - { label => N("Password (again)"), val => \$u->{password2}, hidden => 1 }, - { label => N("Shell"), val => \$u->{shell}, list => [ shells() ], not_edit => !$::expert, advanced => 1 }, - { label => N("User ID"), val => \$u->{uid}, advanced => 1 }, - { label => N("Group ID"), val => \$u->{gid}, advanced => 1 }, - if_($security <= 3 && !$options{noicons} && @icons, - { label => N("Icon"), val => \ ($u->{icon} ||= 'default'), list => \@icons, icon2f => \&face2png, format => \&translate }, - ), - if_($security > 3, + if_($::isInstall && $superuser, cancel => ''), + }, [ + $superuser ? ( + if_(0, + { text => N("Enable guest account"), val => \$xguest, type => 'bool', advanced => 1 }, + ), + { label => N("Set administrator (root) password"), title => 1 }, + { label => N("Password"), val => \$superuser->{password}, hidden => 1, alignment => 'right', weakness_check => 1, + focus => sub { 1 }, + validate => sub { authentication::check_given_password($in, $superuser, 2 * $security) } }, + { label => N("Password (again)"), val => \$superuser->{password2}, hidden => 1, alignment => 'right' }, + ) : (), + { label => N("Enter a user"), title => 1 }, if_($names, { label => $names }), + if_($security <= 3 && !$options{noicons} && @icons, + { label => N("Icon"), val => \ ($u->{icon} ||= 'default'), list => \@icons, icon2f => \&face2png, + alignment => 'right', format => \&translate }, + ), + { label => N("Real name"), val => \$u->{realname}, alignment => 'right', focus_out => sub { + $u->{name} ||= lc(Locale::gettext::iconv($u->{realname}, "utf-8", "ascii//TRANSLIT")); + $u->{name} =~ s/[^a-zA-Z0-9_-]//g; # drop any character that would break login program + }, + focus => sub { !$superuser }, + }, + + { label => N("Login name"), val => \$u->{name}, list => \@suggested_names, alignment => 'right', + not_edit => 0, validate => $validate_name }, + { label => N("Password"),val => \$u->{password}, hidden => 1, alignment => 'right', weakness_check => 1, + validate => sub { authentication::check_given_password($in, $u, $security > 3 ? 6 : 0) } }, + { label => N("Password (again)"), val => \$u->{password2}, hidden => 1, alignment => 'right' }, + { label => N("Shell"), val => \$u->{shell}, list => [ shells() ], advanced => 1 }, + { label => N("User ID"), val => \$u->{uid}, advanced => 1, validate => sub { $validate_uid_gid->('uid') } }, + { label => N("Group ID"), val => \$u->{gid}, advanced => 1, validate => sub { $validate_uid_gid->('gid') } }, + if_($security >= 1, + { label => N("Extra Groups:"), advanced => 1, title => 1 }, map { - { label => $_, val => \$groups{$_}, text => $high_security_groups{$_}, type => 'bool' }; + { label => $_, val => \$groups{$_}, text => $high_security_groups{$_}, type => 'bool', advanced => 1 }; } keys %high_security_groups, ), - ], - ); - $u->{groups} = [ grep { $groups{$_} } keys %groups ]; + ], + ); - push @$users, $u if $u->{name}; + if ($xguest && !is_xguest_installed()) { + $in->do_pkgs->ensure_is_installed('xguest', '/etc/security/namespace.d/xguest.conf'); + } elsif (!$xguest && is_xguest_installed()) { + $in->do_pkgs->remove('xguest') or return; + } - return $ret; -} + $u->{groups} = [ grep { $groups{$_} } keys %groups ]; -sub ask_users { - my ($in, $users, $security, $suggested_names) = @_; + push @$users, $u if $u->{name}; - while (1) { - my $u = {}; - $u->{name} = shift @$suggested_names; - ask_user_one($in, $users, $security, $u) and return; - } + $ret && $u; } sub sessions() { - split(' ', run_program::rooted_get_stdout($::prefix, '/usr/sbin/chksession', '-l')); + my $old = chdir('$::prefix/usr/share/xsessions/'); + my @l = map { s/.desktop$//; $_ } glob("*.desktop"); + chdir($old); + @l; } sub sessions_with_order() { my %h = map { /(.*)=(.*)/ } split(' ', run_program::rooted_get_stdout($::prefix, '/usr/sbin/chksession', '-L')); \%h; } +sub urpmi_add_all_media { + my ($in, $o_previous_release) = @_; + + my $binary = find { whereis_binary($_, $::prefix) } if_(check_for_xserver(), 'gurpmi.addmedia'), 'urpmi.addmedia'; + if (!$binary) { + log::l("urpmi.addmedia not found!"); + return; + } + + #- configure urpmi media if network is up + require network::tools; + if (!network::tools::has_network_connection()) { + log::l("no network connexion!"); + return; + } + my $wait; + my @options = ('--distrib', '--mirrorlist', '$MIRRORLIST'); + if ($binary eq 'urpmi.addmedia') { + $wait = $in->wait_message(N("Please wait"), N("Please wait, adding media...")); + } elsif ($in->isa('interactive::gtk')) { + push @options, '--silent-success'; + mygtk3::flush(); + } + + my $reason = join(',', $o_previous_release ? + ('reason=upgrade', 'upgrade_by=drakx', "upgrade_from=$o_previous_release->{version}") : + 'reason=install'); + log::l("URPMI_ADDMEDIA_REASON $reason"); + local $ENV{URPMI_ADDMEDIA_REASON} = $reason; + + my $log_file = '/root/drakx/updates.log'; + my $val = run_program::rooted($::prefix, $binary, '>>', $log_file, '2>>', $log_file, @options); + + undef $wait; + $val; +} + +sub format_wm { + my ($wm) = @_; + return { + cinnamon => 'Cinnamon', + enlightenment => 'Enlightenment', + 'gnome-classic' => 'Gnome Classic', + gnome => 'Gnome', + i3 => 'I3', + 'i3-with-shmlog' => 'I3 with shmlog', + lxqt => 'LxQt', + mate => 'Mate', + openbox => 'OpenBox', + 'plasma-mediacenter' => 'Plasma Mediacenter', + '01plasma' => 'Plasma', + sugar => 'Sugar', + xfce => 'XFCE', + }->{$wm}; +} + sub autologin { my ($o, $in) = @_; my @wm = sessions(); my @users = map { $_->{name} } @{$o->{users} || []}; - if (member('KDE', @wm) && @users == 1 && $o->{meta_class} eq 'desktop') { - $o->{desktop} = 'KDE'; + my $kde_desktop = find { member($_, 'KDE', 'KDE4') } @wm; + if ($kde_desktop && @users == 1 && $o->{meta_class} eq 'desktop') { + $o->{desktop} = $kde_desktop; $o->{autologin} = $users[0]; } elsif (@wm > 1 && @users && !$o->{authentication}{NIS} && $o->{security} <= 2) { my $use_autologin = @users == 1; @@ -704,7 +1079,7 @@ sub autologin { messages => N("I can set up your computer to automatically log on one user.") }, [ { text => N("Use this feature"), val => \$use_autologin, type => 'bool' }, { label => N("Choose the default user:"), val => \$o->{autologin}, list => \@users, disabled => sub { !$use_autologin } }, - { label => N("Choose the window manager to run:"), val => \$o->{desktop}, list => \@wm, disabled => sub { !$use_autologin } } ] + { label => N("Choose the window manager to run:"), val => \$o->{desktop}, list => \@wm, disabled => sub { !$use_autologin }, format => \&format_wm } ] ); delete $o->{autologin} if !$use_autologin; } else { @@ -712,13 +1087,116 @@ sub autologin { } } +sub display_release_notes { + my ($in, $release_notes) = @_; + if (!$in->isa('interactive::gtk')) { + $in->ask_from_({ title => N("Release Notes"), + messages => $release_notes, + }, [ {} ]); + return; + } + + require Gtk3::WebKit2; + Gtk3::WebKit2->import; + require ugtk3; + ugtk3->import(':all'); + require mygtk3; + mygtk3->import('gtknew'); + my $view = gtknew('WebKit2_WebView', no_popup_menu => 1); + $view->load_html($release_notes, '/'); + + my $w = ugtk3->new(N("Release Notes"), transient => $::main_window, modal => 1, pop_it => 1); + gtkadd($w->{rwindow}, + gtkpack_(Gtk3::VBox->new, + 1, create_scrolled_window(ugtk3::gtkset_border_width($view, 5), + [ 'never', 'automatic' ], + ), + 0, gtkpack(create_hbox('end'), + gtknew('Button', text => N("Close"), + clicked => sub { Gtk3->main_quit }) + ), + ), + ); + mygtk3::set_main_window_size($w->{rwindow}); + $w->{real_window}->grab_focus; + $w->{real_window}->show_all; + $w->main; + return; +} + +sub get_release_notes { + my ($in) = @_; + my $ext = $in->isa('interactive::gtk') ? '.html' : '.txt'; + my $separator = $in->isa('interactive::gtk') ? "\n\n" : ''; + + my $release_notes = join($separator, grep { $_ } map { + if ($::isInstall) { + my $f = install::any::getFile_($::o->{stage2_phys_medium}, $_); + $f && cat__($f); + } else { + my $file = $_; + my $d = find { -e "$_/$file" } glob_("/usr/share/doc/*-release-*"); + $d && cat_("$d/$file"); + } + } "release-notes$ext", 'release-notes.' . $ext); + + # we do not handle links: + $release_notes =~ s!<a href=".*?">(.*?)</a>!$1!g; + $release_notes; +} + +sub run_display_release_notes { + my ($release_notes) = @_; + output('/tmp/release_notes.html', $release_notes); + local $ENV{LC_ALL} = $::o->{locale}{lang} || 'C'; + run_program::raw({ detach => 1 }, '/usr/bin/display_release_notes.pl'); +} + +sub acceptLicense { + my ($in) = @_; + require messages; + + my $release_notes = get_release_notes($in); + + my $r = $::testing ? 'Accept' : 'Refuse'; + + $in->ask_from_({ title => N("License agreement"), + focus_first => 1, + cancel => N("Quit"), + messages => formatAlaTeX(messages::main_license()), + interactive_help_id => 'acceptLicense', + callbacks => { ok_disabled => sub { $r eq 'Refuse' } }, + }, + + [ + { label => N("Do you accept this license ?"), title => 1, alignment => 'right' }, + { list => [ N_("Accept"), N_("Refuse") ], val => \$r, type => 'list', alignment => 'right', + format => sub { translate($_[0]) } }, + if_($release_notes, + { clicked => sub { run_display_release_notes($release_notes) }, do_not_expand => 1, + val => \ (my $_t1 = N("Release Notes")), install_button => 1, no_indent => 1 } + ), + ]) + or reboot(); +} + +sub reboot() { + if ($::isInstall) { + my $o = $::o; + install::media::umount_phys_medium($o->{stage2_phys_medium}); + install::media::openCdromTray($o->{stage2_phys_medium}{device}) if !detect_devices::is_xbox() && $o->{method} eq 'cdrom'; + $o->exit; + } else { + # when refusing license in finish-install: + exec("/bin/reboot"); + } +} sub selectLanguage_install { my ($in, $locale) = @_; - my $common = { messages => N("Please choose a language to use."), - title => N("Language choice"), - icon => 'banner-languages.png', + my $common = { + title => N("Please choose a language to use"), interactive_help_id => 'selectLanguage' }; my $lang = $locale->{lang}; @@ -743,28 +1221,23 @@ sub selectLanguage_install { $lang = first($add_location->($lang)); } - my $last_utf8 = $locale->{utf8}; + my $non_utf8 = 0; add2hash($common, { cancel => '', - advanced_messages => formatAlaTeX(N("Mandriva Linux can support multiple languages. Select + focus_first => 1, + advanced_messages => formatAlaTeX(N("%s can support multiple languages. Select the languages you would like to install. They will be available -when your installation is complete and you restart your system.")), - advanced_label => N("Multi languages"), - callbacks => { advanced => sub { $langs->{$listval2val->($lang)} = 1 }, - changed => sub { - if ($last_utf8 == $locale->{utf8}) { - $last_utf8 = $locale->{utf8} = lang::utf8_should_be_needed({ lang => $listval2val->($lang), langs => $langs }); - } else { - $last_utf8 = -1; #- disable auto utf8 once touched - } - } } }); +when your installation is complete and you restart your system.", N("Mageia"))), + advanced_label => N("Multiple languages"), + advanced_title => N("Select Additional Languages"), + }); $in->ask_from_($common, [ { val => \$lang, separator => '|', if_($using_images, image2f => sub { $name2l{$_[0]} =~ /^[a-z]/ && "langs/lang-$name2l{$_[0]}" }), format => sub { $_[0] =~ /(.*\|)(.*)/ ? $1 . lang::l2name($2) : lang::l2name($_[0]) }, - list => \@langs, sort => 0 }, - if_(!$::move, - { val => \$locale->{utf8}, type => 'bool', text => N("Use Unicode by default"), advanced => 1 }, + list => \@langs, sort => !$in->isa('interactive::gtk'), + focus_out => sub { $langs->{$listval2val->($lang)} = 1 } }, + { val => \$non_utf8, type => 'bool', text => N("Old compatibility (non UTF-8) encoding"), advanced => 1 }, { val => \$langs->{all}, type => 'bool', text => N("All languages"), advanced => 1 }, map { { val => \$langs->{$_->[0]}, type => 'bool', disabled => sub { $langs->{all} }, @@ -772,29 +1245,35 @@ when your installation is complete and you restart your system.")), image => "langs/lang-$_->[0]", }; } sort { $a->[1] cmp $b->[1] } map { [ $_, $sort_func->($_) ] } lang::list_langs(), - ), ]) or return; + $locale->{utf8} = !$non_utf8; %$langs = grep_each { $::b } %$langs; #- clean hash $langs->{$listval2val->($lang)} = 1; #- convert to the default locale for asked language $locale->{lang} = $listval2val->($lang); + lang::lang_changed($locale); } sub selectLanguage_standalone { my ($in, $locale) = @_; - my $common = { messages => N("Please choose a language to use."), + my $old_lang = $locale->{lang}; + my $common = { messages => N("Please choose a language to use"), title => N("Language choice"), interactive_help_id => 'selectLanguage' }; my @langs = sort { lang::l2name($a) cmp lang::l2name($b) } lang::list_langs(exclude_non_installed => 1); - die 'one lang only' if @langs == 1; + my $non_utf8 = !$locale->{utf8}; $in->ask_from_($common, [ { val => \$locale->{lang}, type => 'list', - format => sub { lang::l2name($_[0]) }, list => \@langs }, - { val => \$locale->{utf8}, type => 'bool', text => N("Use Unicode by default"), advanced => 1 }, + format => sub { lang::l2name($_[0]) }, list => \@langs, allow_empty_list => 1 }, + { val => \$non_utf8, type => 'bool', text => N("Old compatibility (non UTF-8) encoding"), advanced => 1 }, ]); + $locale->{utf8} = !$non_utf8; + lang::set($locale); + c::init_setlocale() if $in->isa('interactive::gtk'); + lang::lang_changed($locale) if $old_lang ne $locale->{lang}; } sub selectLanguage_and_more_standalone { @@ -804,16 +1283,12 @@ sub selectLanguage_and_more_standalone { language: # keep around previous settings so that selectLanguage can keep UTF-8 flag: local $::Wizard_no_previous = 1; - my $old_lang = $locale->{lang}; selectLanguage_standalone($in, $locale); - $locale->{IM} = lang::get_default_im($locale->{lang}) if $old_lang ne $locale->{lang}; undef $::Wizard_no_previous; selectCountry($in, $locale) or goto language; }; if ($@) { - if ($@ =~ /^one lang only/) { - selectCountry($in, $locale) or $in->exit(0); - } elsif ($@ !~ /wizcancel/) { + if ($@ !~ /wizcancel/) { die; } else { $in->exit(0); @@ -825,34 +1300,33 @@ sub selectCountry { my ($in, $locale) = @_; my $country = $locale->{country}; - my @countries = lang::list_countries(exclude_non_installed => !$::isInstall); - my @best = uniq map { - my $h = lang::analyse_locale_name($_); - if_($h->{main} eq lang::locale_to_main_locale($locale->{lang}) && $h->{country}, - $h->{country}); - } @lang::locales; + my $country2locales = lang::countries_to_locales(exclude_non_installed => !$::isInstall); + my @countries = keys %$country2locales; + my @best = grep { + find { + $_->{main} eq lang::locale_to_main_locale($locale->{lang}); + } @{$country2locales->{$_}}; + } @countries; @best == 1 and @best = (); - my ($other, $ext_country); - member($country, @best) or ($ext_country, $country) = ($country, $ext_country); + my $other = !member($country, @best); + my $ext_country = $country; + $other and @best = (); $in->ask_from_( { title => N("Country / Region"), - icon => 'banner-languages', - messages => N("Please choose your country."), - interactive_help_id => 'selectCountry', + messages => N("Please choose your country"), + interactive_help_id => 'selectCountry.html', if_(@best, advanced_messages => N("Here is the full list of available countries")), advanced_label => @best ? N("Other Countries") : N("Advanced"), - advanced_state => $ext_country && scalar(@best), - callbacks => { changed => sub { $_[0] != 2 and $other = $_[0] == 1 } }, }, [ if_(@best, { val => \$country, type => 'list', format => \&lang::c2name, - list => \@best, sort => 1 }), + list => \@best, sort => 1, changed => sub { $other = 0 } }), { val => \$ext_country, type => 'list', format => \&lang::c2name, - list => [ @countries ], advanced => scalar(@best) }, + list => [ @countries ], advanced => scalar(@best), changed => sub { $other = 1 } }, { val => \$locale->{IM}, type => 'combo', label => N("Input method:"), sort => 0, separator => '|', - list => [ '', sort(lang::get_ims()) ], + list => [ '', lang::get_ims($locale->{lang}) ], format => sub { $_[0] ? uc($_[0] =~ /(.*)\+(.*)/ ? "$1|$1+$2" : $_[0]) : N("None") }, advanced => !$locale->{IM}, }, @@ -864,89 +1338,65 @@ sub selectCountry { sub set_login_serial_console { my ($port, $speed) = @_; - my $line = "s$port:12345:respawn:/sbin/getty ttyS$port DT$speed ansi\n"; + my $line = "s$port:12345:respawn:/sbin/agetty ttyS$port $speed ansi\n"; substInFile { s/^s$port:.*//; $_ = $line if eof } "$::prefix/etc/inittab"; } -sub report_bug { - my (@other) = @_; - - sub header { " +sub header { " ******************************************************************************** * $_[0] ********************************************************************************"; - } +} + +sub fdisk() { + my @devs = grep { !m!^/dev/(loop|ram)\d+! && !/\d$/ } map { "/dev/$_->{dev}" } fs::proc_partitions::read_raw(); + `fdisk -l @devs`; + +} + +sub report_bug { + my (@other) = @_; join '', map { chomp; "$_\n" } header("lspci"), detect_devices::stringlist(), + header("hid_devices"), (map { sprintf("%-16s: %s", $_->{driver} || "unknown", $_->{description}) } c::hid_probe()), + header("input devices"), cat_("/proc/bus/input/devices"), header("pci_devices"), cat_("/proc/bus/pci/devices"), - header("dmidecode"), `dmidecode`, - header("fdisk"), arch() =~ /ppc/ ? `pdisk -l` : `fdisk -l`, + header("dmidecode"), arch() =~ /86/ ? `dmidecode` : (), + header("fdisk"), fdisk(), header("scsi"), cat_("/proc/scsi/scsi"), - header("/sys/bus/scsi/devices"), `ls -l /sys/bus/scsi/devices`, + header("/sys/bus/scsi/devices"), -d '/sys/bus/scsi/devices' ? `ls -l /sys/bus/scsi/devices` : (), header("lsmod"), cat_("/proc/modules"), header("cmdline"), cat_("/proc/cmdline"), header("pcmcia: stab"), cat_("$::prefix/var/lib/pcmcia/stab") || cat_("$::prefix/var/run/stab"), - header("usb"), cat_("/proc/bus/usb/devices"), + header("usb"), cat_("/sys/kernel/debug/usb/devices"), header("partitions"), cat_("/proc/partitions"), header("cpuinfo"), cat_("/proc/cpuinfo"), header("syslog"), cat_("/tmp/syslog") || cat_("$::prefix/var/log/syslog"), + header("Xorg.log"), cat_("/var/log/Xorg.0.log"), header("monitor_full_edid"), monitor_full_edid(), header("stage1.log"), cat_("/tmp/stage1.log") || cat_("$::prefix/root/drakx/stage1.log"), header("ddebug.log"), cat_("/tmp/ddebug.log") || cat_("$::prefix/root/drakx/ddebug.log"), header("install.log"), cat_("$::prefix/root/drakx/install.log"), header("fstab"), cat_("$::prefix/etc/fstab"), - header("modules.conf"), cat_("$::prefix/etc/modules.conf"), + header("modprobe.conf"), cat_("$::prefix/etc/modprobe.conf"), header("lilo.conf"), cat_("$::prefix/etc/lilo.conf"), - header("menu.lst"), cat_("$::prefix/boot/grub/menu.lst"), - header("XF86Config"), cat_("$::prefix/etc/X11/XF86Config"), - header("/etc/modules"), cat_("$::prefix/etc/modules"), + header("grub: menu.lst"), join('', map { s/^(\s*password)\s+(.*)/$1 xxx/; $_ } cat_("$::prefix/boot/grub/menu.lst")), + header("grub: install.sh"), cat_("$::prefix/boot/grub/install.sh"), + header("grub: device.map"), cat_("$::prefix/boot/grub/device.map"), + header("grub2: grub"), cat_("$::prefix/etc/default/grub"), + header("grub2: grub.cfg"), join('', map { s/^(\s*password_pbkdf2)\s+grub.pbkdf2.*/$1 xxx/; $_ } cat_("$::prefix/boot/grub2/grub.cfg")), + header("grub2: install.sh"), cat_("$::prefix/boot/grub2/install.sh"), + header("xorg.conf"), cat_("$::prefix/etc/X11/xorg.conf"), + header("urpmi.cfg"), cat_("$::prefix/etc/urpmi/urpmi.cfg"), + header("modprobe.preload"), cat_("$::prefix/etc/modprobe.preload"), header("sysconfig/i18n"), cat_("$::prefix/etc/sysconfig/i18n"), + header("locale.conf"), cat_("$::prefix/etc/locale.conf"), + header("/proc/iomem"), cat_("/proc/iomem"), + header("/proc/ioport"), cat_("/proc/ioports"), map_index { even($::i) ? header($_) : $_ } @other; } -sub devfssymlinkf { - my ($if_struct, $of) = @_; - my $if = $if_struct->{device}; - - my $devfs_if = $if_struct->{devfs_device}; - $devfs_if ||= devices::to_devfs($if); - $devfs_if ||= $if; - - #- example: $of is mouse, $if is usbmouse, $devfs_if is input/mouse0 - - output_p("$::prefix/etc/devfs/conf.d/$of.conf", -"REGISTER ^$devfs_if\$ CFUNCTION GLOBAL mksymlink $devfs_if $of -UNREGISTER ^$devfs_if\$ CFUNCTION GLOBAL unlink $of -"); - - output_p("$::prefix/etc/devfs/conf.d/$if.conf", -"REGISTER ^$devfs_if\$ CFUNCTION GLOBAL mksymlink $devfs_if $if -UNREGISTER ^$devfs_if\$ CFUNCTION GLOBAL unlink $if -") if $devfs_if ne $if && $if !~ /^hd[a-z]/ && $if !~ /^sr/ && $if !~ /^sd[a-z]/; - - #- add a specific udev script, we can't do it with a udev rule, - #- eg, ttySL0 is a symlink - output_with_perm("$::prefix/etc/udev/conf.d/$of.conf", 0755, "ln -sf $if /dev/$of\n") - if $of !~ /dvd|mouse/; - - #- when creating a symlink on the system, use devfs name if devfs is mounted - symlinkf($devfs_if, "$::prefix/dev/$if") if $devfs_if ne $if && detect_devices::dev_is_devfs(); - symlinkf($if, "$::prefix/dev/$of"); -} -sub devfs_rawdevice { - my ($if_struct, $of) = @_; - - my $devfs_if = $if_struct->{devfs_device}; - $devfs_if ||= devices::to_devfs($if_struct->{device}); - $devfs_if ||= $if_struct->{device}; - - output_p("$::prefix/etc/devfs/conf.d/$of.conf", -"REGISTER ^$devfs_if\$ EXECUTE /etc/dynamic/scripts/rawdevice.script add /dev/$devfs_if /dev/$of -UNREGISTER ^$devfs_if\$ EXECUTE /etc/dynamic/scripts/rawdevice.script del /dev/$of -"); -} - sub fix_broken_alternatives { my ($force_default) = @_; #- fix bad update-alternatives that may occurs after upgrade (and sometimes for install too). @@ -985,10 +1435,10 @@ Allowing this will permit users to simply click on \"Share\" in konqueror and na if ($r ne $l[0]) { require services; my %types = ( - nfs => [ 'nfs-utils', 'nfs', + nfs => [ 'nfs-utils', 'nfs-server', N("NFS: the traditional Unix file sharing system, with less support on Mac and Windows.") ], - smb => [ 'samba-server', 'smb', + smb => [ 'samba', 'smb', N("SMB: a file sharing system used by Windows, Mac OS X and many modern Linux systems.") ], ); @@ -1004,7 +1454,7 @@ Allowing this will permit users to simply click on \"Share\" in konqueror and na } foreach (keys %types) { my ($pkg, $service, $_descr) = @{$types{$_}}; - my $file = "/etc/init.d/$service"; + my $file = "/usr/lib/systemd/system/${service}.service"; if ($l{$_}) { $in->do_pkgs->ensure_is_installed($pkg, $file) or return; services::start($service); @@ -1014,6 +1464,9 @@ Allowing this will permit users to simply click on \"Share\" in konqueror and na services::do_not_start_service_on_boot($service); } } + if ($in->do_pkgs->is_installed('nautilus')) { + $in->do_pkgs->ensure_is_installed('nautilus-filesharing') or return; + } } $conf{RESTRICT} = bool2yesno($restrict); setVarsInSh($file, \%conf); @@ -1035,11 +1488,14 @@ You can use userdrake to add a user to this group.") sub monitor_full_edid() { return if $::noauto; - devices::make('zero'); my ($vbe, $edid); - run_program::raw({ timeout => 20 }, - 'monitor-edid', '>', \$edid, '2>', \$vbe, - '-v', '--perl', if_($::isStandalone, '--try-in-console')); + { + # prevent warnings in install's logs: + local $ENV{LC_ALL} = 'C'; + run_program::raw({ timeout => 20 }, + 'monitor-edid', '>', \$edid, '2>', \$vbe, + '-v', '--perl', if_($::isStandalone, '--try-in-console')); + } if ($::isInstall) { foreach (['edid', \$edid], ['vbe', \$vbe]) { my ($name, $val) = @$_; @@ -1058,8 +1514,9 @@ sub monitor_full_edid() { ($edid, $vbe); } +# FIXME: is buggy regarding multiple sessions sub running_window_manager() { - my @window_managers = qw(kwin gnome-session icewm wmaker afterstep fvwm fvwm2 fvwm95 mwm twm enlightenment xfce blackbox sawfish olvwm fluxbox); + my @window_managers = qw(drakx-matchbox-window-manager ksmserver kwin kwin_x11 kwin_wayland gnome-session icewm wmaker afterstep fvwm fvwm2 fvwm95 mwm twm enlightenment xfce4-session blackbox sawfish olvwm fluxbox compiz lxsession); foreach (@window_managers) { my @pids = fuzzy_pidofs(qr/\b$_\b/) or next; @@ -1068,22 +1525,32 @@ sub running_window_manager() { undef; } +sub set_wm_hints_if_needed { + my ($o_in) = @_; + my $wm = any::running_window_manager(); + $o_in->{no_Window_Manager} = !$wm if $o_in; + $::set_dialog_hint = $wm eq 'drakx-matchbox-window-manager'; +} + sub ask_window_manager_to_logout { my ($wm) = @_; my %h = ( + 'ksmserver' => '/usr/lib/qt4/bin/qdbus org.kde.ksmserver /KSMServer logout 1 0 0', 'kwin' => "dcop kdesktop default logout", 'gnome-session' => "gnome-session-save --kill", 'icewm' => "killall -QUIT icewm", + 'xfce4-session' => "xfce4-session-logout --logout", + 'lxsession' => "lxde-logout", ); my $cmd = $h{$wm} or return; - if ($wm eq 'gnome-session') { - #- NB: consolehelper does not destroy $HOME whereas kdesu does - #- for gnome, we use consolehelper, so below works - $ENV{ICEAUTHORITY} ||= "$ENV{HOME}/.ICEauthority"; - } elsif ($wm eq 'kwin' && $> == 0) { - #- we can not use dcop when we are root - $cmd = "su $ENV{USER} -c '$cmd'"; + if (member($wm, 'ksmserver', 'kwin', 'gnome-session') && $> == 0) { + #- we cannot use dcop when we are root + if (my $user = $ENV{USERHELPER_UID} && getpwuid($ENV{USERHELPER_UID})) { + $cmd = "su $user -c '$cmd'"; + } else { + log::l('missing or unknown $USERHELPER_UID'); + } } system($cmd); 1; @@ -1108,6 +1575,24 @@ sub ask_window_manager_to_logout_then_do { ), $wm, $pid, $action; } +sub ask_for_X_restart { + my ($in) = @_; + + $::isStandalone && $in->isa('interactive::gtk') or return; + + my ($wm, $pid) = running_window_manager(); + + if (!$wm) { + # no window manager, ctrl-alt-del may not be supported, but we still have to restart X.. + $in->ask_okcancel('', N("You need to logout and back in again for changes to take effect. Press OK to logout now."), 1) or return; + system('killall', 'Xorg'); + } + else { + $in->ask_okcancel('', N("You need to log out and back in again for changes to take effect"), 1) or return; + ask_window_manager_to_logout_then_do($wm, $pid, 'killall Xorg'); + } +} + sub alloc_raw_device { my ($prefix, $device) = @_; my $used = 0; @@ -1122,27 +1607,6 @@ sub alloc_raw_device { $raw_dev; } -sub config_dvd { - my ($prefix, $have_devfsd) = @_; - - #- can not have both a devfs and a non-devfs config - #- the /etc/sysconfig/rawdevices solution gives errors with devfs - - my @dvds = grep { detect_devices::isDvdDrive($_) } detect_devices::cdroms() or return; - - log::l("configuring DVD: " . join(" ", map { $_->{device} } @dvds)); - #- create /dev/dvd symlink - each_index { - devfssymlinkf($_, 'dvd' . ($::i ? $::i + 1 : '')); - devfs_rawdevice($_, 'rdvd' . ($::i ? $::i + 1 : '')) if $have_devfsd; - } @dvds; - - if (!$have_devfsd) { - my $raw_dev = alloc_raw_device($prefix, 'dvd'); - symlink($raw_dev, "$prefix/dev/rdvd"); - } -} - sub config_mtools { my ($prefix) = @_; my $file = "$prefix/etc/mtools.conf"; @@ -1155,4 +1619,65 @@ sub config_mtools { } $file; } +sub configure_timezone { + my ($in, $timezone, $ask_gmt, $o_hide_ntp) = @_; + + require timezone; + my $selected_timezone = $in->ask_from_treelist(N("Timezone"), N("Which is your timezone?"), '/', [ timezone::getTimeZones() ], $timezone->{timezone}) or return; + $timezone->{timezone} = $selected_timezone; + + configure_time_more($in, $timezone, $o_hide_ntp) + or goto &configure_timezone if $ask_gmt || to_bool($timezone->{ntp}); + + 1; +} + +sub configure_time_more { + my ($in, $timezone, $o_hide_ntp) = @_; + + my $ntp = to_bool($timezone->{ntp}); + my $servers = timezone::ntp_servers(); + $timezone->{ntp} ||= 'pool.ntp.org'; + + require POSIX; + use POSIX qw(strftime); + my $time_format = "%H:%M:%S"; + my $tz_prefix = timezone::get_timezone_prefix(); + local $ENV{TZ} = ':' . $tz_prefix . '/' . $timezone->{timezone}; + + $in->ask_from_({ interactive_help_id => 'configureTimezoneUTC', + title => N("Date, Clock & Time Zone Settings"), + }, [ + { label => N("Date, Clock & Time Zone Settings"), title => 1 }, + { label => N("What is the best time?") }, + { val => \$timezone->{UTC}, + type => 'list', list => [ 0, 1 ], format => sub { + $_[0] ? + N("%s (hardware clock set to UTC)", POSIX::strftime($time_format, localtime())) : + N("%s (hardware clock set to local time)", POSIX::strftime($time_format, gmtime())); + } }, + { label => N("NTP Server"), title => 1, advanced => $o_hide_ntp }, + { text => N("Automatic time synchronization (using NTP)"), val => \$ntp, type => 'bool', + advanced => $o_hide_ntp }, + { val => \$timezone->{ntp}, disabled => sub { !$ntp }, advanced => $o_hide_ntp, + type => "list", separator => '|', + list => [ keys %$servers ], format => sub { $servers->{$_[0]} } }, + ]) or return; + + $timezone->{ntp} = '' if !$ntp; + + 1; +} + +sub disable_x_screensaver() { + run_program::run("xset", "s", "off"); + run_program::run("xset", "-dpms"); +} + +sub enable_x_screensaver() { + run_program::run("xset", "+dpms"); + run_program::run("xset", "s", "on"); + run_program::run("xset", "s", "reset"); +} + 1; |