From 11356e7b94232bf6fc8868d58dddf852a739f997 Mon Sep 17 00:00:00 2001 From: fake Date: Wed, 5 Jan 2005 11:52:12 +0000 Subject: [PATCH] fake: fix two taropt option ordering problems with the new tar (bootdisk and livecd cd bootloader extraction) [2004123102515121013] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@5448 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- target/bootdisk/x86/build.sh | 8 +++----- target/livecd/x86/build.sh | 5 ++--- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/target/bootdisk/x86/build.sh b/target/bootdisk/x86/build.sh index ff4eab73b..b1e2d8aab 100644 --- a/target/bootdisk/x86/build.sh +++ b/target/bootdisk/x86/build.sh @@ -18,8 +18,7 @@ chmod +x makeimages.sh if [ $use_mdlbl -eq 1 ] then - tar --use-compress-program=bzip2 \ - -xf $base/download/mirror/m/mdlbl-$mdlbl_ver.tar.bz2 + tar $taropt $base/download/mirror/m/mdlbl-$mdlbl_ver.tar.bz2 cd mdlbl-$mdlbl_ver cp ../boot/vmlinuz .; cp ../initrd.gz initrd; ./makedisks.sh for x in disk*.img; do mv $x ../floppy${x#disk}; done; cd .. @@ -43,9 +42,8 @@ then # echo_status "Extracting isolinux boot loader." mkdir -p isolinux - tar --use-compress-program=bzip2 \ - -xf $base/download/mirror/s/syslinux-$syslinux_ver.tar.bz2 \ - syslinux-$syslinux_ver/isolinux.bin -O > isolinux/isolinux.bin + tar -O $taropt $base/download/mirror/s/syslinux-$syslinux_ver.tar.bz2 \ + syslinux-$syslinux_ver/isolinux.bin > isolinux/isolinux.bin # echo_status "Creating isolinux config file." cp $base/target/$target/x86/isolinux.cfg isolinux/ diff --git a/target/livecd/x86/build.sh b/target/livecd/x86/build.sh index 4e9a51cb6..e088ff335 100644 --- a/target/livecd/x86/build.sh +++ b/target/livecd/x86/build.sh @@ -8,9 +8,8 @@ echo_header "Creating isolinux setup:" # echo_status "Extracting isolinux boot loader." mkdir -p isolinux -tar --use-compress-program=bzip2 \ - -xf $base/download/mirror/s/syslinux-$syslinux_ver.tar.bz2 \ - syslinux-$syslinux_ver/isolinux.bin -O > isolinux/isolinux.bin +tar -O $taropt $base/download/mirror/s/syslinux-$syslinux_ver.tar.bz2 \ + syslinux-$syslinux_ver/isolinux.bin > isolinux/isolinux.bin # echo_status "Creating isolinux config file." cp $base/target/$target/x86/isolinux.cfg isolinux/