nrelease - installer - Use different emergency interrupt mechanic

* Use a tuneable instead of a sysctl.

diff --git a/nrelease/root/boot/loader.conf b/nrelease/root/boot/loader.conf
index 662cdcf..918ad3e 100644 (file)
--- a/nrelease/root/boot/loader.conf
+++ b/nrelease/root/boot/loader.conf
@@ -1,2 +1,7 @@
-# $DragonFly: src/nrelease/root/boot/loader.conf,v 1.1 2003/12/01 09:59:45 dillon Exp $
+# ISO/IMG boot
+#
+# Note that the installer also sets kern.emergency_intr_enable in the installed
+# /boot/loader.conf.  This can be turned off post-install.
+#
 kernel_options="-C"
+kern.emergency_intr_enable=1

diff --git a/usr.sbin/installer/dfuibe_installer/fn_install.c b/usr.sbin/installer/dfuibe_installer/fn_install.c
index 471afbf..7651d37 100644 (file)
--- a/usr.sbin/installer/dfuibe_installer/fn_install.c
+++ b/usr.sbin/installer/dfuibe_installer/fn_install.c
@@ -519,6 +519,8 @@ fn_install_os(struct i_fn_args *a)
                                    subpartition_get_device_name(sp),
                                    subpartition_get_mountpoint(sp),
                                    a->os_root);
+                               command_add(cmds, "%s%s 'kern.emergency_intr_enable=1' >>%smnt/boot/loader.conf",
+                                   a->os_root, cmd_name(a, "ECHO"), a->os_root);
                        } else if (subpartition_is_tmpfsbacked(sp)) {
                                command_add(cmds, "%s%s 'tmpfs\t\t\t%s\t\ttmpfs\trw,-s%luM\t1\t1' >>%smnt/etc/fstab",
                                        a->os_root, cmd_name(a, "ECHO"),
@@ -543,6 +545,8 @@ fn_install_os(struct i_fn_args *a)
                                    a->os_root, cmd_name(a, "ECHO"),
                                    subpartition_get_device_name(sp),
                                    a->os_root);
+                               command_add(cmds, "%s%s 'kern.emergency_intr_enable=1' >>%smnt/boot/loader.conf",
+                                   a->os_root, cmd_name(a, "ECHO"), a->os_root);
                        } else if (strcmp(subpartition_get_mountpoint(sp), "/boot") == 0) {
                                command_add(cmds, "%s%s '/dev/%s\t\t%s\t\tufs\trw\t\t1\t1' >>%smnt/etc/fstab",
                                    a->os_root, cmd_name(a, "ECHO"),