]> git.proxmox.com Git - mirror_lxc.git/commitdiff
plamo: Delete unnecessary process during container shutdown
authorKATOH Yasufumi <karma@jazz.email.ne.jp>
Tue, 12 Sep 2017 06:29:34 +0000 (15:29 +0900)
committerStéphane Graber <stgraber@ubuntu.com>
Sun, 24 Sep 2017 04:23:38 +0000 (00:23 -0400)
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>
templates/lxc-plamo.in

index d59c49bfc22d7ae1a1f66efa9cb82c4166716ffa..ec442ec3ab12210d59ad08ab1f4b16c32b4b2ee0 100644 (file)
@@ -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