Merge ~natureshadow/ltsp:boot-method-nfsi into ltsp:master

[Dominik George]

This change allows the loading of a squashfs image over NFS instead of NBD by setting a boot method of NFSI (cf. https://sourceforge.net/p/ltsp/mailman/message/36669125/)

I am not sure about selecting the image name by $ARCH. Please give feedback on that.

Unmerged commits

2b8e8fe... by Dominik George <email address hidden> on 2019-06-06

Support NFSI boot method everywhere.

NFSI means NFS image and can be used to mounta (squash)fs image over
NFS instead of NBS.

diff --git a/client/Debian/etc/ltsp/update-kernels.conf b/client/Debian/etc/ltsp/update-kernels.conf
index f6e7bd4..bef0870 100644
--- a/client/Debian/etc/ltsp/update-kernels.conf
+++ b/client/Debian/etc/ltsp/update-kernels.conf
@@ -13,7 +13,7 @@
 #IFCPU64=true
 
 # Supported boot methods
-BOOT_METHODS="NBD AOE NFS"
+BOOT_METHODS="NBD NFSI AOE NFS"
 
 # Default commandline arguments common to all boot methods
 CMDLINE_LINUX_DEFAULT="init=/sbin/init-ltsp quiet"
@@ -21,6 +21,9 @@ CMDLINE_LINUX_DEFAULT="init=/sbin/init-ltsp quiet"
 # Commandline used with NFS root
 CMDLINE_NFS="root=/dev/nfs ip=dhcp boot=nfs"
 
+# Commandline used with NFSI (squashfs image over NFS) root
+CMDLINE_NFSI="$CMDLINE_NFS nfsroot=$BASE/images ltsploop=$ARCH.img"
+
 # Commandline used with NBD root
 CMDLINE_NBD="root=/dev/nbd0"
 
diff --git a/client/Debian/share/initramfs-tools/scripts/nfs-bottom/ltsploop b/client/Debian/share/initramfs-tools/scripts/nfs-bottom/ltsploop
index 12bc460..d9d5a37 100755
--- a/client/Debian/share/initramfs-tools/scripts/nfs-bottom/ltsploop
+++ b/client/Debian/share/initramfs-tools/scripts/nfs-bottom/ltsploop
@@ -2,11 +2,11 @@
 
 # Quick hack to mount an image file over NFS, as an alternative to NBD mounts.
 #
-# Requires specifying nfsroot=/opt/ltsp/images and ltsploop=ARCH.img on the
+# Requires specifying nfsroot=$BASE/images and ltsploop=ARCH.img on the
 # commandline. ltsploopfs=FS can be used to specify the filesystem, defaults to
 # "squashfs"
 #
-# Also needs a dummy /opt/ltsp/images/sbin/init-ltsp to be an executable file
+# Also needs a dummy $BASE/images/sbin/init-ltsp to be an executable file
 # to work around a bug/feature in initramfs-tools's nfs mount checks...
 
 PREREQ=""
diff --git a/client/Redhat/etc/ltsp/update-kernels.conf b/client/Redhat/etc/ltsp/update-kernels.conf
index 759be5e..a81f9bd 100644
--- a/client/Redhat/etc/ltsp/update-kernels.conf
+++ b/client/Redhat/etc/ltsp/update-kernels.conf
@@ -13,7 +13,7 @@
 #IFCPU64=true
 
 # Supported boot methods
-#BOOT_METHODS="NBD NFS AOE"
+#BOOT_METHODS="NBD NFSI NFS AOE"
 
 # Default commandline arguments common to all boot methods
 #CMDLINE_LINUX_DEFAULT="init=/sbin/init-ltsp forcepae"
@@ -21,6 +21,9 @@
 # Commandline used with NFS root
 #CMDLINE_NFS="root=dhcp"
 
+# Commandline used with NFSI (squashfs image over NFS) root
+#CMDLINE_NFSI="$CMDLINE_NFS nfsroot=$BASE/images ltsploop=$ARCH.img"
+
 # Commandline used with NBD root
 #CMDLINE_NBD="root=/dev/nbd0"
 
diff --git a/client/Ubuntu/etc/ltsp/update-kernels.conf b/client/Ubuntu/etc/ltsp/update-kernels.conf
index 453f15f..53900d1 100644
--- a/client/Ubuntu/etc/ltsp/update-kernels.conf
+++ b/client/Ubuntu/etc/ltsp/update-kernels.conf
@@ -13,7 +13,7 @@
 #IFCPU64=true
 
 # Supported boot methods
-BOOT_METHODS="NBD NFS AOE"
+BOOT_METHODS="NBD NFSI NFS AOE"
 
 # Default commandline arguments common to all boot methods
 CMDLINE_LINUX_DEFAULT="init=/sbin/init-ltsp forcepae"
@@ -21,6 +21,9 @@ CMDLINE_LINUX_DEFAULT="init=/sbin/init-ltsp forcepae"
 # Commandline used with NFS root
 CMDLINE_NFS="root=/dev/nfs ip=dhcp boot=nfs"
 
+# Commandline used with NFSI (squashfs image over NFS) root
+CMDLINE_NFSI="$CMDLINE_NFS nfsroot=$BASE/images ltsploop=$ARCH.img"
+
 # Commandline used with NBD root
 CMDLINE_NBD="root=/dev/nbd0"
 
diff --git a/client/share/ltsp/update-kernels b/client/share/ltsp/update-kernels
index 568bdb6..a9c4a71 100755
--- a/client/share/ltsp/update-kernels
+++ b/client/share/ltsp/update-kernels
@@ -95,9 +95,10 @@ CHROOT_NAME=${CHROOT_NAME:-"$(detect_arch)"}
 # Ensure default values for BOOT_METHODS, CMDLINE_LINUX_DEFAULTS, CMDLINE_NFS 
 # and CMDLINE_NBD. Distros *should* ship an /etc/ltsp/update-kernels.conf with
 # appropriate values for their distro.
-BOOT_METHODS=${BOOT_METHODS:-"NFS NBD AOE"}
+BOOT_METHODS=${BOOT_METHODS:-"NFS NBD NFSI AOE"}
 CMDLINE_LINUX_DEFAULTS=${CMDLINE_LINUX_DEFAULTS:-"ro init=/sbin/init-ltsp"}
 CMDLINE_NFS=${CMDLINE_NFS:-"root=/dev/nfs ip=dhcp"}
+CMDLINE_NFSI=${CMDLINE_NFSI:-"$CMDLINE_NFS nfsroot=$BASE/images ltsploop=$ARCH.img"}
 CMDLINE_NBD=${CMDLINE_NBD:-"root=/dev/nbd0"}
 CMDLINE_AOE=${CMDLINE_AOE:-"root=/dev/etherd/e0.0"}
 
diff --git a/server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image b/server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image
index 51b7c1b..752658b 100644
--- a/server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image
+++ b/server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image
@@ -3,6 +3,7 @@ case "$MODE" in
         add_option "squashfs-image" "`eval_gettext "create squashfs image for use with NBD"`" "advanced" "false"
         add_option "no-squashfs-image" "`eval_gettext "skip squashfs image creation"`" "advanced" "false"
         add_option "nfs-root" "`eval_gettext "use NFS instead of NBD as default"`" "advanced" "false"
+        add_option "nfs-image" "`eval_gettext "use NFS to load (squash)fs image instead of NBD as default"`" "advanced" "false"
         ;;
     configure)
         if [ -n "$option_squashfs_image_value" ]; then
