summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-03-13 10:42:51 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-03-13 10:42:51 +0000
commitb9c91c78b54aba73e63c9919437e638957f6d44b (patch)
treeae0c582e672333605e456323485b010fd0c27065
parentbb10f0671dd379c9c7e8da333c2a7cb72d2b9b75 (diff)
downloaddrakx-b9c91c78b54aba73e63c9919437e638957f6d44b.tar
drakx-b9c91c78b54aba73e63c9919437e638957f6d44b.tar.gz
drakx-b9c91c78b54aba73e63c9919437e638957f6d44b.tar.bz2
drakx-b9c91c78b54aba73e63c9919437e638957f6d44b.tar.xz
drakx-b9c91c78b54aba73e63c9919437e638957f6d44b.zip
cleanup (still need to handle permissions more cleanly, people using umask 0
should be shot)
-rw-r--r--perl-install/any.pm6
1 files changed, 2 insertions, 4 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index a45162a4b..dd7f6b932 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -468,10 +468,8 @@ sub set_autologin {
setVarsInSh("$::prefix/etc/sysconfig/desktop", \%l);
log::l("cat $::prefix/etc/sysconfig/desktop ($desktop):\n", cat_("$::prefix/etc/sysconfig/desktop"));
}
- setVarsInSh("$::prefix/etc/sysconfig/autologin",
- { USER => $user, AUTOLOGIN => bool2yesno($user), EXEC => "/usr/X11R6/bin/startx.autologin" });
- run_program::rooted($::prefix, "/bin/chmod", 644, "$::prefix/etc/sysconfig/autologin")
- or log::l("warning: unable to set \"$::prefix/etc/sysconfig/autologin\" permissions");
+ setVarsInShMode("$::prefix/etc/sysconfig/autologin", 0644,
+ { USER => $user, AUTOLOGIN => bool2yesno($user), EXEC => "/usr/X11R6/bin/startx.autologin" });
log::l("cat $::prefix/etc/sysconfig/autologin ($user):\n", cat_("$::prefix/etc/sysconfig/autologin"));
}