installer: Remove some more initrd creation code.
authorSascha Wildner <saw@online.de>
Tue, 3 Mar 2015 20:38:04 +0000 (21:38 +0100)
committerSascha Wildner <saw@online.de>
Tue, 3 Mar 2015 20:38:04 +0000 (21:38 +0100)
After my revert, this original mkinitrd code (for encrypted setup
originally) came back. Since we can now rely on the ISO having an
initrd to be installed already, we can remove this too.

share/installer/cmdnames.conf
usr.sbin/installer/dfuibe_installer/fn_install.c

index e02852a..1c05c93 100644 (file)
@@ -30,7 +30,6 @@ DUMPON=sbin/dumpon
 FDISK=sbin/fdisk
 HAMMER=sbin/hammer
 IFCONFIG=sbin/ifconfig
-MKINITRD=sbin/mkinitrd
 MOUNT=sbin/mount
 MOUNTD=sbin/mountd
 MOUNT_HAMMER=sbin/mount_hammer
index d6dca2d..9ec1d75 100644 (file)
@@ -655,11 +655,6 @@ fn_install_os(struct i_fn_args *a)
                    a->os_root, cmd_name(a, "ECHO"),
                    a->os_root);
                if (use_hammer) {
-                       command_add(cmds, "%s%s -b %smnt/boot -t %smnt/tmp",
-                           a->os_root, cmd_name(a, "MKINITRD"),
-                           a->os_root, a->os_root);
-                       command_add(cmds, "%s%s -rf %smnt/tmp/initrd",
-                           a->os_root, cmd_name(a, "RM"), a->os_root);
                        command_add(cmds,
                            "%s%s 'initrd.img_load=\"YES\"' >>%smnt/boot/loader.conf",
                            a->os_root, cmd_name(a, "ECHO"),