webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Dem Installer ne bessere Rechnung fuer die Diskgroessen bekommen.

Browse Source 
Ices-0 eingebaut.
PCI- und USB-IDs aktualisiert.
libmagic eingebaut fuer den mldonkey.
Torrent braucht keine UDP-Ports.


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@831 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2007-08-25 21:40:23 +00:00
parent 65798afe4e
commit 66294b6996
11 changed files with 1121 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
config/rootfiles/common/file
View File

@@ -1,16 +1,16 @@
#usr/bin/file
usr/bin/file
#usr/include/magic.h
#usr/lib/libmagic.a
#usr/lib/libmagic.la
#usr/lib/libmagic.so
#usr/lib/libmagic.so.1
#usr/lib/libmagic.so.1.0.0
usr/lib/libmagic.so
usr/lib/libmagic.so.1
usr/lib/libmagic.so.1.0.0
#usr/man/man1/file.1
#usr/man/man3/libmagic.3
#usr/man/man4
#usr/man/man4/magic.4
#usr/share/file
#usr/share/file/magic
#usr/share/file/magic.mgc
#usr/share/file/magic.mime
#usr/share/file/magic.mime.mgc
usr/share/file/magic
usr/share/file/magic.mgc
usr/share/file/magic.mime
usr/share/file/magic.mime.mgc

1
doc/packages-list.txt
View File

@@ -108,6 +108,7 @@
* hwdata
* iana-etc-2.10
* icecast-2.3.1
* ices-0.4
* ices-2.0.1
* iftop-0.17
* inetutils-1.4.2

10
lfs/ices
View File

@@ -26,10 +26,10 @@
include Config
VER = 2.0.1
VER = 0.4
THISAPP = ices-$(VER)
DL_FILE = $(THISAPP).tar.bz2
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 8c7be81b304c4ce588f43b9d02603f6e
$(DL_FILE)_MD5 = d31450c4011561dae0229f071cb41cb6
install : $(TARGET)
@@ -80,8 +80,8 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc
cd $(DIR_APP) && make
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)

7
make.sh
View File

@@ -1014,13 +1014,6 @@ pxe)
lang)
update_langs
;;
packages)
case "$2" in
sign)
sign_packages
;;
esac
;;
"")
clear
svn info

721
src/hwdata/pci.ids
View File

File diff suppressed because it is too large Load Diff

485
src/hwdata/usb.ids
View File

File diff suppressed because it is too large Load Diff

1
src/initscripts/init.d/ipfireseeder
View File

@@ -24,7 +24,6 @@ case "${1}" in
/var/ipfire/seeder/*.torrent
if ! grep -q "35700:35705" /var/ipfire/xtaccess/config ; then
echo "tcp,0.0.0.0/0,35700:35705,on,0.0.0.0,IPFireSeeder" >> /var/ipfire/xtaccess/config
echo "udp,0.0.0.0/0,35700:35705,on,0.0.0.0,IPFireSeeder" >> /var/ipfire/xtaccess/config
/usr/local/bin/setxtaccess
fi
;;

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

@@ -81,7 +81,7 @@ int main(int argc, char *argv[])
FILE *handle, *cmdfile;
char line[STRING_SIZE];
char string[STRING_SIZE];
long memory = 0; disk = 0, free;
long memory = 0, disk = 0, free;
long system_partition, boot_partition, root_partition, swap_file;
int scsi_disk = 0;
char *yesnoharddisk[3]; // char *yesnoharddisk = { "NO", "YES", NULL };
@@ -352,34 +352,44 @@ int main(int argc, char *argv[])
fprintf(flog, "Disksize = %ld, memory = %ld", disk, memory);
/* Calculating Swap-Size dependend of Ram Size */
if (memory < 128) { swap_file = 256; }
else if (memory > 1024) { swap_file = 512; }
else { swap_file = memory;}
if (memory < 128)
swap_file = 32;
else if (memory > 1024)
swap_file = 512;
else
swap_file = memory;
/* Calculating Root-Size dependend of Max Disk Space */
if ( disk < 512 ) { errorbox(ctr[TR_DISK_TOO_SMALL]);goto EXIT; }
else if ( disk < 1024 && disk > 512 ) { root_partition = 256; }
else if ( disk > 1024 && disk < 2048 ) { root_partition = 512; }
else { root_partition = 2048; }
if ( disk < 1024 )
root_partition = 256;
else if ( disk > 1024 && disk < 3072 )
root_partition = 512;
else
root_partition = 2048;
/* Calculating the amount of free space */
boot_partition = 20; /* in MB */
system_partition = disk - ( root_partition + swap_file + boot_partition );
if (!unattended) {
rc = newtWinChoice(title, ctr[TR_OK], ctr[TR_CANCEL], ctr[TR_CONTINUE_NO_SWAP]);
} else {
rc = 1;
}
if (rc != 1)
goto EXIT;
swap_file = 0;
}
fprintf(flog, "boot = %ld, swap = %ld, mylog = %ld, root = %ld\n",
boot_partition, swap_file, system_partition, root_partition);
fprintf(flog, ", boot = %ld, swap = %ld, mylog = %ld, root = %ld\n",
boot_partition, swap_file, system_partition, root_partition);
if ( (!unattended) && (((disk - (root_partition + swap_file + boot_partition)) < 256 ) && ((disk - (root_partition + boot_partition)) > 256)) ) {
rc = newtWinChoice(title, ctr[TR_CONTINUE_NO_SWAP], ctr[TR_OK], ctr[TR_CANCEL]);
}
else if (disk - (root_partition + swap_file + boot_partition) > 256) {
}
else {
fprintf(flog, "Disk is too small.\n");
errorbox(ctr[TR_DISK_TOO_SMALL]);goto EXIT;
}
if (rc != 1){
swap_file = 0;
fprintf(flog, "Changing Swap Size to 0.\n");
}
handle = fopen("/tmp/partitiontable", "w");
/* Make swapfile */

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

