summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2007-10-08 16:34:17 +0000
committerOlivier Blin <oblin@mandriva.com>2007-10-08 16:34:17 +0000
commit87edbc3c2d1416076d0c45e3dbaf97ac38d4b4d1 (patch)
tree6ea250df2a355aa01ef59d18319ac87cf58c0e21
parent987abc6013bb7dbd36394f1daa9c839aaeb57ec8 (diff)
downloaddraklive-install-87edbc3c2d1416076d0c45e3dbaf97ac38d4b4d1.tar
draklive-install-87edbc3c2d1416076d0c45e3dbaf97ac38d4b4d1.tar.gz
draklive-install-87edbc3c2d1416076d0c45e3dbaf97ac38d4b4d1.tar.bz2
draklive-install-87edbc3c2d1416076d0c45e3dbaf97ac38d4b4d1.tar.xz
draklive-install-87edbc3c2d1416076d0c45e3dbaf97ac38d4b4d1.zip
do not try to "clean" rpm db anymore
-rwxr-xr-xdraklive-install4
1 files changed, 0 insertions, 4 deletions
diff --git a/draklive-install b/draklive-install
index 8213cc7..5eaed69 100755
--- a/draklive-install
+++ b/draklive-install
@@ -131,8 +131,6 @@ open(my $OUTPUT, '-|', build_copy_command('/', $::prefix));
undef $update_progress;
undef $wait;
-sub clean_rpm_db() { unlink(glob_(map { $_ . "/var/lib/rpm/__db.*" } "", $::prefix)) }
-
#- FIXME: maybe factorize with draklive, using draklive --clean-chroot ?
#- remove unwanted files and packages
my $live_user_desktop = chomp_(run_program::rooted_get_stdout($::prefix, "su - $live_user -c 'xdg-user-dir DESKTOP'"));
@@ -140,9 +138,7 @@ unlink(map { $::prefix . $_ } '/.autofsck',
'/etc/modprobe.d/mandriva-live',
$live_user_desktop . '/draklive-copy-wizard.desktop',
$live_user_desktop . '/draklive-install.desktop');
-clean_rpm_db();
system('chroot', $::prefix, 'rpm', '-e', 'draklive-install');
-clean_rpm_db();
#- enable first boot wizard at system boot
output($::prefix . '/etc/sysconfig/firstboot', 'FIRSTBOOT=yes');