summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorOlivier Blin <blino@mageia.org>2011-05-19 20:40:42 +0000
committerOlivier Blin <blino@mageia.org>2011-05-19 20:40:42 +0000
commitda4fdd67deb6c1dc6314c3a34902eef87ee7c35b (patch)
tree77e21e8effbbf322e54385731f703572d7407bd2 /perl-install
parentf950e4a9f056f6cd253384ce2f62d61101e015af (diff)
downloaddrakx-da4fdd67deb6c1dc6314c3a34902eef87ee7c35b.tar
drakx-da4fdd67deb6c1dc6314c3a34902eef87ee7c35b.tar.gz
drakx-da4fdd67deb6c1dc6314c3a34902eef87ee7c35b.tar.bz2
drakx-da4fdd67deb6c1dc6314c3a34902eef87ee7c35b.tar.xz
drakx-da4fdd67deb6c1dc6314c3a34902eef87ee7c35b.zip
finish-install: do not try to replace home path for device files after
live install (#1148)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS3
-rwxr-xr-xperl-install/standalone/finish-install2
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 61d2d8eec..16a2febdf 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- finish-install: do not try to replace home path for device files
+ after live install (#1148)
+
Version 13.54 - 19 May 2011
- draksound:
diff --git a/perl-install/standalone/finish-install b/perl-install/standalone/finish-install
index 09f62ab1d..9264436ad 100755
--- a/perl-install/standalone/finish-install
+++ b/perl-install/standalone/finish-install
@@ -170,7 +170,7 @@ sub ask_users() {
#- replace home path in user config files
my $old_home = "/home/$old_user";
my $new_home = "/home/$users->[0]{name}";
- run_program::run(qq(grep -rl $old_home $new_home/.??* | while read f; do perl -pi -e 's,$old_home,$new_home,g' "\$f"; done));
+ run_program::run(qq(grep -D skip -rl $old_home $new_home/.??* | while read f; do perl -pi -e 's,$old_home,$new_home,g' "\$f"; done));
#- give console rights for current session
my $console_dir = "/var/run/console";
cp_f($console_dir . "/" . $old_user, $console_dir . "/" . $users->[0]{name}) if -e $console_dir . "/" . $old_user;