rename rootfsFiles to rootdir, add bootablerootdir

modules/outputs/ext4fs.nix

@@ -28,16 +28,12 @@ in
         in runCommand "mkfs.ext4" {
           depsBuildBuild = [ e2fsprogs ];
         } ''
-          cp -a ${o.rootfsFiles} tmp
-          ${if config.boot.loader.extlinux.enable
-            then "(cd tmp && chmod -R +w . && rmdir boot && cp -a ${o.extlinux} boot)"
-            else ""
-          }
-          size=$(du -s --apparent-size --block-size 1024 tmp |cut -f1)
+          tree=${o.bootablerootdir}
+          size=$(du -s --apparent-size --block-size 1024 $tree |cut -f1)
           # add 25% for filesystem overhead
           size=$(( 5 * $size / 4))
           dd if=/dev/zero of=$out bs=1024 count=$size
-          mke2fs -t ext4 -j -d tmp $out
+          mke2fs -t ext4 -j -d $tree $out
         '';
     };
   };

modules/outputs/jffs2.nix

@@ -34,12 +34,8 @@ in
         in runCommand "make-jffs2" {
           depsBuildBuild = [ mtdutils ];
         } ''
-          cp -a ${o.rootfsFiles} tmp
-          ${if config.boot.loader.extlinux.enable
-            then "(cd tmp && ln -s ${o.extlinux} boot)"
-            else ""
-          }
-          (cd tmp && mkfs.jffs2 --compression-mode=size ${endian} -e ${toString config.hardware.flash.eraseBlockSize} --enable-compressor=lzo --pad --root . --output $out --squash --faketime )
+          tree=${o.bootablerootdir}
+          (cd $tree && mkfs.jffs2 --compression-mode=size ${endian} -e ${toString config.hardware.flash.eraseBlockSize} --enable-compressor=lzo --pad --root . --output $out --squash --faketime )
         '';
     };
   };

modules/outputs/ubifs.nix

@@ -36,12 +36,8 @@ in
           depsBuildBuild = [ mtdutils ];
         } ''
           mkdir tmp
-          cp -a ${o.rootfsFiles} tmp
-          ${if config.boot.loader.extlinux.enable
-            then "(cd tmp && ln -s ${o.extlinux} boot)"
-            else ""
-           }
-          mkfs.ubifs -x favor_lzo -c ${cfg.maxLEBcount} -m ${cfg.minIOSize} -e ${cfg.eraseBlockSize}  -y -r tmp --output $out  --squash-uids -o $out
+          tree=${o.bootablerootdir}
+          mkfs.ubifs -x favor_lzo -c ${cfg.maxLEBcount} -m ${cfg.minIOSize} -e ${cfg.eraseBlockSize}  -y -r $tree --output $out  --squash-uids -o $out
         '';
     };
   };