Current-Users archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
small sysinst(8) without extended partitioning support
Hi,
Although the recent floppy overflow for atari was gone, I expected
that it surely occurs again in the near future.
I propose to add NOPARTMAN option to sysinst(8), which drops extended
partitioning support provided by partman.c. If this option is enabled,
about 30KB is reduced for crunched binary for atari install floppy.
It should be useful also for old ports with sysinst(8).
It requires
- separate extended partitioning stuffs from menu.mi to menu.pm
- 8 extra #if(n)def's
I've confirmed sysinst(8) with and without this option works on amd64.
Any suggestions?
Thanks,
rin
Index: usr.sbin/sysinst/Makefile.inc
===================================================================
RCS file: /home/netbsd/src/usr.sbin/sysinst/Makefile.inc,v
retrieving revision 1.12
diff -p -u -r1.12 Makefile.inc
--- usr.sbin/sysinst/Makefile.inc 16 Sep 2018 09:15:12 -0000 1.12
+++ usr.sbin/sysinst/Makefile.inc 20 Sep 2018 00:59:46 -0000
@@ -13,18 +13,22 @@ WARNS= 4
SRCS+= menu_defs.c msg_defs.c main.c install.c upgrade.c \
txtwalk.c run.c factor.c net.c disks.c disks_lfs.c util.c geom.c \
- label.c target.c md.c sizemultname.c configmenu.c checkrc.c partman.c
+ label.c target.c md.c sizemultname.c configmenu.c checkrc.c
SRCS+= ${MD_OPTIONS:MAOUT2ELF:S/AOUT2ELF/aout2elf.c/}
SRCS+= ${MENUS_MD:Mmenus.mbr:S/menus.mbr/mbr.c/}
SRCS+= ${CPPFLAGS:M-DWSKBD:S/-DWSKBD/wskbd.c/}
SRCS+= ${NODISKLABEL:D:Ubsddisklabel.c savenewlabel.c}
+SRCS+= ${NOPARTMAN:D:Upartman.c}
DPSRCS+= defs.h
SYSINSTLANG?= en
LANGUAGES?= de en es fr pl
+MENUS_MI= menus.mi
+MENUS_MI+= ${NOPARTMAN:D:Umenus.pm}
+
MSG_MD?= msg.md.${SYSINSTLANG}
MENUS_MD?= menus.md.${SYSINSTLANG}
@@ -48,7 +52,8 @@ CATALOGDIR= /usr/share/sysinst/catalog
CPPFLAGS+= -I. -I${.CURDIR}/../.. -I${.CURDIR} \
-DREL=\"${DISTRIBVER}\" -DMACH=\"${MACHINE}\" \
-DMACH_${MACHINE} -DARCH_${MACHINE_ARCH} \
- ${NODISKLABEL:D-DNO_DISKLABEL}
+ ${NODISKLABEL:D-DNO_DISKLABEL} \
+ ${NOPARTMAN:D-DNO_PARTMAN}
.if defined(NETBSD_OFFICIAL_RELEASE) && ${NETBSD_OFFICIAL_RELEASE} == "yes"
CPPFLAGS+= -DSYSINST_FTP_HOST=\"ftp.NetBSD.org\" -DNETBSD_OFFICIAL_RELEASE
@@ -168,7 +173,7 @@ msg.def: msg.mi.${SYSINSTLANG} ${MSG_MD}
${TOOL_SED} "s/@@MACHINE@@/${MACHINE}/" | \
${TOOL_AWK} -f ${UNIF_AWK} -v defines="${MD_OPTIONS}" > ${.TARGET}
-menus.def: menus.mi ${MENUS_MD} msgtouch
+menus.def: ${MENUS_MI} ${MENUS_MD} msgtouch
${_MKTARGET_CREATE}
${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" ${.ALLSRC} | \
${TOOL_SED} "s/@@MACHINE@@/${MACHINE}/" | \
Index: usr.sbin/sysinst/defs.h
===================================================================
RCS file: /home/netbsd/src/usr.sbin/sysinst/defs.h,v
retrieving revision 1.18
diff -p -u -r1.18 defs.h
--- usr.sbin/sysinst/defs.h 16 Sep 2018 09:15:12 -0000 1.18
+++ usr.sbin/sysinst/defs.h 20 Sep 2018 08:39:49 -0000
@@ -613,9 +613,16 @@ void unwind_mounts(void);
int target_mounted(void);
/* from partman.c */
+#ifndef NO_PARTMAN
int partman(void);
-int pm_partusage(pm_devs_t *, int, int);
int pm_getrefdev(pm_devs_t *);
+void update_wedges(const char *);
+#else
+static inline int partman(void) { return -1; }
+static inline int pm_getrefdev(pm_devs_t *x __unused) { return -1; }
+#define update_wedges(x) __nothing
+#endif
+int pm_partusage(pm_devs_t *, int, int);
void pm_setfstype(pm_devs_t *, int, int);
int pm_editpart(int);
void pm_rename(pm_devs_t *);
@@ -626,13 +633,16 @@ int pm_cgd_edit(void *, part_entry_t *);
int pm_gpt_convert(pm_devs_t *);
void pm_wedges_fill(pm_devs_t *);
void pm_make_bsd_partitions(pm_devs_t *);
-void update_wedges(const char *);
/* flags whether to offer the respective options (depending on helper
programs available on install media */
int have_raid, have_vnd, have_cgd, have_lvm, have_gpt, have_dk;
/* initialize above variables */
+#ifndef NO_PARTMAN
void check_available_binaries(void);
+#else
+#define check_available_binaries() __nothing
+#endif
/* from bsddisklabel.c */
int make_bsd_partitions(void);
Index: usr.sbin/sysinst/install.c
===================================================================
RCS file: /home/netbsd/src/usr.sbin/sysinst/install.c,v
retrieving revision 1.4
diff -p -u -r1.4 install.c
--- usr.sbin/sysinst/install.c 10 May 2015 10:14:02 -0000 1.4
+++ usr.sbin/sysinst/install.c 20 Sep 2018 00:42:05 -0000
@@ -47,7 +47,11 @@ do_install(void)
{
int find_disks_ret;
int retcode = 0;
+#ifndef NO_PARTMAN
partman_go = -1;
+#else
+ partman_go = 0;
+#endif
#ifndef DEBUG
msg_display(MSG_installusure);
Index: usr.sbin/sysinst/main.c
===================================================================
RCS file: /home/netbsd/src/usr.sbin/sysinst/main.c,v
retrieving revision 1.9
diff -p -u -r1.9 main.c
--- usr.sbin/sysinst/main.c 12 Sep 2018 13:44:05 -0000 1.9
+++ usr.sbin/sysinst/main.c 20 Sep 2018 01:30:20 -0000
@@ -179,7 +179,11 @@ main(int argc, char **argv)
}
/* argv processing */
- while ((ch = getopt(argc, argv, "Dr:f:C:p")) != -1)
+ while ((ch = getopt(argc, argv, "Dr:f:C:"
+#ifndef NO_PARTMAN
+ "p"
+#endif
+ )) != -1)
switch(ch) {
case 'D': /* set to get past certain errors in testing */
debug = 1;
@@ -196,10 +200,12 @@ main(int argc, char **argv)
/* Define colors */
sscanf(optarg, "%u:%u", &clr_arg.bg, &clr_arg.fg);
break;
+#ifndef NO_PARTMAN
case 'p':
/* Partition tool */
partman_go = 1;
break;
+#endif
case '?':
default:
usage();
Index: usr.sbin/sysinst/menus.mi
===================================================================
RCS file: /home/netbsd/src/usr.sbin/sysinst/menus.mi,v
retrieving revision 1.14
diff -p -u -r1.14 menus.mi
--- usr.sbin/sysinst/menus.mi 11 Sep 2018 08:05:18 -0000 1.14
+++ usr.sbin/sysinst/menus.mi 20 Sep 2018 01:11:20 -0000
@@ -84,6 +84,7 @@ remove_sub_menu(int menuID)
}
}
+#ifndef NO_PARTMAN
static void
remove_menu_option(int menuID, const char *option)
{
@@ -101,6 +102,7 @@ remove_menu_option(int menuID, const cha
}
}
}
+#endif
void
remove_color_options()
@@ -113,6 +115,7 @@ remove_color_options()
remove_sub_menu(MENU_colors);
}
+#ifndef NO_PARTMAN
void
remove_raid_options()
{
@@ -152,6 +155,7 @@ remove_cgd_options()
remove_menu_option(MENU_pmdiskentry, MSG_encrypt);
remove_menu_option(MENU_pmpartentry, MSG_encrypt);
}
+#endif
}
@@ -271,7 +275,13 @@ menu utility, title MSG_NetBSD_VERSION_U
network_up = 0;
config_network();
};
- option MSG_Partition_a_disk, action { partman_go = 1; partman(); };
+ option MSG_Partition_a_disk,
+ action {
+#ifndef NO_PARTMAN
+ partman_go = 1;
+ partman();
+#endif
+ };
option MSG_Logging_functions, action { do_logging(); };
option MSG_Color_scheme, sub menu colors;
option MSG_Halt_the_system, exit,
@@ -622,138 +632,3 @@ menu usersh, title MSG_User_shell, no cl
option "/bin/sh", exit, action { ushell = "/bin/sh";};
option "/bin/ksh", exit, action { ushell = "/bin/ksh";};
option "/bin/csh", exit, action { ushell = "/bin/csh";};
-
-
-menu pmdiskentry, x=50, y=5, exit, default exit;
- option MSG_editbsdpart, exit, action { pm_make_bsd_partitions(pm); };
- option MSG_editmbr, exit, action { md_get_info();
- md_pre_disklabel();
- memset(&pm->bsdlabel, 0, sizeof pm->bsdlabel);};
- option MSG_switchgpt, exit, action { if (pm_gpt_convert(pm) == 0)
- pm_partusage(pm, -1, 1); };
- option MSG_renamedisk, exit, action { pm->unsaved = 1; pm_rename(pm); };
- option MSG_fmtasraid, exit, action { pm->unsaved = 1;
- pm_partusage(pm, -1, 1);
- layoutkind = LY_NEWRAID;
- md_make_bsd_partitions();};
- option MSG_fmtaslvm, exit, action { pm->unsaved = 1;
- pm_partusage(pm, -1, 1);
- layoutkind = LY_NEWLVM;
- md_make_bsd_partitions(); };
- option MSG_encrypt, exit, action { pm->unsaved = 1;
- pm_partusage(pm, -1, 1);
- layoutkind = LY_NEWCGD;
- md_make_bsd_partitions();
- pm_cgd_edit(0, &(part_entry_t)
- {.dev_ptr = pm, .dev_num = PART_E}
- ); };
- option MSG_setbootable, exit, action { pm->unsaved = 1;
- pm->bootable = !pm->bootable; };
- option MSG_erase, next menu shred_modes;
- option MSG_undo, exit, action { label_read(); pm->unsaved = 0;
- pm_partusage(pm, -1, 1); };
- option MSG_unconfig, exit, action { if (pm_unconfigure(pm) == 0)
- pm_partusage(pm, -1, 1); };
-
-menu pmpartentry, x=50, y=5, exit, default exit;
- option MSG_edit, exit, action {
- pm->unsaved = 1;
- int tpfs = pm->bsdlabel[*(int*)arg].pi_fstype;
- int tplvm = pm->bsdlabel[*(int*)arg].lvmpv;
- pm_editpart(*(int*)arg);
- if (tpfs != pm->bsdlabel[*(int*)arg].pi_fstype ||
- tplvm != pm->bsdlabel[*(int*)arg].lvmpv)
- /* Oops, partition type changed */
- pm_partusage(pm, *(int*)arg, 1);
- };
- option MSG_fmtasraid, exit, action {
- if (pm->gpt || pm->isspecial) {
- process_menu(MENU_ok, __UNCONST(MSG_notsupported));
- return -1;
- }
- pm->unsaved = 1;
- pm_partusage(pm, *(int*)arg, 1);
- pm_setfstype(pm, *(int*)arg, FS_RAID);
- };
- option MSG_fmtaslvm, exit, action {
- if (pm->gpt || pm->isspecial) {
- process_menu(MENU_ok, __UNCONST(MSG_notsupported));
- return -1;
- }
- pm->unsaved = 1;
- pm_partusage(pm, *(int*)arg, 1);
- pm_setfstype(pm, *(int*)arg, FS_BSDFFS);
- pm->bsdlabel[*(int*)arg].lvmpv = 1;
- };
- option MSG_encrypt, exit, action {
- if (pm->gpt || pm->isspecial) {
- process_menu(MENU_ok, __UNCONST(MSG_notsupported));
- return -1;
- }
- pm->unsaved = 1;
- pm_partusage(pm, *(int*)arg, 1);
- pm_setfstype(pm, *(int*)arg, FS_CGD);
- pm_cgd_edit(0,
- &(part_entry_t){.dev_ptr = pm,
- .dev_num = *(int*)arg});
- };
- option MSG_erase, next menu shred_modes;
- option MSG_doumount, exit, action { pm_umount(pm, *(int*)arg); };
- option MSG_Delete_partition, exit, action {
- pm->unsaved = 1;
- pm_partusage(pm, *(int*)arg, 1);
- if (pm->isspecial)
- pm_unconfigure(pm);
- else
- pm->bsdlabel[*(int*)arg].pi_fstype = FS_UNUSED;
- };
-
-menu pmgptentry, x=50, y=8, exit, default exit;
- option MSG_editbsdpart, exit, action { pm_make_bsd_partitions(pm); };
- option MSG_switchmbr, exit, action { if (pm_gpt_convert(pm) == 0)
- pm_partusage(pm, -1, 1); };
- option MSG_setbootable, exit, action { pm->unsaved = 1;
- pm->bootable = !pm->bootable; };
- option MSG_erase, next menu shred_modes;
- option MSG_undo, exit, action { label_read(); pm->unsaved = 0;
- pm_partusage(pm, -1, 1); };
- option MSG_unconfig, exit, action { if (pm_unconfigure(pm) == 0)
- pm_partusage(pm, -1, 1); };
-
-menu shred_modes, x=50, y=5, exit, default exit;
- option MSG_fillzeros, exit,
- action { pm_shred(pm, *(int*)arg, SHRED_ZEROS); };
- option MSG_fillrandom, exit,
- action { pm_shred(pm, *(int*)arg, SHRED_RANDOM); };
- option MSG_fillcrypto, exit,
- action { pm_shred(pm, *(int*)arg, SHRED_CRYPTO); };
-
-menu raidlevel;
- option MSG_raid0, exit, action { *(int *)arg = 0; };
- option MSG_raid1, exit, action { *(int *)arg = 1; };
- option MSG_raid4, exit, action { *(int *)arg = 4; };
- option MSG_raid5, exit, action { *(int *)arg = 5; };
-
-menu cgd_enctype;
- option "aes-xts", exit, action { *(const char**)arg = "aes-xts"; };
- option "aes-cbc", exit, action { *(const char**)arg = "aes-cbc"; };
- option "3des-cbc", exit, action { *(const char**)arg = "3des-cbc"; };
- option "blowfish-cbc", exit, action { *(const char**)arg = "blowfish-cbc"; };
-
-menu cgd_ivtype;
- option "encblkno1", exit, action { *(const char**)arg = "encblkno1"; };
- option "encblkno8", exit, action { *(const char**)arg = "encblkno8"; };
-
-menu cgd_keygentype;
- option "pkcs5_pbkdf2/sha1", exit, action { *(const char**)arg = "pkcs5_pbkdf2/sha1"; };
- option "pkcs5_pbkdf2", exit, action { *(const char**)arg = "pkcs5_pbkdf2"; };
- option "storedkey", exit, action { *(const char**)arg = "storedkey"; };
- option "randomkey", exit, action { *(const char**)arg = "randomkey"; };
- option "urandomkey", exit, action { *(const char**)arg = "urandomkey"; };
- option "shell_cmd", exit, action { *(const char**)arg = "shell_cmd"; };
-
-menu cgd_verifytype;
- option "none", exit, action { *(const char**)arg = "none"; };
- option "disklabel", exit, action { *(const char**)arg = "disklabel"; };
- option "ffs", exit, action { *(const char**)arg = "ffs"; };
- option "re-enter", exit, action { *(const char**)arg = "re-enter"; };
Index: usr.sbin/sysinst/menus.pm
===================================================================
RCS file: usr.sbin/sysinst/menus.pm
diff -N usr.sbin/sysinst/menus.pm
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ usr.sbin/sysinst/menus.pm 20 Sep 2018 01:46:53 -0000
@@ -0,0 +1,167 @@
+/* $NetBSD$ */
+/* NetBSD: menus.mi,v 1.14 2018/09/11 08:05:18 martin Exp */
+
+/*-
+ * Copyright (c) 2003 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by David Laight.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* Menu system definitions -- extended partitioning */
+
+menu pmdiskentry, x=50, y=5, exit, default exit;
+ option MSG_editbsdpart, exit, action { pm_make_bsd_partitions(pm); };
+ option MSG_editmbr, exit, action { md_get_info();
+ md_pre_disklabel();
+ memset(&pm->bsdlabel, 0, sizeof pm->bsdlabel);};
+ option MSG_switchgpt, exit, action { if (pm_gpt_convert(pm) == 0)
+ pm_partusage(pm, -1, 1); };
+ option MSG_renamedisk, exit, action { pm->unsaved = 1; pm_rename(pm); };
+ option MSG_fmtasraid, exit, action { pm->unsaved = 1;
+ pm_partusage(pm, -1, 1);
+ layoutkind = LY_NEWRAID;
+ md_make_bsd_partitions();};
+ option MSG_fmtaslvm, exit, action { pm->unsaved = 1;
+ pm_partusage(pm, -1, 1);
+ layoutkind = LY_NEWLVM;
+ md_make_bsd_partitions(); };
+ option MSG_encrypt, exit, action { pm->unsaved = 1;
+ pm_partusage(pm, -1, 1);
+ layoutkind = LY_NEWCGD;
+ md_make_bsd_partitions();
+ pm_cgd_edit(0, &(part_entry_t)
+ {.dev_ptr = pm, .dev_num = PART_E}
+ ); };
+ option MSG_setbootable, exit, action { pm->unsaved = 1;
+ pm->bootable = !pm->bootable; };
+ option MSG_erase, next menu shred_modes;
+ option MSG_undo, exit, action { label_read(); pm->unsaved = 0;
+ pm_partusage(pm, -1, 1); };
+ option MSG_unconfig, exit, action { if (pm_unconfigure(pm) == 0)
+ pm_partusage(pm, -1, 1); };
+
+menu pmpartentry, x=50, y=5, exit, default exit;
+ option MSG_edit, exit, action {
+ pm->unsaved = 1;
+ int tpfs = pm->bsdlabel[*(int*)arg].pi_fstype;
+ int tplvm = pm->bsdlabel[*(int*)arg].lvmpv;
+ pm_editpart(*(int*)arg);
+ if (tpfs != pm->bsdlabel[*(int*)arg].pi_fstype ||
+ tplvm != pm->bsdlabel[*(int*)arg].lvmpv)
+ /* Oops, partition type changed */
+ pm_partusage(pm, *(int*)arg, 1);
+ };
+ option MSG_fmtasraid, exit, action {
+ if (pm->gpt || pm->isspecial) {
+ process_menu(MENU_ok, __UNCONST(MSG_notsupported));
+ return -1;
+ }
+ pm->unsaved = 1;
+ pm_partusage(pm, *(int*)arg, 1);
+ pm_setfstype(pm, *(int*)arg, FS_RAID);
+ };
+ option MSG_fmtaslvm, exit, action {
+ if (pm->gpt || pm->isspecial) {
+ process_menu(MENU_ok, __UNCONST(MSG_notsupported));
+ return -1;
+ }
+ pm->unsaved = 1;
+ pm_partusage(pm, *(int*)arg, 1);
+ pm_setfstype(pm, *(int*)arg, FS_BSDFFS);
+ pm->bsdlabel[*(int*)arg].lvmpv = 1;
+ };
+ option MSG_encrypt, exit, action {
+ if (pm->gpt || pm->isspecial) {
+ process_menu(MENU_ok, __UNCONST(MSG_notsupported));
+ return -1;
+ }
+ pm->unsaved = 1;
+ pm_partusage(pm, *(int*)arg, 1);
+ pm_setfstype(pm, *(int*)arg, FS_CGD);
+ pm_cgd_edit(0,
+ &(part_entry_t){.dev_ptr = pm,
+ .dev_num = *(int*)arg});
+ };
+ option MSG_erase, next menu shred_modes;
+ option MSG_doumount, exit, action { pm_umount(pm, *(int*)arg); };
+ option MSG_Delete_partition, exit, action {
+ pm->unsaved = 1;
+ pm_partusage(pm, *(int*)arg, 1);
+ if (pm->isspecial)
+ pm_unconfigure(pm);
+ else
+ pm->bsdlabel[*(int*)arg].pi_fstype = FS_UNUSED;
+ };
+
+menu pmgptentry, x=50, y=8, exit, default exit;
+ option MSG_editbsdpart, exit, action { pm_make_bsd_partitions(pm); };
+ option MSG_switchmbr, exit, action { if (pm_gpt_convert(pm) == 0)
+ pm_partusage(pm, -1, 1); };
+ option MSG_setbootable, exit, action { pm->unsaved = 1;
+ pm->bootable = !pm->bootable; };
+ option MSG_erase, next menu shred_modes;
+ option MSG_undo, exit, action { label_read(); pm->unsaved = 0;
+ pm_partusage(pm, -1, 1); };
+ option MSG_unconfig, exit, action { if (pm_unconfigure(pm) == 0)
+ pm_partusage(pm, -1, 1); };
+
+menu shred_modes, x=50, y=5, exit, default exit;
+ option MSG_fillzeros, exit,
+ action { pm_shred(pm, *(int*)arg, SHRED_ZEROS); };
+ option MSG_fillrandom, exit,
+ action { pm_shred(pm, *(int*)arg, SHRED_RANDOM); };
+ option MSG_fillcrypto, exit,
+ action { pm_shred(pm, *(int*)arg, SHRED_CRYPTO); };
+
+menu raidlevel;
+ option MSG_raid0, exit, action { *(int *)arg = 0; };
+ option MSG_raid1, exit, action { *(int *)arg = 1; };
+ option MSG_raid4, exit, action { *(int *)arg = 4; };
+ option MSG_raid5, exit, action { *(int *)arg = 5; };
+
+menu cgd_enctype;
+ option "aes-xts", exit, action { *(const char**)arg = "aes-xts"; };
+ option "aes-cbc", exit, action { *(const char**)arg = "aes-cbc"; };
+ option "3des-cbc", exit, action { *(const char**)arg = "3des-cbc"; };
+ option "blowfish-cbc", exit, action { *(const char**)arg = "blowfish-cbc"; };
+
+menu cgd_ivtype;
+ option "encblkno1", exit, action { *(const char**)arg = "encblkno1"; };
+ option "encblkno8", exit, action { *(const char**)arg = "encblkno8"; };
+
+menu cgd_keygentype;
+ option "pkcs5_pbkdf2/sha1", exit, action { *(const char**)arg = "pkcs5_pbkdf2/sha1"; };
+ option "pkcs5_pbkdf2", exit, action { *(const char**)arg = "pkcs5_pbkdf2"; };
+ option "storedkey", exit, action { *(const char**)arg = "storedkey"; };
+ option "randomkey", exit, action { *(const char**)arg = "randomkey"; };
+ option "urandomkey", exit, action { *(const char**)arg = "urandomkey"; };
+ option "shell_cmd", exit, action { *(const char**)arg = "shell_cmd"; };
+
+menu cgd_verifytype;
+ option "none", exit, action { *(const char**)arg = "none"; };
+ option "disklabel", exit, action { *(const char**)arg = "disklabel"; };
+ option "ffs", exit, action { *(const char**)arg = "ffs"; };
+ option "re-enter", exit, action { *(const char**)arg = "re-enter"; };
Index: usr.sbin/sysinst/arch/atari/Makefile
===================================================================
RCS file: /home/netbsd/src/usr.sbin/sysinst/arch/atari/Makefile,v
retrieving revision 1.2
diff -p -u -r1.2 Makefile
--- usr.sbin/sysinst/arch/atari/Makefile 12 Aug 2015 18:20:02 -0000 1.2
+++ usr.sbin/sysinst/arch/atari/Makefile 20 Sep 2018 01:15:37 -0000
@@ -8,4 +8,8 @@ LANGUAGES= en de
CPPFLAGS+= -DSUPPORT_8_3_SOURCE_FILESYSTEM
+.ifdef SMALLPROG
+NOPARTMAN= yes
+.endif
+
.include "../../Makefile.inc"
Home |
Main Index |
Thread Index |
Old Index