@@ -5,7 +5,6 @@ echo "Scanning for possible destination drives"
# scan IDE devices
echo "--> IDE"
for DEVICE in $(kudzu -qps -t 30 -c HD -b IDE | grep device: | cut -d ' ' -f 2 | sort | uniq); do
echo -n "---> $DEVICE"
mount /dev/${DEVICE}1 /harddisk 2> /dev/null
if [ -n "$(ls /harddisk/ipfire-*.tbz2 2>/dev/null)" ]; then
umount /harddisk 2> /dev/null
@@ -22,7 +21,6 @@ done
# scan USB/SCSI devices
echo "--> USB/SCSI"
for DEVICE in $(kudzu -qps -t 30 -c HD -b SCSI | grep device: | cut -d ' ' -f 2 | sort | uniq); do
echo -n "---> $DEVICE"
mount /dev/${DEVICE}1 /harddisk 2> /dev/null
if [ -n "$(ls /harddisk/ipfire-*.tbz2 2>/dev/null)" ]; then
umount /harddisk 2> /dev/null
@@ -39,7 +37,6 @@ done
# scan RAID devices
echo "--> RAID"
for DEVICE in $(kudzu -qps -t 30 -c HD -b RAID | grep device: | cut -d ' ' -f 2 | sort | uniq); do
echo -n "---> $DEVICE"
mount /dev/${DEVICE}p1 /harddisk 2> /dev/null
if [ -n "$(ls /harddisk/ipfire-*.tbz2 2>/dev/null)" ]; then
umount /harddisk 2> /dev/null

33
tools/make-functions
View File

@@ -487,7 +487,6 @@ batch_script() {
evaluate 1 mail_me ISO
echo -ne "### UPLOADING PAKS"
$0 packages sign
$0 upload paks
evaluate 1 mail_me PAKS
@@ -713,35 +712,3 @@ update_langs() {
$BASEDIR/tools/check_langs.sh > $BASEDIR/doc/language_missings
beautify message DONE
}
sign_packages() {
if gpg --list-key 64D96617 ; then
if [ -d "$BASEDIR/packages" ]; then
cd $BASEDIR/packages
for i in `ls $BASEDIR/packages/*.ipfire`; do
echo -n "Signing $i"
echo $GPG_PASSPHRASE | gpg --compress-algo 3 --sign --armor -u 64D96617 --passphrase-fd 0 $i
if [ "$?" -eq "0" ]; then
beautify message DONE
mv -f $i.asc $i
else
beautify message FAIL
fi
done
for i in `ls $BASEDIR/packages/meta-*`; do
echo -n "Signing $i"
echo $GPG_PASSPHRASE | gpg --clearsign --armor -u 64D96617 --passphrase-fd 0 $i
if [ "$?" -eq "0" ]; then
beautify message DONE
mv -f $i.asc $i
else
beautify message FAIL
fi
done
cd -
fi
else
echo -n "You don't have the secret key to sign ipfire's packages!"
beautify message FAIL
fi
}

47
tools/make_pkg_list.py
View File

@@ -1,47 +0,0 @@
#!/usr/bin/python
import sys
import os
def usage():
print '''Usage:
$0 <dir>
Where <dir> is the path to the metas.'''
if len(sys.argv) < 2:
usage()
sys.exit()
dir = sys.argv[1]
if not os.path.exists(dir):
print dir, "doesn't exist."
usage()
sys.exit()
dst = file(dir+"/packages_list.db", "w")
for i in os.listdir(dir):
if not os.path.isfile(dir+"/"+i):
print "Is a directory", i
continue
if not i.startswith('meta-'):
print "Is no meta file", i
continue
src = file(dir+"/"+i)
for i in src.readlines():
i = i.rstrip("\n")
if i.startswith("Name:"):
trash,name = i.split(": ")
elif i.startswith("ProgVersion:"):
trash,ver = i.split(": ")
elif i.startswith("Release:"):
trash,rel = i.split(": ")
src.close()
dst.write(name+";"+ ver +";"+ rel +";\n")
dst.close()