Sun Jun 3 13:18:06 2018 UTC ()
In the generated /etc/fstab, do not use the (temporary, during sysinst)
path name for the file in the comment, but instead the one it will
have on the target system.


(martin)
diff -r1.15 -r1.16 src/usr.sbin/sysinst/disks.c
cvs diff -r1.15 -r1.16 src/usr.sbin/sysinst/disks.c (expand / switch to unified diff)

--- src/usr.sbin/sysinst/disks.c 2018/06/03 13:16:30 1.15
+++ src/usr.sbin/sysinst/disks.c 2018/06/03 13:18:06 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: disks.c,v 1.15 2018/06/03 13:16:30 martin Exp $ */ 1/* $NetBSD: disks.c,v 1.16 2018/06/03 13:18:06 martin Exp $ */
2 2
3/* 3/*
4 * Copyright 1997 Piermont Information Systems Inc. 4 * Copyright 1997 Piermont Information Systems Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Written by Philip A. Nelson for Piermont Information Systems Inc. 7 * Written by Philip A. Nelson for Piermont Information Systems Inc.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
11 * are met: 11 * are met:
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
@@ -1029,28 +1029,28 @@ make_fstab(void) @@ -1029,28 +1029,28 @@ make_fstab(void)
1029 1029
1030 if (f == NULL) { 1030 if (f == NULL) {
1031 msg_display(MSG_createfstab); 1031 msg_display(MSG_createfstab);
1032 if (logfp) 1032 if (logfp)
1033 (void)fprintf(logfp, "Failed to make /etc/fstab!\n"); 1033 (void)fprintf(logfp, "Failed to make /etc/fstab!\n");
1034 process_menu(MENU_ok, NULL); 1034 process_menu(MENU_ok, NULL);
1035#ifndef DEBUG 1035#ifndef DEBUG
1036 return 1; 1036 return 1;
1037#else 1037#else
1038 f = stdout; 1038 f = stdout;
1039#endif 1039#endif
1040 } 1040 }
1041 1041
1042 scripting_fprintf(f, "# NetBSD %s/etc/fstab\n# See /usr/share/examples/" 1042 scripting_fprintf(f, "# NetBSD /etc/fstab\n# See /usr/share/examples/"
1043 "fstab/ for more examples.\n", target_prefix()); 1043 "fstab/ for more examples.\n");
1044 1044
1045 if (pm->no_part) { 1045 if (pm->no_part) {
1046 /* single dk? target */ 1046 /* single dk? target */
1047 char buf[200], parent[200], swap[200], *prompt; 1047 char buf[200], parent[200], swap[200], *prompt;
1048 int res; 1048 int res;
1049 1049
1050 if (!get_name_and_parent(pm->diskdev, buf, parent)) 1050 if (!get_name_and_parent(pm->diskdev, buf, parent))
1051 goto done_with_disks; 1051 goto done_with_disks;
1052 scripting_fprintf(f, "NAME=%s\t/\tffs\trw\t\t1 1\n", 1052 scripting_fprintf(f, "NAME=%s\t/\tffs\trw\t\t1 1\n",
1053 buf); 1053 buf);
1054 if (!find_swap_part_on(parent, swap)) 1054 if (!find_swap_part_on(parent, swap))
1055 goto done_with_disks; 1055 goto done_with_disks;
1056 asprintf(&prompt, msg_string(MSG_Auto_add_swap_part), 1056 asprintf(&prompt, msg_string(MSG_Auto_add_swap_part),