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

Hinzugefuegt:

Browse Source 
* p2protocols-Datei, die vergessen wurde.
Geaendert:
  * Connections.cgi gefixt.
  * URLFilter - Man kann keinen eigenen Background hochladen,
    bei der neuen redirect-Seite nichtmehr noetig.
  * Bootsplash gefixt - Neues Script im Installer.
  * Installer wieder hergestellt.
  * Im SSH den Zertifikatslogin per default ausgemacht.


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@205 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
delaco
2006-07-10 16:38:56 +00:00
parent d9b7aa3334
commit 5433e2c950
8 changed files with 74 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/install+setup/install/installbootsplash.sh Normal file
View File

@@ -0,0 +1,7 @@
#!/bin/sh
if [ -e /harddisk/boot/ipfirerd.img ]; then
/sbin/chroot /harddisk /sbin/splash -s -f /boot/splash/config/bootsplash-1024x768.cfg >> /harddisk/boot/ipfirerd.img
/sbin/chroot /harddisk /sbin/splash -s -f /boot/splash/config/bootsplash-1024x768.cfg >> /harddisk/boot/ipfirerd-smp.img
else
/sbin/chroot /harddisk /sbin/splash -s -f /boot/splash/config/bootsplash-1024x768.cfg > /harddisk/boot/initrd.splash
fi

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

@@ -193,16 +193,13 @@ int main(int argc, char *argv[])
sprintf (title, "%s v%s - %s", NAME, VERSION, SLOGAN);
newtWinMessage(title, ctr[TR_OK], message);
/* sprintf(message, ctr[TR_SELECT_INSTALLATION_MEDIA_LONG], NAME);
* rc = newtWinMenu(ctr[TR_SELECT_INSTALLATION_MEDIA], message,
* 50, 5, 5, 6, installtypes, &installtype, ctr[TR_OK],
* ctr[TR_CANCEL], NULL);
*
* if (rc == 2)
* goto EXIT;
* This is for avoiding the question for a network installation. Set to cdrom.
*/
sprintf(installtype, CDROM_INSTALL, NAME);
sprintf(message, ctr[TR_SELECT_INSTALLATION_MEDIA_LONG], NAME);
rc = newtWinMenu(ctr[TR_SELECT_INSTALLATION_MEDIA], message,
50, 5, 5, 6, installtypes, &installtype, ctr[TR_OK],
ctr[TR_CANCEL], NULL);
if (rc == 2)
goto EXIT;
if (installtype == CDROM_INSTALL)
{
@@ -963,12 +960,7 @@ RESTORE:
goto EXIT;
}
/* Set Bootsplash */
if ((handle = fopen("/scsidriver", "r")))
mysystem("/bin/chroot /harddisk /sbin/splash -s -f /boot/splash/config/bootsplash-1024x768.cgf >> /harddisk/boot/ipfirerd.img");
else
mysystem("/bin/chroot /harddisk /sbin/splash -s -f /boot/splash/config/bootsplash-1024x768.cgf > /harddisk/boot/initrd.splash");
if ((handle = fopen("/scsidriver", "r")))
mysystem("/bin/chroot /harddisk /sbin/splash -s -f /boot/splash/config/bootsplash-1024x768.cgf >> /harddisk/boot/ipfirerd-smp.img");
mysystem("/bin/installbootsplash.sh");
mysystem("/bin/chroot /harddisk /bin/umount -n /proc");
#endif
#ifdef __alpha__