X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=src%2Finstall%2Bsetup%2Finstall%2Fmain.c;h=9cffceac295f7959edf51b5e296d115aba5a4d8c;hp=2756f3e720888210aa20db3228d47f96de8aa0ee;hb=33634aa878e26c61424ed0160174f93431cca3cf;hpb=02c629b9ffbb8ff44d77db122cdbc728a7e87191

diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index 2756f3e720..9cffceac29 100644
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -15,7 +15,7 @@
 #define URL_INSTALL 1
 #define DISK_INSTALL 2
 #define INST_FILECOUNT 6600
-#define UNATTENDED_CONF "/cdrom/data/unattended.conf"
+#define UNATTENDED_CONF "/cdrom/boot/unattended.conf"
 
 int raid_disk = 0;
 FILE *flog = NULL;
@@ -347,7 +347,7 @@ int main(int argc, char *argv[])
 
 	// make some beeps before wiping the system :)
 	if (unattended) {
-	    runcommandwithstatus("/bin/beep -f 450 -r 10 -D 800 -n -f 900 -l 1000", "WARNING: Unattended installation will start in 10 seconds...");
+	    runcommandwithstatus("/bin/sleep 10", "WARNING: Unattended installation will start in 10 seconds...");
  	}
 	
 	/* German is the default */
@@ -370,7 +370,7 @@ int main(int argc, char *argv[])
 
 	mysystem("/bin/setfont lat0-16");
 
-	newtDrawRootText(14, 0, NAME " v" VERSION " - " SLOGAN );
+	newtDrawRootText(14, 0, NAME " " VERSION " - " SLOGAN );
 	newtPushHelpLine(ctr[TR_HELPLINE]);
 
 	if (!unattended) {
@@ -412,7 +412,8 @@ int main(int argc, char *argv[])
 
 		/* read source drive letter */
 		if ((handle = fopen("/source_device", "r")) == NULL) {
-		    errorbox("ERROR reading source_device");
+			errorbox(ctr[TR_ERROR_PROBING_CDROM]);
+			goto EXIT;
 		}
 		fgets(sourcedrive, 5, handle);
 		fprintf(flog, "Source drive: %s\n", sourcedrive);