Deleted Added
sdiff udiff text old ( 8432 ) new ( 8480 )
full compact
config.y (8432) config.y (8480)
1%union {
2 char *str;
3 int val;
4 struct file_list *file;
5 struct idlst *lst;
6}
7
8%token AND

--- 1019 unchanged lines hidden (view full) ---

1028 if (generic) {
1029 if (fl->f_rootdev != NODEV)
1030 yyerror("root device specified with generic swap");
1031 if (fl->f_dumpdev != NODEV)
1032 yyerror("dump device specified with generic swap");
1033 return;
1034 }
1035 /*
1%union {
2 char *str;
3 int val;
4 struct file_list *file;
5 struct idlst *lst;
6}
7
8%token AND

--- 1019 unchanged lines hidden (view full) ---

1028 if (generic) {
1029 if (fl->f_rootdev != NODEV)
1030 yyerror("root device specified with generic swap");
1031 if (fl->f_dumpdev != NODEV)
1032 yyerror("dump device specified with generic swap");
1033 return;
1034 }
1035 /*
1036 * Default dump device and warn if place is not a
1037 * swap area.
1036 * Warn if dump device is not a swap area.
1038 */
1037 */
1039 if (fl->f_dumpdev == NODEV)
1040 fl->f_dumpdev = swap->f_swapdev;
1041 if (fl->f_dumpdev != swap->f_swapdev) {
1038 if (fl->f_dumpdev != NODEV && fl->f_dumpdev != swap->f_swapdev) {
1042 struct file_list *p = swap->f_next;
1043
1044 for (; p && p->f_type == SWAPSPEC; p = p->f_next)
1045 if (fl->f_dumpdev == p->f_swapdev)
1046 return;
1047 (void) sprintf(buf,
1048 "Warning: dump device is not a swap partition");
1049 yyerror(buf);

--- 105 unchanged lines hidden --- 		1039 struct file_list *p = swap->f_next;
1040
1041 for (; p && p->f_type == SWAPSPEC; p = p->f_next)
1042 if (fl->f_dumpdev == p->f_swapdev)
1043 return;
1044 (void) sprintf(buf,
1045 "Warning: dump device is not a swap partition");
1046 yyerror(buf);

--- 105 unchanged lines hidden ---