summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2010-08-11 14:48:34 +0000
committerOlivier Blin <oblin@mandriva.com>2010-08-11 14:48:34 +0000
commit57e19364f05147f67c47749e94e9edddfa7c47f8 (patch)
tree31509cfbdd08e9eb04893ab4daf38d3d836ddd42
parent26372cd9f8fae971b9cc8c9802276f49c5045441 (diff)
downloaddraklive-57e19364f05147f67c47749e94e9edddfa7c47f8.tar
draklive-57e19364f05147f67c47749e94e9edddfa7c47f8.tar.gz
draklive-57e19364f05147f67c47749e94e9edddfa7c47f8.tar.bz2
draklive-57e19364f05147f67c47749e94e9edddfa7c47f8.tar.xz
draklive-57e19364f05147f67c47749e94e9edddfa7c47f8.zip
factorize root variable
-rwxr-xr-xdraklive9
1 files changed, 5 insertions, 4 deletions
diff --git a/draklive b/draklive
index 6165b4d..3cdcf35 100755
--- a/draklive
+++ b/draklive
@@ -507,16 +507,17 @@ sub create_initrd {
sub create_bootloader {
my ($live) = @_;
+ my $root = $live->get_system_root;
my $kernel = $live->find_kernel->{version};
my $vmlinuz_long = '/boot/vmlinuz-' . $kernel;
- -e $live->get_system_root . $vmlinuz_long or die "can not find kernel $kernel\n";
+ -e $root . $vmlinuz_long or die "can not find kernel $kernel\n";
if ($live->{system}{gfxboot}) {
#- would be run by bootloader::add_boot_splash and make-boot-splash, but not called when we don't generate an initrd
- run_({ root => $live->get_system_root }, '/usr/share/bootsplash/scripts/switch-themes', '-u');
+ run_({ root => $root }, '/usr/share/bootsplash/scripts/switch-themes', '-u');
#- grub-gfxmenu would be run by bootloader::write_grub from DrakX
- run_({ root => $live->get_system_root }, '/usr/sbin/grub-gfxmenu', '--update-gfxmenu');
- my $gfxmenu = $live->get_system_root . '/boot/gfxmenu';
+ run_({ root => $root }, '/usr/sbin/grub-gfxmenu', '--update-gfxmenu');
+ my $gfxmenu = $root . '/boot/gfxmenu';
if (-e $gfxmenu) {
my $boot_dir = $live->get_builddir . $live->{prefix}{build}{boot};
mkdir_p($boot_dir);