From: KATOH Yasufumi <karma@jazz.email.ne.jp>
Date: Tue, 12 Sep 2017 06:29:34 +0000 (+0900)
Subject: plamo: Delete unnecessary process during container shutdown
X-Git-Tag: lxc-2.0.9~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c5f4f18e57accaa77f45dc811ca638c4d33ef99;p=thirdparty%2Flxc.git

plamo: Delete unnecessary process during container shutdown

Since some remounts/umounts is executed in the plamo shutdown script,
the filesystem on where a container exists might be mount as
read-only. This patch delete some mounts and umounts from the shutdown
script. It also delete hwclock setting process.

And delete an unncecessary output.

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
---

diff --git a/templates/lxc-plamo.in b/templates/lxc-plamo.in
index c96e23e11..eddd07576 100644
--- a/templates/lxc-plamo.in
+++ b/templates/lxc-plamo.in
@@ -186,7 +186,8 @@ configure_plamo() {
   # glibc configure
   mv $rootfs/etc/ld.so.conf{.new,}
   chroot $rootfs ldconfig
-  echo "Please change root password!"
+
+  # delete unnecessary process from rc.S
   ed - $rootfs/etc/rc.d/rc.S <<- "EOF"
 	/^mount -w -n -t proc/;/^mkdir \/dev\/shm/-1d
 	/^mknod \/dev\/null/;/^# Clean \/etc\/mtab/-2d
@@ -194,13 +195,22 @@ configure_plamo() {
 	/^# Check the integrity/;/^# Clean up temporary/-1d
 	w
 	EOF
-  # /etc/rc.d/rc.M
+
+  # delete unnecessary process from rc.M
   ed - $rootfs/etc/rc.d/rc.M <<- "EOF"
 	/^# Screen blanks/;/^# Initialize ip6tables/-1d
 	/^# Initialize sysctl/;/^echo "Starting services/-1d
 	/^sync/;/^# All done/-1d
 	w
 	EOF
+
+  # delete unnecessary process from rc.6
+  ed - $rootfs/etc/rc.d/rc.6 <<- "EOF"
+	/^# Save system time/;/^# Unmount any remote filesystems/-1d
+	/^# Turn off swap/;/^# See if this is a powerfail situation/-1d
+	w
+	EOF
+
   # /etc/rc.d/rc.inet1.tradnet
   head -n-93 $rootfs/sbin/netconfig.tradnet > /tmp/netconfig.rconly
   cat <<- EOF >> /tmp/netconfig.rconly