diff options
| author | Olivier Blin <oblin@mandriva.com> | 2008-03-20 01:25:11 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2008-03-20 01:25:11 +0000 |
| commit | b39bcafc9ed3c5d21a23fa9809ad894414a4c11d (patch) | |
| tree | ad39167c19ee5ab72661416da3c1312df1d4786a /draklive-install | |
| parent | 45bb01a29b51b9e43537f6fe1ceb8421679a70e8 (diff) | |
| download | draklive-install-b39bcafc9ed3c5d21a23fa9809ad894414a4c11d.tar draklive-install-b39bcafc9ed3c5d21a23fa9809ad894414a4c11d.tar.gz draklive-install-b39bcafc9ed3c5d21a23fa9809ad894414a4c11d.tar.bz2 draklive-install-b39bcafc9ed3c5d21a23fa9809ad894414a4c11d.tar.xz draklive-install-b39bcafc9ed3c5d21a23fa9809ad894414a4c11d.zip | |
read live user from /etc/draklive-install.d/user
Diffstat (limited to 'draklive-install')
| -rwxr-xr-x | draklive-install | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/draklive-install b/draklive-install index ffed79d..d895f5e 100755 --- a/draklive-install +++ b/draklive-install @@ -201,12 +201,14 @@ sub complete_install { #- FIXME: maybe factorize with draklive, using draklive --clean-chroot ? #- remove unwanted files and packages - my $live_user = 'guest'; - my $live_user_desktop = chomp_(run_program::rooted_get_stdout($::prefix, "su - $live_user -c 'xdg-user-dir DESKTOP'")); + my $live_user = chomp_(cat_('/etc/draklive-install.d/user')); + my $live_user_desktop = $live_user && chomp_(run_program::rooted_get_stdout($::prefix, "su - $live_user -c 'xdg-user-dir DESKTOP'")); unlink(map { $::prefix . $_ } '/.autofsck', '/etc/modprobe.d/mandriva-live', - $live_user_desktop . '/draklive-copy-wizard.desktop', - $live_user_desktop . '/draklive-install.desktop'); + if_($live_user_desktop, + $live_user_desktop . '/draklive-copy-wizard.desktop', + $live_user_desktop . '/draklive-install.desktop'), + ); system('chroot', $::prefix, 'rpm', '-e', 'draklive-install'); #- copy sysconfig files for first boot |