diff options
| -rw-r--r-- | perl-install/NEWS | 1 | ||||
| -rwxr-xr-x | perl-install/standalone/finish-install | 16 |
2 files changed, 1 insertions, 16 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index beb99735c..6cdbf1c8a 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,5 +1,6 @@ - finish-install: o drop reload-dm hack + o drop gnome-reboot hack Version 17.47 - 30 June 2016 diff --git a/perl-install/standalone/finish-install b/perl-install/standalone/finish-install index 8bc9dad9d..16de321ea 100755 --- a/perl-install/standalone/finish-install +++ b/perl-install/standalone/finish-install @@ -255,20 +255,6 @@ sub encrypt_home { undef $wait; } -sub ask_gnome_reboot() { - my $lock_file = '/etc/draklive-install.d/gnome-reboot'; - if (!is_mgalive()) { - if (-f $lock_file) { - run_program::run('/usr/bin/rm', '-f', $lock_file); - # FIXME: convert to perl/gtk* window popup for translation support - system('/usr/bin/zenity', qw(--timeout=20 --title), N("Finishing install"), qw(--no-wrap --info --text), N("This system will be rebooted\nfor the changes to take effect!")); - run_program::run('/usr/bin/chown', '-R', 'gdm:gdm', '/var/lib/gdm'); - run_program::run('/usr/sbin/ldconfig', '-X'); - run_program::run('/usr/bin/systemctl', 'reboot'); - } - } -} - sub call { my ($step_name) = @_; my $f_name = 'ask_' . $step_name; @@ -302,6 +288,4 @@ call('encrypt_home'); call('glx'); setVarsInSh($conf_file, { FINISH_INSTALL => 'no' }); -call('gnome_reboot'); - $in->exit(0); |