installer/LiveCD: Do no longer set kern.emergency_intr_enable to 1.
authorSascha Wildner <saw@online.de>
Sun, 17 Apr 2011 11:50:00 +0000 (13:50 +0200)
committerSascha Wildner <saw@online.de>
Sun, 17 Apr 2011 11:50:26 +0000 (13:50 +0200)
In-discussion-with: sephe

nrelease/root/boot/loader.conf
usr.sbin/installer/dfuibe_installer/fn_install.c

index cee3f31..34620c5 100644 (file)
@@ -1,8 +1,4 @@
 # 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
 dm_load="YES"
index 023fee8..c9e161d 100644 (file)
@@ -556,8 +556,6 @@ 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"),
@@ -589,8 +587,6 @@ 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);
                                if (subpartition_is_encrypted(sp)) {
                                        command_add(cmds,
                                            "%s%s 'vfs.root.mountfrom=\"ufs:md0s0\"' >>%smnt/boot/loader.conf",