summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sysinstall
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>2001-05-06 02:52:45 +0000
committerjkh <jkh@FreeBSD.org>2001-05-06 02:52:45 +0000
commit43e5432dcb7ba27d1fd948003fd0048bca8ff12d (patch)
tree64a05c14c1782e59e58eaacfc4b9bcb15bfaa75c /usr.sbin/sysinstall
parent8b92d38aa9c8a05a99eba0fc1fb2f875d0e877cd (diff)
downloadFreeBSD-src-43e5432dcb7ba27d1fd948003fd0048bca8ff12d.zip
FreeBSD-src-43e5432dcb7ba27d1fd948003fd0048bca8ff12d.tar.gz
Make soft updates option print more nicely and stop overflow of
right-hand margin when set in 2nd column. Also do a small amount of code cleanup.
Diffstat (limited to 'usr.sbin/sysinstall')
-rw-r--r--usr.sbin/sysinstall/label.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/usr.sbin/sysinstall/label.c b/usr.sbin/sysinstall/label.c
index d59fcfa..a6940e8 100644
--- a/usr.sbin/sysinstall/label.c
+++ b/usr.sbin/sysinstall/label.c
@@ -412,13 +412,13 @@ getNewfsCmd(PartInfo *p)
sstrncpy(p->newfs_cmd, val, NEWFS_CMD_MAX);
}
-#define MAX_MOUNT_NAME 10
+#define MAX_MOUNT_NAME 9
#define PART_PART_COL 0
#define PART_MOUNT_COL 10
#define PART_SIZE_COL (PART_MOUNT_COL + MAX_MOUNT_NAME + 3)
#define PART_NEWFS_COL (PART_SIZE_COL + 8)
-#define PART_OFF 39
+#define PART_OFF 38
#define TOTAL_AVAIL_LINES (10)
#define PSLICE_SHOWABLE (4)
@@ -578,9 +578,12 @@ print_label_chunks(void)
strcpy(newfs, "DOS");
else if (label_chunk_info[i].c->private_data && label_chunk_info[i].type == PART_FILESYSTEM) {
strcpy(newfs, "UFS");
- if (((PartInfo *)label_chunk_info[i].c->private_data)->soft)
- strcat(newfs, "+S");
- strcat(newfs, ((PartInfo *)label_chunk_info[i].c->private_data)->newfs ? " Y" : " N");
+ strcat(newfs,
+ ((PartInfo *)label_chunk_info[i].c->private_data)->soft ?
+ "+S" : " ");
+ strcat(newfs,
+ ((PartInfo *)label_chunk_info[i].c->private_data)->newfs ?
+ " Y" : " N");
}
else if (label_chunk_info[i].type == PART_SWAP)
strcpy(newfs, "SWAP");
OpenPOWER on IntegriCloud