Module Name: src Committed By: abs Date: Fri Jan 2 19:43:14 UTC 2015
Modified Files: src/usr.sbin/sysinst: defs.h disks.c install.c partman.c upgrade.c src/usr.sbin/sysinst/arch/arc: md.c src/usr.sbin/sysinst/arch/cobalt: md.c src/usr.sbin/sysinst/arch/evbsh3: md.c src/usr.sbin/sysinst/arch/hp300: md.c src/usr.sbin/sysinst/arch/hpcsh: md.c src/usr.sbin/sysinst/arch/i386: md.c src/usr.sbin/sysinst/arch/luna68k: md.c src/usr.sbin/sysinst/arch/mvme68k: md.c src/usr.sbin/sysinst/arch/news68k: md.c src/usr.sbin/sysinst/arch/sgimips: md.c src/usr.sbin/sysinst/arch/vax: md.c src/usr.sbin/sysinst/arch/x68k: md.c Log Message: Rather than scatter set_swap() calls wrapped in ram size checks through md_post_disklabel() and md_pre_update(), abstract them out to an MI set_swap_if_low_ram() and call from the appropriate MI places. Now all platforms add swap if the system has <= 32M of RAM. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/defs.h cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/disks.c cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/install.c \ src/usr.sbin/sysinst/upgrade.c cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/partman.c cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/arc/md.c cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/cobalt/md.c cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/evbsh3/md.c cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/hp300/md.c cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/hpcsh/md.c cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/i386/md.c cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/luna68k/md.c cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/mvme68k/md.c cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/news68k/md.c cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/sgimips/md.c cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/vax/md.c cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/x68k/md.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/usr.sbin/sysinst/defs.h diff -u src/usr.sbin/sysinst/defs.h:1.5 src/usr.sbin/sysinst/defs.h:1.6 --- src/usr.sbin/sysinst/defs.h:1.5 Tue Oct 14 16:35:20 2014 +++ src/usr.sbin/sysinst/defs.h Fri Jan 2 19:43:13 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: defs.h,v 1.5 2014/10/14 16:35:20 christos Exp $ */ +/* $NetBSD: defs.h,v 1.6 2015/01/02 19:43:13 abs Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -451,6 +451,7 @@ int write_disklabel(void); int make_filesystems(void); int make_fstab(void); int mount_disks(void); +int set_swap_if_low_ram(const char *, partinfo *); int set_swap(const char *, partinfo *); int check_swap(const char *, int); char *bootxx_name(void); Index: src/usr.sbin/sysinst/disks.c diff -u src/usr.sbin/sysinst/disks.c:1.6 src/usr.sbin/sysinst/disks.c:1.7 --- src/usr.sbin/sysinst/disks.c:1.6 Sun Dec 28 12:05:27 2014 +++ src/usr.sbin/sysinst/disks.c Fri Jan 2 19:43:13 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: disks.c,v 1.6 2014/12/28 12:05:27 martin Exp $ */ +/* $NetBSD: disks.c,v 1.7 2015/01/02 19:43:13 abs Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -1213,6 +1213,13 @@ mount_disks(void) } int +set_swap_if_low_ram(const char *disk, partinfo *pp) { + if (get_ramsize() <= 32) + return set_swap(disk, pp); + return 0; +} + +int set_swap(const char *disk, partinfo *pp) { int i; Index: src/usr.sbin/sysinst/install.c diff -u src/usr.sbin/sysinst/install.c:1.2 src/usr.sbin/sysinst/install.c:1.3 --- src/usr.sbin/sysinst/install.c:1.2 Sun Aug 3 16:09:38 2014 +++ src/usr.sbin/sysinst/install.c Fri Jan 2 19:43:13 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: install.c,v 1.2 2014/08/03 16:09:38 martin Exp $ */ +/* $NetBSD: install.c,v 1.3 2015/01/02 19:43:13 abs Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -101,6 +101,7 @@ do_install(void) if (md_pre_disklabel() != 0 || write_disklabel() != 0 || + set_swap_if_low_ram(pm->diskdev, pm->bsdlabel) != 0 || md_post_disklabel() != 0 || make_filesystems() || make_fstab() != 0 || Index: src/usr.sbin/sysinst/upgrade.c diff -u src/usr.sbin/sysinst/upgrade.c:1.2 src/usr.sbin/sysinst/upgrade.c:1.3 --- src/usr.sbin/sysinst/upgrade.c:1.2 Sun Aug 3 16:09:38 2014 +++ src/usr.sbin/sysinst/upgrade.c Fri Jan 2 19:43:13 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: upgrade.c,v 1.2 2014/08/03 16:09:38 martin Exp $ */ +/* $NetBSD: upgrade.c,v 1.3 2015/01/02 19:43:13 abs Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -67,6 +67,9 @@ do_upgrade(void) if (find_disks(msg_string(MSG_upgrade)) < 0) return; + if (set_swap_if_low_ram(pm->diskdev, NULL) < 0) + return; + if (md_pre_update() < 0) return; Index: src/usr.sbin/sysinst/partman.c diff -u src/usr.sbin/sysinst/partman.c:1.7 src/usr.sbin/sysinst/partman.c:1.8 --- src/usr.sbin/sysinst/partman.c:1.7 Sat Oct 18 08:33:31 2014 +++ src/usr.sbin/sysinst/partman.c Fri Jan 2 19:43:13 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: partman.c,v 1.7 2014/10/18 08:33:31 snj Exp $ */ +/* $NetBSD: partman.c,v 1.8 2015/01/02 19:43:13 abs Exp $ */ /* * Copyright 2012 Eugene Lozovoy @@ -2301,6 +2301,7 @@ pm_commit(menudesc *m, void *arg) #endif if ( write_disklabel() != 0 || /* Write slices table (disklabel) */ + set_swap_if_low_ram(pm->diskdev, pm->bsdlabel) != 0 || md_post_disklabel() != 0 || /* Enable swap and check badblock */ make_filesystems() != 0 /* Create filesystems with newfs */ ) { Index: src/usr.sbin/sysinst/arch/arc/md.c diff -u src/usr.sbin/sysinst/arch/arc/md.c:1.2 src/usr.sbin/sysinst/arch/arc/md.c:1.3 --- src/usr.sbin/sysinst/arch/arc/md.c:1.2 Sun Aug 3 16:09:39 2014 +++ src/usr.sbin/sysinst/arch/arc/md.c Fri Jan 2 19:43:13 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: md.c,v 1.2 2014/08/03 16:09:39 martin Exp $ */ +/* $NetBSD: md.c,v 1.3 2015/01/02 19:43:13 abs Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -247,8 +247,6 @@ md_pre_disklabel(void) int md_post_disklabel(void) { - if (get_ramsize() <= 32) - set_swap(pm->diskdev, pm->bsdlabel); return 0; } @@ -291,9 +289,6 @@ md_pre_update(void) mbr_info_t *ext; int i; - if (get_ramsize() <= 32) - set_swap(pm->diskdev, NULL); - read_mbr(pm->diskdev, &mbr); /* do a sanity check of the partition table */ for (ext = &mbr; ext; ext = ext->extended) { Index: src/usr.sbin/sysinst/arch/cobalt/md.c diff -u src/usr.sbin/sysinst/arch/cobalt/md.c:1.2 src/usr.sbin/sysinst/arch/cobalt/md.c:1.3 --- src/usr.sbin/sysinst/arch/cobalt/md.c:1.2 Sun Aug 3 16:09:39 2014 +++ src/usr.sbin/sysinst/arch/cobalt/md.c Fri Jan 2 19:43:13 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: md.c,v 1.2 2014/08/03 16:09:39 martin Exp $ */ +/* $NetBSD: md.c,v 1.3 2015/01/02 19:43:13 abs Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -248,9 +248,6 @@ md_pre_disklabel(void) int md_post_disklabel(void) { - if (get_ramsize() <= 32) - set_swap(pm->diskdev, pm->bsdlabel); - return 0; } @@ -310,9 +307,6 @@ md_pre_update(void) mbr_info_t *ext; int i; - if (get_ramsize() <= 32) - set_swap(pm->diskdev, NULL); - read_mbr(pm->diskdev, &mbr); /* do a sanity check of the partition table */ for (ext = &mbr; ext; ext = ext->extended) { Index: src/usr.sbin/sysinst/arch/evbsh3/md.c diff -u src/usr.sbin/sysinst/arch/evbsh3/md.c:1.2 src/usr.sbin/sysinst/arch/evbsh3/md.c:1.3 --- src/usr.sbin/sysinst/arch/evbsh3/md.c:1.2 Sun Aug 3 16:09:39 2014 +++ src/usr.sbin/sysinst/arch/evbsh3/md.c Fri Jan 2 19:43:13 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: md.c,v 1.2 2014/08/03 16:09:39 martin Exp $ */ +/* $NetBSD: md.c,v 1.3 2015/01/02 19:43:13 abs Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -106,7 +106,6 @@ md_pre_disklabel(void) int md_post_disklabel(void) { - return 0; } Index: src/usr.sbin/sysinst/arch/hp300/md.c diff -u src/usr.sbin/sysinst/arch/hp300/md.c:1.2 src/usr.sbin/sysinst/arch/hp300/md.c:1.3 --- src/usr.sbin/sysinst/arch/hp300/md.c:1.2 Sun Aug 3 16:09:39 2014 +++ src/usr.sbin/sysinst/arch/hp300/md.c Fri Jan 2 19:43:13 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: md.c,v 1.2 2014/08/03 16:09:39 martin Exp $ */ +/* $NetBSD: md.c,v 1.3 2015/01/02 19:43:13 abs Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -176,9 +176,6 @@ md_pre_disklabel(void) int md_post_disklabel(void) { - if (get_ramsize() < 6) - set_swap(pm->diskdev, pm->bsdlabel); - return 0; } @@ -218,8 +215,6 @@ md_cleanup_install(void) int md_pre_update(void) { - if (get_ramsize() < 6) - set_swap(pm->diskdev, NULL); return 1; } Index: src/usr.sbin/sysinst/arch/hpcsh/md.c diff -u src/usr.sbin/sysinst/arch/hpcsh/md.c:1.2 src/usr.sbin/sysinst/arch/hpcsh/md.c:1.3 --- src/usr.sbin/sysinst/arch/hpcsh/md.c:1.2 Sun Aug 3 16:09:39 2014 +++ src/usr.sbin/sysinst/arch/hpcsh/md.c Fri Jan 2 19:43:13 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: md.c,v 1.2 2014/08/03 16:09:39 martin Exp $ */ +/* $NetBSD: md.c,v 1.3 2015/01/02 19:43:13 abs Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -110,7 +110,6 @@ md_pre_disklabel(void) int md_post_disklabel(void) { - return 0; } Index: src/usr.sbin/sysinst/arch/i386/md.c diff -u src/usr.sbin/sysinst/arch/i386/md.c:1.4 src/usr.sbin/sysinst/arch/i386/md.c:1.5 --- src/usr.sbin/sysinst/arch/i386/md.c:1.4 Sat Oct 11 13:34:01 2014 +++ src/usr.sbin/sysinst/arch/i386/md.c Fri Jan 2 19:43:13 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: md.c,v 1.4 2014/10/11 13:34:01 gson Exp $ */ +/* $NetBSD: md.c,v 1.5 2015/01/02 19:43:13 abs Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -285,9 +285,6 @@ md_pre_disklabel(void) int md_post_disklabel(void) { - if (get_ramsize() <= 32) - set_swap(pm->diskdev, pm->bsdlabel); - return 0; } @@ -408,8 +405,6 @@ md_cleanup_install(void) int md_pre_update(void) { - if (get_ramsize() <= 8) - set_swap(pm->diskdev, NULL); return 1; } Index: src/usr.sbin/sysinst/arch/luna68k/md.c diff -u src/usr.sbin/sysinst/arch/luna68k/md.c:1.3 src/usr.sbin/sysinst/arch/luna68k/md.c:1.4 --- src/usr.sbin/sysinst/arch/luna68k/md.c:1.3 Mon Aug 4 08:59:28 2014 +++ src/usr.sbin/sysinst/arch/luna68k/md.c Fri Jan 2 19:43:13 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: md.c,v 1.3 2014/08/04 08:59:28 martin Exp $ */ +/* $NetBSD: md.c,v 1.4 2015/01/02 19:43:13 abs Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -154,10 +154,6 @@ md_pre_disklabel(void) int md_post_disklabel(void) { - - if (get_ramsize() <= 32) - set_swap(pm->diskdev, pm->bsdlabel); - return 0; } @@ -217,10 +213,6 @@ md_cleanup_install(void) int md_pre_update(void) { - - if (get_ramsize() <= 32) - set_swap(pm->diskdev, pm->bsdlabel); - return 1; } Index: src/usr.sbin/sysinst/arch/mvme68k/md.c diff -u src/usr.sbin/sysinst/arch/mvme68k/md.c:1.2 src/usr.sbin/sysinst/arch/mvme68k/md.c:1.3 --- src/usr.sbin/sysinst/arch/mvme68k/md.c:1.2 Sun Aug 3 16:09:40 2014 +++ src/usr.sbin/sysinst/arch/mvme68k/md.c Fri Jan 2 19:43:13 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: md.c,v 1.2 2014/08/03 16:09:40 martin Exp $ */ +/* $NetBSD: md.c,v 1.3 2015/01/02 19:43:13 abs Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -174,9 +174,6 @@ md_pre_disklabel(void) int md_post_disklabel(void) { - if (get_ramsize() < 6) - set_swap(pm->diskdev, pm->bsdlabel); - return 0; } @@ -219,8 +216,6 @@ md_cleanup_install(void) int md_pre_update(void) { - if (get_ramsize() < 6) - set_swap(pm->diskdev, NULL); return 1; } Index: src/usr.sbin/sysinst/arch/news68k/md.c diff -u src/usr.sbin/sysinst/arch/news68k/md.c:1.2 src/usr.sbin/sysinst/arch/news68k/md.c:1.3 --- src/usr.sbin/sysinst/arch/news68k/md.c:1.2 Sun Aug 3 16:09:40 2014 +++ src/usr.sbin/sysinst/arch/news68k/md.c Fri Jan 2 19:43:13 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: md.c,v 1.2 2014/08/03 16:09:40 martin Exp $ */ +/* $NetBSD: md.c,v 1.3 2015/01/02 19:43:13 abs Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -139,7 +139,6 @@ md_pre_disklabel(void) int md_post_disklabel(void) { - return 0; } Index: src/usr.sbin/sysinst/arch/sgimips/md.c diff -u src/usr.sbin/sysinst/arch/sgimips/md.c:1.2 src/usr.sbin/sysinst/arch/sgimips/md.c:1.3 --- src/usr.sbin/sysinst/arch/sgimips/md.c:1.2 Sun Aug 3 16:09:40 2014 +++ src/usr.sbin/sysinst/arch/sgimips/md.c Fri Jan 2 19:43:13 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: md.c,v 1.2 2014/08/03 16:09:40 martin Exp $ */ +/* $NetBSD: md.c,v 1.3 2015/01/02 19:43:13 abs Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -156,7 +156,6 @@ md_pre_disklabel(void) int md_post_disklabel(void) { - set_swap(pm->diskdev, pm->bsdlabel); if (strstr(instsys.version, "(INSTALL32_IP3x)")) return run_program(RUN_DISPLAY, "%s %s", "/usr/mdec/sgivol -f -w boot /usr/mdec/ip3xboot", Index: src/usr.sbin/sysinst/arch/vax/md.c diff -u src/usr.sbin/sysinst/arch/vax/md.c:1.2 src/usr.sbin/sysinst/arch/vax/md.c:1.3 --- src/usr.sbin/sysinst/arch/vax/md.c:1.2 Sun Aug 3 16:09:41 2014 +++ src/usr.sbin/sysinst/arch/vax/md.c Fri Jan 2 19:43:14 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: md.c,v 1.2 2014/08/03 16:09:41 martin Exp $ */ +/* $NetBSD: md.c,v 1.3 2015/01/02 19:43:14 abs Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -143,9 +143,6 @@ md_pre_disklabel(void) int md_post_disklabel(void) { - if (get_ramsize() <= 32) - set_swap(pm->diskdev, pm->bsdlabel); - return 0; } @@ -182,9 +179,6 @@ md_cleanup_install(void) int md_pre_update(void) { - if (get_ramsize() <= 32) - set_swap(pm->diskdev, NULL); - return 1; } Index: src/usr.sbin/sysinst/arch/x68k/md.c diff -u src/usr.sbin/sysinst/arch/x68k/md.c:1.2 src/usr.sbin/sysinst/arch/x68k/md.c:1.3 --- src/usr.sbin/sysinst/arch/x68k/md.c:1.2 Sun Aug 3 16:09:41 2014 +++ src/usr.sbin/sysinst/arch/x68k/md.c Fri Jan 2 19:43:14 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: md.c,v 1.2 2014/08/03 16:09:41 martin Exp $ */ +/* $NetBSD: md.c,v 1.3 2015/01/02 19:43:14 abs Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -262,8 +262,6 @@ md_pre_disklabel(void) int md_post_disklabel(void) { - if (get_ramsize() < 6) - set_swap(pm->diskdev, pm->bsdlabel); return 0; } @@ -305,8 +303,6 @@ md_cleanup_install(void) int md_pre_update(void) { - if (get_ramsize() < 6) - set_swap(pm->diskdev, NULL); return 1; }