From 16334b46d7a751f25b723c7918b0da612ae0d7c7 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Tue, 21 Aug 2018 19:53:49 +0000
Subject: Tweak the Makefile Minor change to mountfs boot script when stopping.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11455 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 Makefile                       | 10 +++++-----
 bootscripts/lfs/init.d/mountfs |  2 ++
 chapter01/changelog.xml        | 10 ++++++++++
 packages.ent                   |  2 +-
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 5e0d9136d..3dacb1850 100644
--- a/Makefile
+++ b/Makefile
@@ -158,11 +158,11 @@ $(BASEDIR)/wget-list: stylesheets/wget-list.xsl chapter03/chapter03.xml \
 	@echo "Generating consolidated wget list at $(BASEDIR)/wget-list ..."
 	$(Q)mkdir -p $(BASEDIR)
 
-	$(Q)xsltproc --nonet --xinclude                    \
-                --stringparam profile.revision $(REV) \
-                --output $(RENDERTMP)/sysd-wget.xml   \
-                stylesheets/lfs-xsl/profile.xsl       \
-                chapter03/chapter03.xml
+	#$(Q)xsltproc --nonet --xinclude                    \
+   #             --stringparam profile.revision $(REV) \
+   #             --output $(RENDERTMP)/sysd-wget.xml   \
+   #             stylesheets/lfs-xsl/profile.xsl       \
+   #             chapter03/chapter03.xml
 
 	$(Q)xsltproc --xinclude --nonet            \
                 --output $(BASEDIR)/wget-list \
diff --git a/bootscripts/lfs/init.d/mountfs b/bootscripts/lfs/init.d/mountfs
index 2509f30de..ee7dcf5f7 100644
--- a/bootscripts/lfs/init.d/mountfs
+++ b/bootscripts/lfs/init.d/mountfs
@@ -54,6 +54,8 @@ case "${1}" in
    stop)
       # Don't unmount virtual file systems like /run
       log_info_msg "Unmounting all other currently mounted file systems..."
+      # Ensure any loop devies are removed
+      losetup -D
       umount --all --detach-loop --read-only \
              --types notmpfs,nosysfs,nodevtmpfs,noproc,nodevpts >/dev/null
       evaluate_retval
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 342647fc1..e536b9224 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -42,6 +42,16 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
 -->
+    <listitem revision="sysv">
+      <para>2018-08-20</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Ensure loop devices are detached when
+          shutting down.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2018-08-16</para>
       <itemizedlist>
diff --git a/packages.ent b/packages.ent
index e8d800db1..34f5986b5 100644
--- a/packages.ent
+++ b/packages.ent
@@ -374,7 +374,7 @@
 <!ENTITY less-ch6-du "3.9 MB">
 <!ENTITY less-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY lfs-bootscripts-version "20170626">      <!-- Scripts depend on this format -->
+<!ENTITY lfs-bootscripts-version "20180820">      <!-- Scripts depend on this format -->
 <!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB">        
 <!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
 <!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM">  
-- 
cgit v1.2.3-54-g00ecf