Nochmal was neues damit der endlich die CD auswirft...

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@605 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index 573b5f8bf20ab191e7baefb0f4a7d9c55c647b2f..3eab9845b3e8705fb2cd549878a97de0e8b3f9df 100644 (file)
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -23,7 +23,7 @@ my %modemsettings=();
 my %netsettings=();
 my %ddnssettings=();
 my $warnmessage = '';
-my $refresh = '';
+my $refresh = "";
 my $ipaddr='';
 
 &Header::showhttpheaders();
@@ -161,34 +161,6 @@ print <<END
 </table>
 END
 ;
-} else {
-       my $message='';
-       my $title='';
-       my $refresh = "<meta http-equiv='refresh' content='5; URL=/cgi-bin/index.cgi' />";
-       if ($death) {
-               $title = $Lang::tr{'shutting down'};
-               $message = $Lang::tr{'ipfire has now shutdown'};
-       } else {
-               $title = $Lang::tr{'rebooting'};
-               $message = $Lang::tr{'ipfire has now rebooted'};
-       }
-       &Header::openpage($title, 0, $refresh);
-
-       &Header::openbigbox('100%', 'center');
-       print <<END
-<div align='center'>
-<table width='100%' bgcolor='#ffffff'>
-<tr><td align='center'>
-<br /><br /><img src='/ipfire_big.gif' /><br /><br /><br />
-</td></tr>
-</table>
-<br />
-<font size='6'>$message</font>
-</div>
-END
-;
-}
-
 print <<END;
 
 <!-- Table of networks -->
@@ -382,7 +354,26 @@ print <<END;
 </table>
 
 END
-
+} else {
+       my $message='';
+       if ($death) {
+               $message = $Lang::tr{'ipfire has now shutdown'};
+       } else {
+               $message = $Lang::tr{'ipfire has now rebooted'};
+       }
+       print <<END
+<div align='center'>
+<table width='100%' bgcolor='#ffffff'>
+<tr><td align='center'>
+<br /><br /><img src='/ipfire_big.gif' /><br /><br /><br />
+</td></tr>
+</table>
+<br />
+<font size='6'>$message</font>
+</div>
+END
+;
+}
 &Header::closebox();
 &Header::closebigbox();
 &Header::closepage();

diff --git a/src/install+setup/install/cdrom.c b/src/install+setup/install/cdrom.c
index 9514226ffa6062ac7025d5a0a0d69c2615cd9d00..fdd526f7a479a4781b0089d0663a1dfeca9d714d 100644 (file)
--- a/src/install+setup/install/cdrom.c
+++ b/src/install+setup/install/cdrom.c
@@ -19,7 +19,7 @@ extern char **ctr;
 int ejectcdrom(char *dev)
 {
        char command;
-       sprintf(command, "eject -r %s", dev);
+       sprintf(command, "eject -r /dev/%s", dev);
        if (mysystem(command))
                return 0;
        else

diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index 0bb0b343eefb6a2301338402508e4bac006c1a37..6460a19bac7b97f85475f5dbff72145acfb301e5 100644 (file)
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -21,7 +21,6 @@
 #define REISERFS 1
 #define EXT3 2
 
-int raid_disk = 0;
 FILE *flog = NULL;
 char *mylog;
 
@@ -283,48 +282,6 @@ int main(int argc, char *argv[])
                }
        }
 
-       /*
-       // Need to clean this up at some point
-       // scsi disk is sdb/sdc when sda/sdb is used for usb-key
-       // if scsi-disk is sdd or more, it is not discovered
-       // Support only 2 usb keys, none could be unplugged
-       if (checkusb("sdb") && try_scsi("sdc")) {
-               scsi_disk = 1;
-               sprintf(harddrive, "sdc");
-               goto FOUND_DESTINATION;
-       }
-       if (checkusb("sda") && try_scsi("sdb")) {
-               scsi_disk = 1;
-               sprintf(harddrive, "sdb");
-               goto FOUND_DESTINATION;
-       }
-       if (try_scsi("sda")) {
-               scsi_disk = 1;
-               sprintf(harddrive, "sda");
-               goto FOUND_DESTINATION;
-       }
-       if (try_scsi("ida/c0d0")) {
-               raid_disk = 1;
-               sprintf(harddrive, "ida/c0d0");
-               goto FOUND_DESTINATION;
-       }
-       if (try_scsi("cciss/c0d0")) {
-               raid_disk = 1;
-               sprintf(harddrive, "cciss/c0d0");
-               goto FOUND_DESTINATION;
-       }
-       if (try_scsi("rd/c0d0")) {
-               raid_disk = 1;
-               sprintf(harddrive, "rd/c0d0");
-               goto FOUND_DESTINATION;
-       }
-       if (try_scsi("ataraid/d0")) {
-               raid_disk = 1;
-               sprintf(harddrive, "ataraid/d0");
-               goto FOUND_DESTINATION;
-       } */
-
-       FOUND_DESTINATION:
        if ((handle = fopen("/tmp/dest_device", "r")) == NULL) {
                errorbox(ctr[TR_NO_HARDDISK]);
                goto EXIT;
@@ -647,6 +604,9 @@ int main(int argc, char *argv[])
        }
 
        mysystem("ln -s grub.conf /harddisk/boot/grub/menu.lst");
+       
+       mysystem("umount /cdrom");
+       ejectcdrom(sourcedrive);
 
        if (!unattended) {
                sprintf(message, ctr[TR_CONGRATULATIONS_LONG],