diff options
| author | Olivier Blin <oblin@mandriva.com> | 2007-09-25 09:51:35 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2007-09-25 09:51:35 +0000 |
| commit | 11fa52a9bac1696a331a0e12f7943f4331f72200 (patch) | |
| tree | 39b6aad91659f8089c85ffaadf528c707b63e3d8 | |
| parent | d584400f8e2dd27bf241987c67d93e53a32f2937 (diff) | |
| download | draklive-install-11fa52a9bac1696a331a0e12f7943f4331f72200.tar draklive-install-11fa52a9bac1696a331a0e12f7943f4331f72200.tar.gz draklive-install-11fa52a9bac1696a331a0e12f7943f4331f72200.tar.bz2 draklive-install-11fa52a9bac1696a331a0e12f7943f4331f72200.tar.xz draklive-install-11fa52a9bac1696a331a0e12f7943f4331f72200.zip | |
- fix "reboot needed" warning (#33986)
- enable mdkonline after install (#34000)
| -rwxr-xr-x | draklive-install | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/draklive-install b/draklive-install index 083f768..ca31ed9 100755 --- a/draklive-install +++ b/draklive-install @@ -45,8 +45,7 @@ sub umount_all { } } -sub on_reboot_needed { - my ($in) = @_; +sub on_reboot_needed() { fs::partitioning_wizard::warn_reboot_needed($in); $in->exit(0); } @@ -83,7 +82,7 @@ fs::partitioning_wizard::main($in, $all_hds, $fstab, [], undef, {}, 'skip_mtab') mkdir_p($::prefix) or die "unable to create $::prefix"; -fs::any::write_hds($all_hds, $fstab, undef, \&on_reboot_needed, $in); +fs::any::write_hds($all_hds, $fstab, undef, \&on_reboot_needed, {}); fs::any::check_hds_boot_and_root($all_hds, $fstab); fs::partitioning::choose_partitions_to_format($in, $fstab); umount_all($fstab); @@ -148,6 +147,10 @@ USERS=yes USER_RENAME_FROM=guest GLX=no )); + +#- allow mdkonline to be started again +unlink('/etc/skel/.MdkOnline/mdkonline', glob('/home/*/.MdkOnline/mdkonline')); + #- unselect guest user in kdm my $kdm_cfg = '/etc/kde/kdm/kdmrc'; update_gnomekderc($::prefix . $kdm_cfg, |