nrelease/installer: Rename the UP/SMP kernel directories on the LiveCD.

Changed from UP -> kernel.UP and from SMP -> kernel.SMP.

Requested-by: dillon

diff --git a/nrelease/Makefile b/nrelease/Makefile
index 3d8c2e7..a246ca1 100644 (file)
--- a/nrelease/Makefile
+++ b/nrelease/Makefile
@@ -248,11 +248,11 @@ buildiso:
                rm -rf ${ISOROOT}/boot/kernel.$${kernconf}.old; \
        done
 .if ${MACHINE_ARCH} == "i386"
-       mv ${ISOROOT}/boot/kernel.GENERIC ${ISOROOT}/boot/UP
-       mv ${ISOROOT}/boot/kernel.GENERIC_SMP ${ISOROOT}/boot/SMP
+       mv ${ISOROOT}/boot/kernel.GENERIC ${ISOROOT}/boot/kernel.UP
+       mv ${ISOROOT}/boot/kernel.GENERIC_SMP ${ISOROOT}/boot/kernel.SMP
 .else
-       mv ${ISOROOT}/boot/kernel.X86_64_GENERIC ${ISOROOT}/boot/UP
-       mv ${ISOROOT}/boot/kernel.X86_64_GENERIC_SMP ${ISOROOT}/boot/SMP
+       mv ${ISOROOT}/boot/kernel.X86_64_GENERIC ${ISOROOT}/boot/kernel.UP
+       mv ${ISOROOT}/boot/kernel.X86_64_GENERIC_SMP ${ISOROOT}/boot/kernel.SMP
 .endif
        mtree -deU -f ${.CURDIR}/../etc/mtree/BSD.local.dist -p ${ISOROOT}/usr/local/
        mtree -deU -f ${.CURDIR}/../etc/mtree/BSD.var.dist -p ${ISOROOT}/var

diff --git a/sys/boot/dloader/dloader.menu b/sys/boot/dloader/dloader.menu
index 0bcf4b2..06c486c 100644 (file)
--- a/sys/boot/dloader/dloader.menu
+++ b/sys/boot/dloader/dloader.menu
@@ -35,10 +35,10 @@ ifset default_kernel
     # already selected a kernel
 elseifexists kernel
     set default_kernel=kernel
-elseifexists UP
-    set default_kernel=UP
-elseifexists SMP
-    set default_kernel=SMP
+elseifexists kernel.UP
+    set default_kernel=kernel.UP
+elseifexists kernel.SMP
+    set default_kernel=kernel.SMP
 else
     set default_kernel=kernel
 endif
@@ -164,9 +164,9 @@ menuadd loadall
 menuadd boot
 menuadd set autoboot_delay=NO
 
-ifexists SMP
+ifexists kernel.SMP
 menuitem m "Select SMP kernel"
-menuadd set default_kernel=SMP
+menuadd set default_kernel=kernel.SMP
 menuadd include ${base}defaults/dloader.menu
 menuadd optinclude ${base}dloader.menu
 menuadd menu

diff --git a/usr.sbin/installer/dfuibe_installer/fn_install.c b/usr.sbin/installer/dfuibe_installer/fn_install.c
index 4d89072..34db13a 100644 (file)
--- a/usr.sbin/installer/dfuibe_installer/fn_install.c
+++ b/usr.sbin/installer/dfuibe_installer/fn_install.c
@@ -604,9 +604,8 @@ fn_install_os(struct i_fn_args *a)
            a->os_root, cmd_name(a, "CHMOD"), a->os_root);
 
        /*
-        * XXX
-        * Move the kernel used for booting (UP or SMP) to /boot/kernel
-        * and remove the other kernel
+        * Move the kernel used for booting (kernel.UP or kernel.SMP) to
+        * /boot/kernel and remove the other kernel
         */
        command_add(cmds,
            "%s%s %smnt`%s%s $(%s%s -n kern.bootfile)` %smnt/boot/kernel",
@@ -616,7 +615,7 @@ fn_install_os(struct i_fn_args *a)
            a->os_root, cmd_name(a, "SYSCTL"),
            a->os_root);
        command_add(cmds,
-           "%s%s -R noschg %smnt/boot/[A-Z][A-Z]*; %s%s -rf %smnt/boot/[A-Z][A-Z]*",
+           "%s%s -R noschg %smnt/boot/kernel.[SU]M*P; %s%s -rf %smnt/boot/kernel.[SU]M*P",
            a->os_root, cmd_name(a, "CHFLAGS"),
            a->os_root,
            a->os_root, cmd_name(a, "RM"),