webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 19:23:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change installation-tar compression from bzip2 to lzma.

Browse Source
This commit is contained in:
Arne Fitzenreiter
2010-02-21 13:13:27 +01:00
parent a6e3f4545f
commit dbf157bbaa
7 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/uClibc/busybox.config
View File

@@ -86,7 +86,7 @@ CONFIG_GZIP=y
CONFIG_TAR=y CONFIG_TAR=y
# CONFIG_FEATURE_TAR_CREATE is not set # CONFIG_FEATURE_TAR_CREATE is not set
CONFIG_FEATURE_TAR_BZIP2=y 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_FROM is not set
CONFIG_FEATURE_TAR_GZIP=y CONFIG_FEATURE_TAR_GZIP=y
# CONFIG_FEATURE_TAR_COMPRESS is not set # CONFIG_FEATURE_TAR_COMPRESS is not set

2
lfs/cdrom
View File

@@ -66,7 +66,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
tar -x -C /tmp -f /$(SNAME).tar tar -x -C /tmp -f /$(SNAME).tar
rm -f /$(SNAME).tar rm -f /$(SNAME).tar
@mkdir /tmp/sys @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 # Other files
sed 's/VERSION/$(VERSION)/' $(DIR_SRC)/config/cdrom/README.txt > /install/cdrom/README.txt sed 's/VERSION/$(VERSION)/' $(DIR_SRC)/config/cdrom/README.txt > /install/cdrom/README.txt

2
lfs/flash-images
View File

@@ -81,7 +81,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
mount -o loop $(IMGvar) $(MNThdd)/var mount -o loop $(IMGvar) $(MNThdd)/var
# Install IPFire # 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 "LANGUAGE=en" >> $(MNThdd)/var/ipfire/main/settings
echo "HOSTNAME=$(SNAME)" >> $(MNThdd)/var/ipfire/main/settings echo "HOSTNAME=$(SNAME)" >> $(MNThdd)/var/ipfire/main/settings
echo "THEME=ipfire" >> $(MNThdd)/var/ipfire/main/settings echo "THEME=ipfire" >> $(MNThdd)/var/ipfire/main/settings

2
lfs/xen-image
View File

@@ -86,7 +86,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
mount -o loop $(IMGvar) $(MNThdd)/var mount -o loop $(IMGvar) $(MNThdd)/var
# Install IPFire without kernel modules # 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* --exclude=lib/modules* --exclude=boot*
#Install Xen Kernel #Install Xen Kernel

2
src/install+setup/install/main.c
View File

@@ -439,7 +439,7 @@ int main(int argc, char *argv[])
} }
snprintf(commandstring, STRING_SIZE, 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, if (runcommandwithprogress(60, 4, title, commandstring, INST_FILECOUNT,
ctr[TR_INSTALLING_FILES])) ctr[TR_INSTALLING_FILES]))

16
src/install+setup/install/mountdest.sh
View File

@@ -25,7 +25,7 @@ echo "Scanning for possible destination drives"
echo "--> IDE" echo "--> IDE"
for DEVICE in $(kudzu -qps -t 30 -c HD -b IDE | grep device: | cut -d ' ' -f 2 | sort | uniq); do 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 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 umount /harddisk 2> /dev/null
echo "${DEVICE}1 is source drive - SKIP" echo "${DEVICE}1 is source drive - SKIP"
continue continue
@@ -41,14 +41,14 @@ done
echo "--> USB/SCSI" echo "--> USB/SCSI"
for DEVICE in $(kudzu -qps -t 30 -c HD -b SCSI | grep device: | cut -d ' ' -f 2 | sort | uniq); do 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 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 umount /harddisk 2> /dev/null
echo "${DEVICE} is source drive - SKIP" echo "${DEVICE} is source drive - SKIP"
continue continue
else else
umount /harddisk 2> /dev/null umount /harddisk 2> /dev/null
mount /dev/${DEVICE}1 /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 umount /harddisk 2> /dev/null
echo "${DEVICE}1 is source drive - SKIP" echo "${DEVICE}1 is source drive - SKIP"
continue continue
@@ -65,21 +65,21 @@ done
echo "--> RAID" echo "--> RAID"
for DEVICE in $(kudzu -qps -t 30 -c HD -b RAID | grep device: | cut -d ' ' -f 2 | sort | uniq); do 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 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 umount /harddisk 2> /dev/null
echo "${DEVICE}p1 is source drive - SKIP" echo "${DEVICE}p1 is source drive - SKIP"
continue continue
else else
umount /harddisk 2> /dev/null umount /harddisk 2> /dev/null
mount /dev/${DEVICE}1 /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 umount /harddisk 2> /dev/null
echo "${DEVICE}1 is source drive - SKIP" echo "${DEVICE}1 is source drive - SKIP"
continue continue
else else
umount /harddisk 2> /dev/null umount /harddisk 2> /dev/null
mount /dev/${DEVICE} /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 umount /harddisk 2> /dev/null
echo "${DEVICE} is source drive - SKIP" echo "${DEVICE} is source drive - SKIP"
continue continue
@@ -99,14 +99,14 @@ for DEVICE in vda vdb vdc vdd; do
continue continue
else else
mount /dev/${DEVICE} /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 umount /harddisk 2> /dev/null
echo "${DEVICE} is source drive - SKIP" echo "${DEVICE} is source drive - SKIP"
continue continue
else else
umount /harddisk 2> /dev/null umount /harddisk 2> /dev/null
mount /dev/${DEVICE}1 /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 umount /harddisk 2> /dev/null
echo "${DEVICE}1 is source drive - SKIP" echo "${DEVICE}1 is source drive - SKIP"
continue continue

6
src/install+setup/install/mountsource.sh
View File

@@ -24,7 +24,7 @@ echo "Scanning source media"
# scan CDROM devices # scan CDROM devices
for DEVICE in $(kudzu -qps -t 30 -c CDROM | grep device: | cut -d ' ' -f 2 | sort | uniq); do 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 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 -n ${DEVICE} > /tmp/source_device
echo "Found tarball on ${DEVICE}" echo "Found tarball on ${DEVICE}"
exit 0 exit 0
@@ -37,7 +37,7 @@ done
# scan HD device part1 (usb sticks, etc.) # 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 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 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 -n ${DEVICE}1 > /tmp/source_device
echo "Found tarball on ${DEVICE}1" echo "Found tarball on ${DEVICE}1"
exit 0 exit 0
@@ -50,7 +50,7 @@ done
# scan HD device unpart (usb sticks, etc.) # 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 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 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 -n ${DEVICE} > /tmp/source_device
echo "Found tarball on ${DEVICE}" echo "Found tarball on ${DEVICE}"
exit 0 exit 0