summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-11-19 12:30:00 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-11-19 12:30:00 +0000
commit1cf4227314c228df0cf1a8747298e462f6ade37e (patch)
treeb6d88415231e873580f1546290eaa61ac369697c
parentc3244e012c37f265a110ad0f2b42f58d10e7892a (diff)
downloaddrakx-1cf4227314c228df0cf1a8747298e462f6ade37e.tar
drakx-1cf4227314c228df0cf1a8747298e462f6ade37e.tar.gz
drakx-1cf4227314c228df0cf1a8747298e462f6ade37e.tar.bz2
drakx-1cf4227314c228df0cf1a8747298e462f6ade37e.tar.xz
drakx-1cf4227314c228df0cf1a8747298e462f6ade37e.zip
- ensure DURING_INSTALL doesn't escape packages install
- use run_program::rooted instead of system("chroot ...")
-rwxr-xr-xmove/make_live10
1 files changed, 5 insertions, 5 deletions
diff --git a/move/make_live b/move/make_live
index 2f209006c..2a2a3aa6b 100755
--- a/move/make_live
+++ b/move/make_live
@@ -46,7 +46,7 @@ sub installPackages {
pkgs::setSelectedFromCompssList($o->{packages}, \%compssUsersChoice, 4, 0);
my @toInstall = pkgs::packagesToInstall($o->{packages});
- $ENV{DURING_INSTALL} = 1;
+ local $ENV{DURING_INSTALL} = 1;
$ENV{LD_LIBRARY_PATH} = "/lib:/usr/lib:/usr/X11R6/lib:/usr/lib/qt3/lib";
pkgs::install($::prefix, 0, \@toInstall, $o->{packages});
@@ -65,11 +65,11 @@ print "Making live in $::prefix directory.\n";
# eval { rm_rf($::prefix) };
output_p("$::prefix/etc/fstab", "none /proc proc defaults 0 0\n");
installPackages();
- system("chroot $::prefix ldconfig");
+ run_program::rooted($::prefix, 'ldconfig');
touch("$::prefix/etc/menu/enable_simplified");
- system("chroot $::prefix update-menus");
- system("chroot $::prefix fc-cache"); #- generate cache in all directories mentioned in config file
- system("chroot $::prefix kbuildsycoca --global");
+ run_program::rooted($::prefix, 'update-menus');
+ run_program::rooted($::prefix, 'fc-cache'); #- generate cache in all directories mentioned in config file
+ run_program::rooted($::prefix, 'kbuildsycoca', '--global');
eval { rm_rf("$::prefix/dev") }; # we don't need it, we use devfs
eval { rm_rf("$::prefix/lib/i686") }; # de-complexify, use the default on any arch