summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-08-23 12:52:38 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-08-23 12:52:38 +0000
commitfe7ac07297f633f3ff7398ef82661cabf08075fa (patch)
treeac9daa66d6d77b50c574d7c663b9ced95730ec95
parent201a27bd864bf94e8692c8c2c0fee3b0eedb511c (diff)
downloaddrakx-fe7ac07297f633f3ff7398ef82661cabf08075fa.tar
drakx-fe7ac07297f633f3ff7398ef82661cabf08075fa.tar.gz
drakx-fe7ac07297f633f3ff7398ef82661cabf08075fa.tar.bz2
drakx-fe7ac07297f633f3ff7398ef82661cabf08075fa.tar.xz
drakx-fe7ac07297f633f3ff7398ef82661cabf08075fa.zip
don't create isolinux/xbox if we don't have a xbox kernel available
-rwxr-xr-xmake_boot_img5
1 files changed, 2 insertions, 3 deletions
diff --git a/make_boot_img b/make_boot_img
index 8716882f4..45f310919 100755
--- a/make_boot_img
+++ b/make_boot_img
@@ -750,12 +750,11 @@ sub isolinux {
}
sub xbox_stage1() {
- my $dir = 'isolinux/xbox';
+ my $xbox_kernel = find { /xbox/ } all('kernel/all.kernels') or return;
+ my $dir = 'isolinux/xbox';
eval { rm_rf($dir) }; mkdir_p($dir);
- my $xbox_kernel = find { /xbox/ } all('kernel/all.kernels') or return;
-
_ "cp kernel/all.kernels/$xbox_kernel/vmlinuz $dir";
initrd($tmp_mnt_initrd, 'all', '', "images/all.rdz-$xbox_kernel");
rename("images/all.rdz-$xbox_kernel", "$dir/initrd");