@@ -17,6 +18,11 @@ case "$MODE" in
             # set an environment variable we can pick up later
             NFS_ROOT="True"
         fi
+        if [ -n "$option_nfs_image_value" ]; then
+            # set an environment variable we can pick up later
+            NFS_IMAGE="True"
+	    SQUASHFS_IMAGE="True"
+        fi
         if [ -z "$SQUASHFS_IMAGE" ]; then
             SQUASHFS_IMAGE="True"
         fi
@@ -24,7 +30,11 @@ case "$MODE" in
     after-install)
         if [ "True" = "$NFS_ROOT" ]; then
             mkdir -p $ROOT/etc/ltsp/update-kernels.conf.d
-            echo 'BOOT_METHODS="NFS NBD AOE"' > $ROOT/etc/ltsp/update-kernels.conf.d/nfs
+            echo 'BOOT_METHODS="NFS NBD NFSI AOE"' > $ROOT/etc/ltsp/update-kernels.conf.d/nfs
+        fi
+        if [ "True" = "$NFS_IMAGE" ]; then
+            mkdir -p $ROOT/etc/ltsp/update-kernels.conf.d
+            echo 'BOOT_METHODS="NFSI NFS NBD AOE"' > $ROOT/etc/ltsp/update-kernels.conf.d/nfs
         fi
         ;;
     finalization)