This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via dbf157bbaa613a356b3ca5f6d294147f1daded2e (commit) from a6e3f4545f0ecf8e75f61116b3c79bb4d7414d0b (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit dbf157bbaa613a356b3ca5f6d294147f1daded2e Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Feb 21 13:13:27 2010 +0100
Change installation-tar compression from bzip2 to lzma.
-----------------------------------------------------------------------
Summary of changes: config/uClibc/busybox.config | 2 +- lfs/cdrom | 2 +- lfs/flash-images | 2 +- lfs/xen-image | 2 +- src/install+setup/install/main.c | 2 +- src/install+setup/install/mountdest.sh | 16 ++++++++-------- src/install+setup/install/mountsource.sh | 6 +++--- 7 files changed, 16 insertions(+), 16 deletions(-)
Difference in files: diff --git a/config/uClibc/busybox.config b/config/uClibc/busybox.config index dfe2a30..9682385 100644 --- a/config/uClibc/busybox.config +++ b/config/uClibc/busybox.config @@ -86,7 +86,7 @@ CONFIG_GZIP=y CONFIG_TAR=y # CONFIG_FEATURE_TAR_CREATE is not set CONFIG_FEATURE_TAR_BZIP2=y -# CONFIG_FEATURE_TAR_LZMA is not set +CONFIG_FEATURE_TAR_LZMA=y # CONFIG_FEATURE_TAR_FROM is not set CONFIG_FEATURE_TAR_GZIP=y # CONFIG_FEATURE_TAR_COMPRESS is not set diff --git a/lfs/cdrom b/lfs/cdrom index 5fa6730..d5df330 100644 --- a/lfs/cdrom +++ b/lfs/cdrom @@ -66,7 +66,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) tar -x -C /tmp -f /$(SNAME).tar rm -f /$(SNAME).tar @mkdir /tmp/sys - cd /tmp && tar jcf /install/cdrom/$(SNAME)-$(VERSION).tbz2 * && rm -rf * + cd /tmp && tar cf /install/cdrom/$(SNAME)-$(VERSION).tlz --lzma * && rm -rf *
# Other files sed 's/VERSION/$(VERSION)/' $(DIR_SRC)/config/cdrom/README.txt > /install/cdrom/README.txt diff --git a/lfs/flash-images b/lfs/flash-images index 2906140..f3353ff 100644 --- a/lfs/flash-images +++ b/lfs/flash-images @@ -81,7 +81,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) mount -o loop $(IMGvar) $(MNThdd)/var
# Install IPFire - tar -C $(MNThdd)/ -xvjf /install/cdrom/$(SNAME)-$(VERSION).tbz2 + tar -C $(MNThdd)/ -xvf /install/cdrom/$(SNAME)-$(VERSION).tlz --lzma echo "LANGUAGE=en" >> $(MNThdd)/var/ipfire/main/settings echo "HOSTNAME=$(SNAME)" >> $(MNThdd)/var/ipfire/main/settings echo "THEME=ipfire" >> $(MNThdd)/var/ipfire/main/settings diff --git a/lfs/xen-image b/lfs/xen-image index 632d639..a6e4f36 100644 --- a/lfs/xen-image +++ b/lfs/xen-image @@ -86,7 +86,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) mount -o loop $(IMGvar) $(MNThdd)/var
# Install IPFire without kernel modules - tar -C $(MNThdd)/ -xvjf /install/cdrom/$(SNAME)-$(VERSION).tbz2 \ + tar -C $(MNThdd)/ -xvf /install/cdrom/$(SNAME)-$(VERSION).tlz --lzma \ --exclude=lib/modules* --exclude=boot*
#Install Xen Kernel diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index 74f2974..76d37c2 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -439,7 +439,7 @@ int main(int argc, char *argv[]) }
snprintf(commandstring, STRING_SIZE, - "/bin/tar -C /harddisk -xvjf /cdrom/" SNAME "-" VERSION ".tbz2"); + "/bin/tar -C /harddisk -xvf /cdrom/" SNAME "-" VERSION ".tlz --lzma"); if (runcommandwithprogress(60, 4, title, commandstring, INST_FILECOUNT, ctr[TR_INSTALLING_FILES])) diff --git a/src/install+setup/install/mountdest.sh b/src/install+setup/install/mountdest.sh index 11fd800..a824233 100644 --- a/src/install+setup/install/mountdest.sh +++ b/src/install+setup/install/mountdest.sh @@ -25,7 +25,7 @@ echo "Scanning for possible destination drives" echo "--> IDE" for DEVICE in $(kudzu -qps -t 30 -c HD -b IDE | grep device: | cut -d ' ' -f 2 | sort | uniq); do mount /dev/${DEVICE}1 /harddisk 2> /dev/null - if [ -n "$(ls /harddisk/ipfire-*.tbz2 2>/dev/null)" ]; then + if [ -n "$(ls /harddisk/ipfire-*.tlz 2>/dev/null)" ]; then umount /harddisk 2> /dev/null echo "${DEVICE}1 is source drive - SKIP" continue @@ -41,14 +41,14 @@ done echo "--> USB/SCSI" for DEVICE in $(kudzu -qps -t 30 -c HD -b SCSI | grep device: | cut -d ' ' -f 2 | sort | uniq); do mount /dev/${DEVICE} /harddisk 2> /dev/null - if [ -n "$(ls /harddisk/ipfire-*.tbz2 2>/dev/null)" ]; then + if [ -n "$(ls /harddisk/ipfire-*.tlz 2>/dev/null)" ]; then umount /harddisk 2> /dev/null echo "${DEVICE} is source drive - SKIP" continue else umount /harddisk 2> /dev/null mount /dev/${DEVICE}1 /harddisk 2> /dev/null - if [ -n "$(ls /harddisk/ipfire-*.tbz2 2>/dev/null)" ]; then + if [ -n "$(ls /harddisk/ipfire-*.tlz 2>/dev/null)" ]; then umount /harddisk 2> /dev/null echo "${DEVICE}1 is source drive - SKIP" continue @@ -65,21 +65,21 @@ done echo "--> RAID" for DEVICE in $(kudzu -qps -t 30 -c HD -b RAID | grep device: | cut -d ' ' -f 2 | sort | uniq); do mount /dev/${DEVICE}p1 /harddisk 2> /dev/null - if [ -n "$(ls /harddisk/ipfire-*.tbz2 2>/dev/null)" ]; then + if [ -n "$(ls /harddisk/ipfire-*.tlz 2>/dev/null)" ]; then umount /harddisk 2> /dev/null echo "${DEVICE}p1 is source drive - SKIP" continue else umount /harddisk 2> /dev/null mount /dev/${DEVICE}1 /harddisk 2> /dev/null - if [ -n "$(ls /harddisk/ipfire-*.tbz2 2>/dev/null)" ]; then + if [ -n "$(ls /harddisk/ipfire-*.tlz 2>/dev/null)" ]; then umount /harddisk 2> /dev/null echo "${DEVICE}1 is source drive - SKIP" continue else umount /harddisk 2> /dev/null mount /dev/${DEVICE} /harddisk 2> /dev/null - if [ -n "$(ls /harddisk/ipfire-*.tbz2 2>/dev/null)" ]; then + if [ -n "$(ls /harddisk/ipfire-*.tlz 2>/dev/null)" ]; then umount /harddisk 2> /dev/null echo "${DEVICE} is source drive - SKIP" continue @@ -99,14 +99,14 @@ for DEVICE in vda vdb vdc vdd; do continue else mount /dev/${DEVICE} /harddisk 2> /dev/null - if [ -n "$(ls /harddisk/ipfire-*.tbz2 2>/dev/null)" ]; then + if [ -n "$(ls /harddisk/ipfire-*.tlz 2>/dev/null)" ]; then umount /harddisk 2> /dev/null echo "${DEVICE} is source drive - SKIP" continue else umount /harddisk 2> /dev/null mount /dev/${DEVICE}1 /harddisk 2> /dev/null - if [ -n "$(ls /harddisk/ipfire-*.tbz2 2>/dev/null)" ]; then + if [ -n "$(ls /harddisk/ipfire-*.tlz 2>/dev/null)" ]; then umount /harddisk 2> /dev/null echo "${DEVICE}1 is source drive - SKIP" continue diff --git a/src/install+setup/install/mountsource.sh b/src/install+setup/install/mountsource.sh index 5c654a1..bb7a7e2 100644 --- a/src/install+setup/install/mountsource.sh +++ b/src/install+setup/install/mountsource.sh @@ -24,7 +24,7 @@ echo "Scanning source media" # scan CDROM devices for DEVICE in $(kudzu -qps -t 30 -c CDROM | grep device: | cut -d ' ' -f 2 | sort | uniq); do mount /dev/${DEVICE} /cdrom 2> /dev/null - if [ -n "$(ls /cdrom/ipfire-*.tbz2 2>/dev/null)" ]; then + if [ -n "$(ls /cdrom/ipfire-*.tlz 2>/dev/null)" ]; then echo -n ${DEVICE} > /tmp/source_device echo "Found tarball on ${DEVICE}" exit 0 @@ -37,7 +37,7 @@ done # scan HD device part1 (usb sticks, etc.) for DEVICE in $(kudzu -qps -t 30 -c HD | grep device: | cut -d ' ' -f 2 | sort | uniq); do mount /dev/${DEVICE}1 /cdrom 2> /dev/null - if [ -n "$(ls /cdrom/ipfire-*.tbz2 2>/dev/null)" ]; then + if [ -n "$(ls /cdrom/ipfire-*.tlz 2>/dev/null)" ]; then echo -n ${DEVICE}1 > /tmp/source_device echo "Found tarball on ${DEVICE}1" exit 0 @@ -50,7 +50,7 @@ done # scan HD device unpart (usb sticks, etc.) for DEVICE in $(kudzu -qps -t 30 -c HD | grep device: | cut -d ' ' -f 2 | sort | uniq); do mount /dev/${DEVICE} /cdrom 2> /dev/null - if [ -n "$(ls /cdrom/ipfire-*.tbz2 2>/dev/null)" ]; then + if [ -n "$(ls /cdrom/ipfire-*.tlz 2>/dev/null)" ]; then echo -n ${DEVICE} > /tmp/source_device echo "Found tarball on ${DEVICE}" exit 0
hooks/post-receive -- IPFire 2.x development tree