From 57e19364f05147f67c47749e94e9edddfa7c47f8 Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Wed, 11 Aug 2010 14:48:34 +0000 Subject: factorize root variable --- draklive | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'draklive') 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); -- cgit v1.2.1