bugfixes

diff --git a/modules/autoresize.mk b/modules/autoresize.mk
index 012aec9d4ea2a0757c5337d621f10223a35cdba1..ee00f52ab57edc726a11bd8df308a010ac058716 100644 (file)
--- a/modules/autoresize.mk
+++ b/modules/autoresize.mk
@@ -24,7 +24,7 @@ if [ "$$before" = "$$after" ]; then
   case $$roottype in
     ext[234]) resize2fs "$$rootfs";;
     btrfs) btrfs filesystem resize max /;;
   case $$roottype in
     ext[234]) resize2fs "$$rootfs";;
     btrfs) btrfs filesystem resize max /;;

-    nilfs2) nilfs-resize "$$rootfs";;
+    nilfs2) nilfs-resize -y "$$rootfs";;

   esac
   systemctl disable autoresize
 else
   esac
   systemctl disable autoresize
 else

diff --git a/modules/default.mk b/modules/default.mk
index ec3f2f43caabb1f4ba97585d42fd1452bf845ee8..f93fd24797b87a45d81e1129823f01435183be12 100644 (file)
--- a/modules/default.mk
+++ b/modules/default.mk
@@ -122,6 +122,6 @@ ifdef wifi
     export wifi
     ${CFGROOT}/etc/network/interfaces.d/wifi: ${CFGROOT}
        printf 'auto wlan0\nallow-hotplug wlan0\n\niface wlan0 inet dhcp\n' >$@
     export wifi
     ${CFGROOT}/etc/network/interfaces.d/wifi: ${CFGROOT}
        printf 'auto wlan0\nallow-hotplug wlan0\n\niface wlan0 inet dhcp\n' >$@

-       printf '  wireless-ssid "%s"\n' "$$wifi" >>$@
+       printf '  wireless-essid "%s"\n' "$$wifi" >>$@

   endif
 endif
   endif
 endif