X-Git-Url: http://git.plutz.net/?p=blast;a=blobdiff_plain;f=modules%2Flive.mk;h=fcf2a9eff6a2b2ad67a2c98225986c4dc182af51;hp=d58a645c061a825b63891f94f336c415350f4b56;hb=fbf5b8ce302dc8dcd12861f9ec820a7a4ca99a5b;hpb=227bf7e16154dfc27187bd69595bfb24d5f8d16f

diff --git a/modules/live.mk b/modules/live.mk
index d58a645..fcf2a9e 100644
--- a/modules/live.mk
+++ b/modules/live.mk
@@ -1,17 +1,21 @@
-PACKAGES += bilibop-lockfs
+PACKAGES += bilibop-lockfs live-boot live-boot-initramfs-tools
 
-.PHONY: _live _live_sudo _live_sudo_users
+.PHONY: _live_lockfs _live_sudo _live_sudo_users _live_modules
 
 ifdef users
   _config: _live_sudo_users
 endif
 
-_umount: _live
-_live: ${CFGROOT} _bootloader
-	grep -x aufs "$${CFGROOT}/etc/initramfs-tools" || printf 'aufs\n' >>"$${CFGROOT}/etc/initramfs-tools/modules"
-	sed -i 's; root=; lockfs=1G root=;' "$${CFGROOT}/boot/bootmenu.cfg" "$${CFGROOT}/boot/grub.cfg"
+_live_modules: ${CFGROOT}
+	printf 'aufs\n' >>"$${CFGROOT}/etc/initramfs-tools/modules"
+	sed -i 's;^MODULES=.*$$;MODULES=netboot;' "$${CFGROOT}/etc/initramfs-tools/initramfs.conf"
 
-_config: _live_sudo
+_umount: _live_lockfs
+_live_lockfs: ${CFGROOT} _bootloader
+	sed -i 's; root=; lockfs=1G root=;' "$${CFGROOT}/boot/bootmenu.cfg" "$${CFGROOT}/boot/grub.cfg" \
+	|| sed -i 's; root=; lockfs=1G root=;' "$${CFGROOT}/boot/cmdline.txt"
+
+_config: _live_sudo _live_modules
 _live_sudo: ${CFGROOT}/etc/sudoers.d/nopassword
 _live_sudo: ${CFGROOT}/var/lib/polkit-1/localauthority/50-local.d/disable-passwords.pkla