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

GD-Graph fuer Maniac eingebaut

Browse Source 
Kernel laedt ab jetzt keine Module mehr ungefragt.
Nash aktualisiert um richtige Ramdisks zu erstellen (noch unstable).
pppsetup.cgi vom Maniac eingefuegt.


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@450 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2007-03-18 21:34:35 +00:00
parent c78a77ebeb
commit 330345c282
21 changed files with 2932 additions and 2227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -128,7 +128,6 @@ int main(int argc, char *argv[])
}
}
// make some beeps before wiping the system :)
if (unattended) {
runcommandwithstatus("/bin/sleep 10", "WARNING: Unattended installation will start in 10 seconds...");
}
@@ -165,8 +164,7 @@ int main(int argc, char *argv[])
rc = newtWinMenu(ctr[TR_SELECT_INSTALLATION_MEDIA], message,
50, 5, 5, 6, installtypes, &installtype, ctr[TR_OK],
ctr[TR_CANCEL], NULL);
}
else {
} else {
rc = 1;
installtype = CDROM_INSTALL;
}
@@ -179,7 +177,6 @@ int main(int argc, char *argv[])
/* CDROM INSTALL */
if (installtype == CDROM_INSTALL) {
switch (mysystem("/bin/mountsource.sh")) {
case 0:
installtype = CDROM_INSTALL;
@@ -215,7 +212,7 @@ int main(int argc, char *argv[])
goto EXIT;
}
/* Check for ipcop-<VERSION>.tbz2 */
/* Check for ipfire-<VERSION>.tbz2 */
if (checktarball(SNAME "-" VERSION ".tbz2", ctr[TR_ENTER_URL])) {
errorbox(ctr[TR_NO_IPCOP_TARBALL_FOUND]);
goto EXIT;
@@ -527,30 +524,6 @@ int main(int argc, char *argv[])
mysystem("/bin/mount -t proc none /harddisk/proc");
mysystem("/bin/mount --bind /dev /harddisk/dev");
/* if we detected SCSI then fixup */
/* doesn't really work cause it sometimes creates a ramdisk on ide systems */
/* mysystem("/bin/probecntrl.sh");
if ((handle = fopen("/cntrldriver", "r")))
{
char *driver;
fgets(line, STRING_SIZE-1, handle);
fclose(handle);
line[strlen(line) - 1] = 0;
driver = strtok(line, ".");
fprintf(flog, "Detected SCSI driver %s\n",driver);
if (strlen(driver) > 1) {
fprintf(flog, "Fixing up ipfirerd.img\n");
mysystem("/sbin/chroot /harddisk /sbin/modprobe loop");
mkdir("/harddisk/initrd", S_IRWXU|S_IRWXG|S_IRWXO);
snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitrd --with=scsi_mod --with=%s --with=sd_mod --with=sr_mod --with=libata /boot/ipfirerd.img %s", driver, KERNEL_VERSION);
runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitrd --with=scsi_mod --with=%s --with=sd_mod --with=sr_mod --with=libata /boot/ipfirerd-smp.img %s-smp", driver, KERNEL_VERSION);
runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
mysystem("/sbin/chroot /harddisk /bin/mv /boot/grub/scsigrub.conf /boot/grub/grub.conf");
}
} */
/* Build cache lang file */
snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /usr/bin/perl -e \"require '" CONFIG_ROOT "/lang.pl'; &Lang::BuildCacheLang\"");
if (runcommandwithstatus(commandstring, ctr[TR_INSTALLING_LANG_CACHE]))
@@ -559,6 +532,29 @@ int main(int argc, char *argv[])
goto EXIT;
}
/* Update /etc/fstab */
replace("/harddisk/etc/fstab", "DEVICE", hdparams.devnode);
/* if we detected SCSI/USB then fixup */
mysystem("/bin/probecntrl.sh");
if ((handle = fopen("/tmp/cntrldriver", "r")))
{
char *driver;
fgets(line, STRING_SIZE-1, handle);
fclose(handle);
line[strlen(line) - 1] = 0;
driver = strtok(line, ".");
if (strlen(driver) > 1) {
fprintf(flog, "Fixing up ipfirerd.img\n");
mkdir("/harddisk/initrd", S_IRWXU|S_IRWXG|S_IRWXO);
snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitrd --with=scsi_mod %s --with=sd_mod --with=sr_mod /boot/ipfirerd.img %s-ipfire", driver, KERNEL_VERSION);
runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitrd --with=scsi_mod %s --with=sd_mod --with=sr_mod /boot/ipfirerd-smp.img %s-ipfire-smp", driver, KERNEL_VERSION);
runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
mysystem("/sbin/chroot /harddisk /bin/mv /boot/grub/scsigrub.conf /boot/grub/grub.conf");
}
}
if (raid_disk)
sprintf(string, "root=%sp3", hdparams.devnode);
else
@@ -576,9 +572,6 @@ int main(int argc, char *argv[])
goto EXIT;
}
/* Update /etc/fstab */
replace("/harddisk/etc/fstab", "DEVICE", hdparams.devnode);
/* Install bootsplash */
mysystem("/bin/installbootsplash.sh");

22
src/install+setup/install/probecntrl.sh
View File

@@ -1,13 +1,19 @@
#!/bin/sh
echo "Probing for SCSI controllers"
MODULE=`/bin/kudzu -qps -t 30 -c SCSI | grep driver | cut -d ' ' -f 2 | sort | uniq`
echo "Probing for storage controllers"
for MODULE in $(hwinfo --usb --usb-ctrl --storage-ctrl | grep modprobe | awk '{ print $5 }' | tr -d \" | sort | uniq); do
if [ "${MODULE}" = "piix" ]; then
continue
fi
if grep -Eqe "^${MODULE} " /proc/modules; then
MODULES="${MODULES} --with=${MODULE}"
echo "Found: ${MODULE}"
fi
done
if [ "$MODULE" ]; then
echo $MODULE > /tmp/cntrldriver
echo "Your controller is: $MODULE"
if [ -z "${MODULES}" ]; then
exit 1
else
echo "${MODULES}" > /tmp/cntrldriver
exit 0
fi
echo "No SCSI controller found"
exit 1

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

@@ -15,7 +15,7 @@
* along with IPFire; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Copyright 2002: Mark Wormgoor <mark@wormgoor.com>
* Copyright 2007: Michael Tremer for www.ipfire.org
*
*/

3
src/install+setup/install/usb.c
View File

@@ -29,6 +29,7 @@ int initialize_usb() {
mysystem("/sbin/modprobe sd_mod");
mysystem("/sbin/modprobe sr_mod");
mysystem("/sbin/modprobe usb-storage");
mysystem("/sbin/modprobe vfat");
if (ehcihcd) {
mysystem("/sbin/rmmod ehci-hcd");
@@ -51,7 +52,7 @@ int initialize_usb() {
usbuhci = 1;
mysystem("/sbin/modprobe usbhid");
mysystem("udevstart");
mysystem("/sbin/udevstart");
return 0;
}