diff options
| author | Olivier Blin <oblin@mandriva.com> | 2007-10-05 18:21:56 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2007-10-05 18:21:56 +0000 |
| commit | 43f8e7ba44fca196eba2eaa4530efc35e0525b62 (patch) | |
| tree | 8975284a73005e5a946c84d377c44ac593a28be3 /draklive-install | |
| parent | d00378f5142ec27d98d138730c59cc180c9ab850 (diff) | |
| download | draklive-install-43f8e7ba44fca196eba2eaa4530efc35e0525b62.tar draklive-install-43f8e7ba44fca196eba2eaa4530efc35e0525b62.tar.gz draklive-install-43f8e7ba44fca196eba2eaa4530efc35e0525b62.tar.bz2 draklive-install-43f8e7ba44fca196eba2eaa4530efc35e0525b62.tar.xz draklive-install-43f8e7ba44fca196eba2eaa4530efc35e0525b62.zip | |
use xdg-user-dir to detect desktop directory of guest user when removing desktop entries
Diffstat (limited to 'draklive-install')
| -rwxr-xr-x | draklive-install | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/draklive-install b/draklive-install index 2c31ea4..51c118e 100755 --- a/draklive-install +++ b/draklive-install @@ -133,10 +133,11 @@ undef $wait; #- 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'")); unlink(map { $::prefix . $_ } '/.autofsck', '/etc/modprobe.d/mandriva-live', - '/home/' . $live_user . '/Desktop/draklive-copy-wizard.desktop', - '/home/' . $live_user . '/Desktop/draklive-install.desktop'); + $live_user_desktop . '/draklive-copy-wizard.desktop', + $live_user_desktop . '/draklive-install.desktop'); system('chroot', $::prefix, 'rpm', '-e', 'draklive-install'); #- enable first boot wizard at system boot |