Sophie

Sophie

distrib > Mandriva > 7.2 > i586 > media > main-src > by-pkgid > 5fd1c1a9e76d83bef94d83c33a15b734 > files > 5

lilo-0.21.5.1-4mdk.src.rpm

--- lilo-21.5/boot.c~	Fri Jul  7 06:33:27 2000
+++ lilo-21.5/boot.c	Mon Sep 25 23:33:22 2000
@@ -172,12 +172,15 @@
     struct stat st;
     char *pos;
     char npart[10];
+    char *vanilla_part = part;
     int i;
     int letter = 0;
 
     if (!loader) loader = DFL_CHAIN;
-    if (part && strlen(part)>0 && strlen(part)<=2) {
-    	if (part[1]==0 || part[1]==':') {
+    if (part && strlen(part)>0 && strlen(part)<=2) { 
+	/* This doesn't constitute a table=entry and thereby excludes
+	 * unsafe, though... --bero */
+   	if (part[1]==0 || part[1]==':') {
     	    letter = toupper(part[0]);
     	    if (letter>='C' && letter<='Z') {
     	    	letter += 0x80-'C';
@@ -199,7 +202,7 @@
 	  ? part : "",loader);
     if (cfg_get_flag(cf_other,"unsafe")) {
 	(void) geo_open_boot(&geo,boot);
-	if (part) die("TABLE and UNSAFE are mutually incompatible.");
+	if (vanilla_part) die("TABLE and UNSAFE are mutually incompatible.");
     }
     else {
 	b_fd = geo_open(&geo,boot,O_RDONLY);