summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2015-04-05 17:02:47 +0259
committerThomas Backlund <tmb@mageia.org>2015-04-05 17:02:47 +0259
commit64ecc767d1c7de0a4a87b2a0ac88dc7e2f2207ed (patch)
treea5c82797ca69217de683f3112ad4161318c23c69
parent7ade082e26b4fb31934a14e56837b980d12a9507 (diff)
downloaddrakx-64ecc767d1c7de0a4a87b2a0ac88dc7e2f2207ed.tar
drakx-64ecc767d1c7de0a4a87b2a0ac88dc7e2f2207ed.tar.gz
drakx-64ecc767d1c7de0a4a87b2a0ac88dc7e2f2207ed.tar.bz2
drakx-64ecc767d1c7de0a4a87b2a0ac88dc7e2f2207ed.tar.xz
drakx-64ecc767d1c7de0a4a87b2a0ac88dc7e2f2207ed.zip
add 'BIG HAMMER' fix to reboot gnome systems at end of configuration steps on first boot after live install
-rwxr-xr-xperl-install/standalone/finish-install16
1 files changed, 16 insertions, 0 deletions
diff --git a/perl-install/standalone/finish-install b/perl-install/standalone/finish-install
index 16de321ea..e9edb2e02 100755
--- a/perl-install/standalone/finish-install
+++ b/perl-install/standalone/finish-install
@@ -255,6 +255,20 @@ 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 --timeout=20 --title 'Finishing install' --no-wrap --info --text '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;
@@ -288,4 +302,6 @@ call('encrypt_home');
call('glx');
setVarsInSh($conf_file, { FINISH_INSTALL => 'no' });
+call('gnome_reboot');
+
$in->exit(0);