webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-26 19:00:34 +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

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