SVN: bootdisk/trunk: INSTALL Makefile.am batch-installer/installer-prep config/syslinux.cfg doc/MKIN...
hawk
hawk at pld-linux.org
Mon Apr 2 19:11:34 CEST 2007
Author: hawk
Date: Mon Apr 2 19:11:33 2007
New Revision: 8408
Modified:
bootdisk/trunk/INSTALL
bootdisk/trunk/Makefile.am
bootdisk/trunk/batch-installer/installer-prep
bootdisk/trunk/config/syslinux.cfg
bootdisk/trunk/doc/MKINSTALLER
bootdisk/trunk/doc/images-readme
bootdisk/trunk/mkimages
bootdisk/trunk/mod/Makefile.am
bootdisk/trunk/mod/mkmod
bootdisk/trunk/pkg/Makefile.am
bootdisk/trunk/pkg/mkpkg
bootdisk/trunk/scripts/mkinstaller
bootdisk/trunk/scripts/rc
Log:
- user bz2 compression for installer tarballs
Modified: bootdisk/trunk/INSTALL
==============================================================================
--- bootdisk/trunk/INSTALL (original)
+++ bootdisk/trunk/INSTALL Mon Apr 2 19:11:33 2007
@@ -95,6 +95,6 @@
you run ./autogen.sh and then make. For good working of syslinux you have
to mount /proc inside your chroot.
-When you're done building bootdisk, you need to place mod/*.tar.gz and
-pkg/*.tar.gz on distribution media in $(INSTALLER_DIR) from Makefile.am.
+When you're done building bootdisk, you need to place mod/*.tar.bz2 and
+pkg/*.tar.bz2 on distribution media in $(INSTALLER_DIR) from Makefile.am.
Modified: bootdisk/trunk/Makefile.am
==============================================================================
--- bootdisk/trunk/Makefile.am (original)
+++ bootdisk/trunk/Makefile.am Mon Apr 2 19:11:33 2007
@@ -51,12 +51,12 @@
parport \
usb
-ADDONS1_MODS_TGZ := $(patsubst %,mod/%-mod.tar.gz, $(ADDONS1_MODS))
-ADDONS2_MODS_TGZ := $(patsubst %,mod/%-mod.tar.gz, $(ADDONS2_MODS))
-ADDONS3_MODS_TGZ := $(patsubst %,mod/%-mod.tar.gz, $(ADDONS3_MODS))
+ADDONS1_MODS_TBZ2 := $(patsubst %,mod/%-mod.tar.bz2, $(ADDONS1_MODS))
+ADDONS2_MODS_TBZ2 := $(patsubst %,mod/%-mod.tar.bz2, $(ADDONS2_MODS))
+ADDONS3_MODS_TBZ2 := $(patsubst %,mod/%-mod.tar.bz2, $(ADDONS3_MODS))
TOPDIR := $(shell pwd)
-MY_ROOT = $(DESTDIR)/usr/lib/bootdisk/targz
+MY_ROOT = $(DESTDIR)/usr/lib/bootdisk/tarbz2
# main targets
@@ -95,7 +95,7 @@
cat boot*txt > buildlog.txt
rm boot*txt
-bootdisk-stamp: pkg/root-pkg.tar.gz mod/eth-mod.tar.gz mkinstaller-local
+bootdisk-stamp: pkg/root-pkg.tar.bz2 mod/eth-mod.tar.bz2 mkinstaller-local
FTP_DIST_DIR="$(FTP_DIST_DIR)" ARCH="$(ARCH)" sh mkimages
touch bootdisk-stamp
@@ -119,7 +119,7 @@
pkgs-clean:
rm -f installer-rc
- rm -rf lists-pkg-root targz
+ rm -rf lists-pkg-root tarbz2
installer-rc: force
( echo 'INSTALLER_DIR="$(INSTALLER_DIR)"' ; \
@@ -139,37 +139,37 @@
######################## addons and lists #########################
-addons1.img: Makefile.am $(ADDONS1_MODS_TGZ)
+addons1.img: Makefile.am $(ADDONS1_MODS_TBZ2)
rm -rf addons1-root
mkdir addons1-root
install -d addons1-root$(INSTALLER_DIR)
- install -m 644 $(ADDONS1_MODS_TGZ) addons1-root$(INSTALLER_DIR)
+ install -m 644 $(ADDONS1_MODS_TBZ2) addons1-root$(INSTALLER_DIR)
genext2fs -r 0 -i 40 -b 1440 -d addons1-root addons1.img
rm -rf addons1-root
-addons2.img: Makefile.am $(ADDONS2_MODS_TGZ)
+addons2.img: Makefile.am $(ADDONS2_MODS_TBZ2)
rm -rf addons2-root
mkdir addons2-root
install -d addons2-root$(INSTALLER_DIR)
- install -m 644 $(ADDONS2_MODS_TGZ) addons2-root$(INSTALLER_DIR)
+ install -m 644 $(ADDONS2_MODS_TBZ2) addons2-root$(INSTALLER_DIR)
genext2fs -r 0 -i 40 -b 1440 -d addons2-root addons2.img
rm -rf addons2-root
-addons3.img: Makefile.am $(ADDONS3_MODS_TGZ)
+addons3.img: Makefile.am $(ADDONS3_MODS_TBZ2)
rm -rf addons3-root
mkdir addons3-root
install -d addons3-root$(INSTALLER_DIR)
- install -m 644 $(ADDONS3_MODS_TGZ) addons3-root$(INSTALLER_DIR)
+ install -m 644 $(ADDONS3_MODS_TBZ2) addons3-root$(INSTALLER_DIR)
genext2fs -r 0 -i 40 -b 1440 -d addons3-root addons3.img
rm -rf addons3-root
lists-pkg:
rm -rf $@-root/*
install -d $@-root/etc/lists.{packages,addons}
- for i in mod/*-mod.tar.gz ; do \
- tar tzf $$i > \
+ for i in mod/*-mod.tar.bz2 ; do \
+ tar tjf $$i > \
$@-root/etc/lists.packages/`echo $$i | \
- sed -e 's|mod/||; s|.tar.gz||'` ; \
+ sed -e 's|mod/||; s|.tar.bz2||'` ; \
done
for i in $(ADDONS1_MODS); do \
echo $$i-mod >>$@-root/etc/lists.addons/1 ; \
@@ -187,27 +187,27 @@
# prepare for using mkinstaller in this build directory
config/mkinstaller.conf: Makefile \
- $(patsubst %,pkg/%-pkg.tar.gz, ext2 parted reiserfs)
+ $(patsubst %,pkg/%-pkg.tar.bz2, ext2 parted reiserfs)
echo "kernel_ver=$(KERNEL_VER)" > config/mkinstaller.conf
- echo "ext2_pkg_size=`gzip -l pkg/ext2-pkg.tar.gz | tail -1 \
- | sed -e 's/ *[0-9]* *//; s/ *.*//'`" >> config/mkinstaller.conf
- echo "parted_pkg_size=`gzip -l pkg/parted-pkg.tar.gz | tail -1 \
- | sed -e 's/ *[0-9]* *//; s/ *.*//'`" >> config/mkinstaller.conf
- echo "reiserfs_pkg_size=`gzip -l pkg/reiserfs-pkg.tar.gz | tail -1 \
- | sed -e 's/ *[0-9]* *//; s/ *.*//'`" >> config/mkinstaller.conf
- echo "safe_area=1000000" >> config/mkinstaller.conf
+ echo "ext2_pkg_size=`bzip2 -dc pkg/ext2-pkg.tar.bz2 > testfile.tar; \
+ ls -l testfile.tar | awk '{ print $$5 }'; rm testfile.tar`" >> config/mkinstaller.conf
+ echo "parted_pkg_size=`bzip2 -dc pkg/parted-pkg.tar.bz2 > testfile.tar; \
+ ls -l testfile.tar | awk '{ print $$5 }'; rm testfile.tar`" >> config/mkinstaller.conf
+ echo "reiserfs_pkg_size=`bzip2 -dc pkg/reiserfs-pkg.tar.bz2 > testfile.tar; \
+ ls -l testfile.tar | awk '{ print $$5 }'; rm testfile.tar`" >> config/mkinstaller.conf
+ echo "safe_area=500000" >> config/mkinstaller.conf
mkinstaller-local: config/dev_genext2fs config/dev_genromfs config/mkinstaller.conf
- rm -rf targz
- mkdir targz
- cp pkg/*.tar.gz mod/*.tar.gz targz
- mkdir targz/config
- cp config/dev_genext2fs config/dev_genromfs config/mkinstaller.conf targz/config
- mkdir -p targz/floppy
- install -m 644 doc/f1.txt config/syslinux.cfg targz/floppy
- install -m 644 doc/logo/logo.pld-baggins targz/floppy/logo.pld
- install -m 644 /usr/lib/syslinux/ldlinux.sys targz/floppy/
- ln -s /usr/lib/bootdisk/boot targz/kernel
+ rm -rf tarbz2
+ mkdir tarbz2
+ cp pkg/*.tar.bz2 mod/*.tar.bz2 tarbz2
+ mkdir tarbz2/config
+ cp config/dev_genext2fs config/dev_genromfs config/mkinstaller.conf tarbz2/config
+ mkdir -p tarbz2/floppy
+ install -m 644 doc/f1.txt config/syslinux.cfg tarbz2/floppy
+ install -m 644 doc/logo/logo.pld-baggins tarbz2/floppy/logo.pld
+ install -m 644 /usr/lib/syslinux/ldlinux.sys tarbz2/floppy/
+ ln -s /usr/lib/bootdisk/boot tarbz2/kernel
install-ui:
install -d $(DESTDIR)/usr/lib/bootdisk/ui
@@ -223,7 +223,7 @@
# install target for .spec
install-user: mkinstaller-local install-ui
install -d $(MY_ROOT)/{config,floppy,kernel}
- install -m 644 $(PKGS_TGZ) $(MODS_TGZ) $(MY_ROOT)
+ install -m 644 $(PKGS_TBZ2) $(MODS_TBZ2) $(MY_ROOT)
install -m 644 config/{dev_gen{ext2fs,romfs},mkinstaller.conf} $(MY_ROOT)/config
install -m 644 floppy/* $(MY_ROOT)/floppy
install -m 644 $(ROOT)/boot/vmlinuz-$(KERNEL_VER) $(MY_ROOT)/kernel
Modified: bootdisk/trunk/batch-installer/installer-prep
==============================================================================
--- bootdisk/trunk/batch-installer/installer-prep (original)
+++ bootdisk/trunk/batch-installer/installer-prep Mon Apr 2 19:11:33 2007
@@ -146,7 +146,7 @@
fi
}
-# load package (-pkg.tar.gz) or package with modules (-mod.tar.gz)
+# load package (-pkg.tar.bz2) or package with modules (-mod.tar.bz2)
# give the name of package, if no -pkg suffix, the -pkg is assumed
# if -mod and $2, $3... given, treat as module names and fetch this
# modules only
@@ -177,8 +177,8 @@
fi
if test -n "$source_not_mountable"; then
- file="$source_device/$source_dir/$inst_dir/${pkg}.tar.gz"
- log info "`nls "Fetching %s" "$source_device/$source_dir/$inst_dir/${pkg}.tar.gz"`"
+ file="$source_device/$source_dir/$inst_dir/${pkg}.tar.bz2"
+ log info "`nls "Fetching %s" "$source_device/$source_dir/$inst_dir/${pkg}.tar.bz2"`"
(
cd $tmp
case "$net_proxy" in
@@ -193,15 +193,15 @@
log warn "`nls "Cannot get %s" "$file"`"
return 1
}
- file="$tmp/${pkg}.tar.gz"
+ file="$tmp/${pkg}.tar.bz2"
else
- file="${source_mountpoint}${source_dir}/$inst_dir/${pkg}.tar.gz"
+ file="${source_mountpoint}${source_dir}/$inst_dir/${pkg}.tar.bz2"
# TODO load packages from bootdisk
test -f "$file" || {
# try without source_dir (for addons disk)
- file="${source_mountpoint}/$inst_dir/${pkg}.tar.gz"
+ file="${source_mountpoint}/$inst_dir/${pkg}.tar.bz2"
test -f "$file" || {
- log warn "`nls "No file %s nor %s" "${source_mountpoint}${source_dir}/$inst_dir/${pkg}.tar.gz" "${source_mountpoint}/$inst_dir/${pkg}.tar.gz"`"
+ log warn "`nls "No file %s nor %s" "${source_mountpoint}${source_dir}/$inst_dir/${pkg}.tar.bz2" "${source_mountpoint}/$inst_dir/${pkg}.tar.bz2"`"
return 1
}
}
@@ -209,12 +209,12 @@
(
if cd $root; then
- gunzip -c "$file" | tar x $files
+ bunzip2 -c "$file" | tar x $files
# this is "ugly hack" but what to do?
if [ "X$files" != "X" ] ; then
chown 0.0 $files
else
- gunzip -c "$file" | tar t | xargs chown 0.0
+ bunzip2 -c "$file" | tar t | xargs chown 0.0
fi
else
log warn "no $root dir, cannot unpack $pkg in this dir"
Modified: bootdisk/trunk/config/syslinux.cfg
==============================================================================
--- bootdisk/trunk/config/syslinux.cfg (original)
+++ bootdisk/trunk/config/syslinux.cfg Mon Apr 2 19:11:33 2007
@@ -15,4 +15,4 @@
label batch
kernel vmlinuz
- append initrd=initrd.gz root=/dev/ram0 init=/bin/init-wrapper batch config=config.tgz
+ append initrd=initrd.gz root=/dev/ram0 init=/bin/init-wrapper batch config=config.tar.bz2
Modified: bootdisk/trunk/doc/MKINSTALLER
==============================================================================
--- bootdisk/trunk/doc/MKINSTALLER (original)
+++ bootdisk/trunk/doc/MKINSTALLER Mon Apr 2 19:11:33 2007
@@ -1,6 +1,6 @@
mkinstaller is tool for easy creation of bootdisk images.
-It uses several .tar.gz packages, including a bit special root-pkg.tar.gz,
+It uses several .tar.bz2 packages, including a bit special root-pkg.tar.bz2,
combines them and writes initrd image. Then it installs created image
along with kernel and syslinux bootloader on floppy image. This process
can be stoped and resumed at any place.
@@ -27,7 +27,7 @@
After all packages are unpacked kernel modules are added. -p option
is used to control this process. Modules are divided into several
categories including eth, eth-gbit, ide and so on. To list then do
-``ls /usr/lib/bootdisk/targz/*-mod.tar.gz''.
+``ls /usr/lib/bootdisk/tarbz2/*-mod.tar.bz2''.
You can either include entire categories of modules, or include particular
modules. For example to include all ide modules and ne2k-pci and pcnet32
@@ -96,11 +96,11 @@
In this stage msdos bootdisk with syslinux is created.
First kernel image is copied from directory specified with -k option.
-(if -k option was not given targz/kernel directory is assumed, targz
-directory is /usr/lib/bootdisk/targz by default, use -t option to change
+(if -k option was not given tarbz2/kernel directory is assumed, tarbz2
+directory is /usr/lib/bootdisk/tarbz2 by default, use -t option to change
it). Kernel is assumed to resider in KERNEL-DIR/vmlinuz-KERNEL-VER
file. KERNEL-VER can be adjusted with -r option. Default is taken from
-targz/config/mkinstaller.conf file. For example to build bootdisk image
+tarbz2/config/mkinstaller.conf file. For example to build bootdisk image
for 2.4.5 kernel from /tmp one could use:
mkinstaller -r 2.4.5 -k /tmp
@@ -109,7 +109,7 @@
for example, when ``mkinstaller -i initrd.gz'' is given), and placed in
bootdisk image.
-After that all files from targz/floppy directory are copied. These files
+After that all files from tarbz2/floppy directory are copied. These files
include documentation and logo files, syslinux config and loader.
Then bootdisk information file is placed on the image. It can be shown
Modified: bootdisk/trunk/doc/images-readme
==============================================================================
--- bootdisk/trunk/doc/images-readme (original)
+++ bootdisk/trunk/doc/images-readme Mon Apr 2 19:11:33 2007
@@ -13,7 +13,7 @@
The second is suggested for not-so-expirienced users.
If you're installing from ide-cdrom, that is supported out of the box by
-linux kernel (most of they do) and iso with am-pkg.tar.gz, you only
+linux kernel (most of they do) and iso with am-pkg.tar.bz2, you only
need bootdisk.img, after that you'll be given oportunity to load am from
cdrom.
Modified: bootdisk/trunk/mkimages
==============================================================================
--- bootdisk/trunk/mkimages (original)
+++ bootdisk/trunk/mkimages Mon Apr 2 19:11:33 2007
@@ -17,22 +17,22 @@
opt="$opt -m floppy,vfat"
echo
echo "Making $name bootdisk."
- sh scripts/mkinstaller -t `pwd`/targz $kernel_opt $opt "$@" \
+ sh scripts/mkinstaller -t `pwd`/tarbz2 $kernel_opt $opt "$@" \
-I bootdisk_${name}.txt \
-o bootdisk_${name}.img
echo
echo "Making $name slow bootdisk."
- sh scripts/mkinstaller -t `pwd`/targz -a $kernel_opt $opt "$@" \
+ sh scripts/mkinstaller -t `pwd`/tarbz2 -a $kernel_opt $opt "$@" \
-I bootdisk_${name}_slow.txt \
-o bootdisk_${name}_slow.img
if [ "$name" = iso ] ; then
- sh scripts/mkinstaller -t `pwd`/targz -a $kernel_opt $opt "$@" \
+ sh scripts/mkinstaller -t `pwd`/tarbz2 -a $kernel_opt $opt "$@" \
-I bootdisk_iso_initrd.txt -s initrd \
-o initrd_${name}
echo -n "compressing... "
gzip -9nf initrd_${name}
echo "done"
- cp targz/kernel/vmlinuz-$KERNEL_VER vmlinuz
+ cp tarbz2/kernel/vmlinuz-$KERNEL_VER vmlinuz
fi
;;
ppc )
@@ -47,7 +47,7 @@
echo
echo "Making $name initrd."
- sh scripts/mkinstaller -t `pwd`/targz $kernel_opt $opt "$@" \
+ sh scripts/mkinstaller -t `pwd`/tarbz2 $kernel_opt $opt "$@" \
-I bootdisk_fake_${name}.txt \
-o initrd_${name} \
-s initrd
@@ -124,7 +124,7 @@
if [ "$short_cut" = yes ] ; then
# targetdir=/adm/ftp/dists/ra/PLD/i586/$INSTALLER_DIR
# mkdir -p $targetdir
-# cp targz/*.tar.gz $targetdir
+# cp tarbz2/*.tar.bz2 $targetdir
exit 0
fi
Modified: bootdisk/trunk/mod/Makefile.am
==============================================================================
--- bootdisk/trunk/mod/Makefile.am (original)
+++ bootdisk/trunk/mod/Makefile.am Mon Apr 2 19:11:33 2007
@@ -3,7 +3,7 @@
all: mod-stamp
mod-stamp: ../installer-rc mkmod modules
- rm -f *-mod.tar.gz
+ rm -f *-mod.tar.bz2
sh mkmod
touch mod-stamp
@@ -12,5 +12,5 @@
clean-local:
rm -f mod-stamp
- rm -f *-mod.tar.gz
+ rm -f *-mod.tar.bz2
rm -rf mod-root
Modified: bootdisk/trunk/mod/mkmod
==============================================================================
--- bootdisk/trunk/mod/mkmod (original)
+++ bootdisk/trunk/mod/mkmod Mon Apr 2 19:11:33 2007
@@ -95,7 +95,7 @@
done
cd ..
echo -n "dep "
- (cd mod-root && busybox tar -cf - *) | busybox gzip -9f > $mod-mod.tar.gz
+ (cd mod-root && tar -cf - *) | bzip2 -9f > $mod-mod.tar.bz2
rm -rf mod-root
echo done
}
Modified: bootdisk/trunk/pkg/Makefile.am
==============================================================================
--- bootdisk/trunk/pkg/Makefile.am (original)
+++ bootdisk/trunk/pkg/Makefile.am Mon Apr 2 19:11:33 2007
@@ -19,7 +19,7 @@
clean-local:
rm -f pkg-stamp
- rm -f *-pkg.tar.gz
+ rm -f *-pkg.tar.bz2
rm -rf pkg-root
rm -f *.cpio
Modified: bootdisk/trunk/pkg/mkpkg
==============================================================================
--- bootdisk/trunk/pkg/mkpkg (original)
+++ bootdisk/trunk/pkg/mkpkg Mon Apr 2 19:11:33 2007
@@ -69,7 +69,7 @@
finalize_pkg ()
{
echo -n "taring $pkg... "
- (cd pkg-root && busybox tar cf - .) | busybox gzip -9f > $pkg-pkg.tar.gz
+ (cd pkg-root && tar cf - .) | bzip2 -9f > $pkg-pkg.tar.bz2
rm -rf pkg-root
echo done
}
Modified: bootdisk/trunk/scripts/mkinstaller
==============================================================================
--- bootdisk/trunk/scripts/mkinstaller (original)
+++ bootdisk/trunk/scripts/mkinstaller Mon Apr 2 19:11:33 2007
@@ -10,7 +10,7 @@
set -e
-targz_dir=/usr/lib/bootdisk/targz
+tarbz2_dir=/usr/lib/bootdisk/tarbz2
kernel_dir=
kernel_rel=
modules=
@@ -98,7 +98,7 @@
shift
;;
-t)
- targz_dir="$1"
+ tarbz2_dir="$1"
shift
;;
-i)
@@ -192,7 +192,7 @@
May be given several times, modules are conctatet then.
-r KERNEL-RELEASE
- Default depends on TARGZ-DIR/config/mkinstaller.conf.
+ Default depends on TARBZ2-DIR/config/mkinstaller.conf.
-e ETC-FILES
Comma seprated list of files to copy to /etc in initrd.
@@ -202,8 +202,8 @@
-i INPUT-INITRD
Directories:
- -k KERNEL-DIR (TAR.GZ-PACKAGES-DIR/kernel by default)
- -t TAR.GZ-PACKAGES-DIR (/usr/lib/bootdisk/targz by default)
+ -k KERNEL-DIR (TAR.BZ2-PACKAGES-DIR/kernel by default)
+ -t TAR.BZ2-PACKAGES-DIR (/usr/lib/bootdisk/tarbz2 by default)
Options to modify image size:
-D
@@ -251,10 +251,10 @@
# load configuration parameters
if [ "$kernel_dir" = "" ] ; then
- kernel_dir=$targz_dir/kernel
+ kernel_dir=$tarbz2_dir/kernel
fi
-. $targz_dir/config/mkinstaller.conf
+. $tarbz2_dir/config/mkinstaller.conf
if [ "$kernel_rel" = "" ] ; then
kernel_rel=$kernel_ver
@@ -350,24 +350,24 @@
info "Kernel-ver: $kernel_rel"
echo ",$pkgs," | grep -q ',root,' || pkgs="root,$pkgs"
for i in $(echo $pkgs | tr "," " ") ; do
- f=$targz_dir/$i-pkg.tar.gz
- [ -f $f ] || die "cannot find $i in $targz_dir"
+ f=$tarbz2_dir/$i-pkg.tar.bz2
+ [ -f $f ] || die "cannot find $i in $tarbz2_dir"
verb "adding $f"
- tar -C $in_dir -zxf $f
+ tar -C $in_dir -jxf $f
info "Package: $i"
done
for i in $(echo $modules | tr "," " ") ; do
f=$(echo $i | sed -e 's|/.*||')
- f="$targz_dir/$f-mod.tar.gz"
+ f="$tarbz2_dir/$f-mod.tar.bz2"
m=$(echo $i | sed -e 's|[^/]*/*||' | sed -e 's|\.o||')
if [ "$m" = "" ] ; then
verb "adding all modules from $f"
- tar -C $in_dir/lib/modules/$kernel_rel/ -zxf $f
+ tar -C $in_dir/lib/modules/$kernel_rel/ -jxf $f
info "Module: $i/*"
else
verb "adding $m from $f"
- tar -C $in_dir/lib/modules/$kernel_rel/ -zxf $f $m.o
+ tar -C $in_dir/lib/modules/$kernel_rel/ -jxf $f $m.o
info "Module: $i"
fi
done
@@ -397,7 +397,7 @@
if test "$romfs" ; then
echo -n "Making devices..."
- for i in `cat $targz_dir/config/dev_genromfs`; do
+ for i in `cat $tarbz2_dir/config/dev_genromfs`; do
touch $dir/$i
done
echo "done"
@@ -405,7 +405,7 @@
else
genext2fs -e 0 -i 2000 -b $size \
-d $dir \
- -f $targz_dir/config/dev_genext2fs $initrd
+ -f $tarbz2_dir/config/dev_genext2fs $initrd
fi
}
@@ -463,7 +463,7 @@
verb "approx free space = $free_size kb"
info "Approx-free-kb: $free_size"
info "Slow-safe-stupid: $slow"
- for f in $targz_dir/floppy/* ; do
+ for f in $tarbz2_dir/floppy/* ; do
verb "copying $f"
mcopy $f w:$(basename $f)
done
Modified: bootdisk/trunk/scripts/rc
==============================================================================
--- bootdisk/trunk/scripts/rc (original)
+++ bootdisk/trunk/scripts/rc Mon Apr 2 19:11:33 2007
@@ -41,8 +41,8 @@
f=`sed -e 's/.* config=//' /proc/cmdline | sed -e 's/^\([^ ]*\).*/\1/'`
if test -r /media/floppy/$f ; then
cd /
- # support both .tar and .tar.gz
- zcat /media/floppy/$f | tar xf - || tar xf /media/floppy/$f
+ # support .tar, .tar.gz and tar.bz2
+ tar xf /media/floppy/$f || tar zxf /media/floppy/$f || tar jxf /media/floppy/$f
else
echo "Cannot find /media/floppy/$f..."
fi
More information about the pld-cvs-commit
mailing list