Merge pull request #773 from nehaljwani/fix-lxc-create-report

templates/lxc-centos.in

@@ -916,6 +916,15 @@ then
 else
     if [ ${root_expire_password} = "yes" ]
     then
+        if ( mountpoint -q -- "${rootfs_path}" )
+        then
+            echo "To reset the root password, you can do:
+
+        lxc-start -n ${name}
+        lxc-attach -n ${name} -- passwd
+        lxc-stop -n ${name}
+"
+        else
            echo "
 The root password is set up as "expired" and will require it to be changed
 at first login, which you should do as soon as possible.  If you lose the
@@ -926,4 +935,5 @@ also reset the expired flag):
         chroot ${rootfs_path} passwd
 "
         fi
+    fi
 fi

templates/lxc-fedora.in

@@ -1468,6 +1468,15 @@ then
 else
     if [ ${root_expire_password} = "yes" ]
     then
+        if ( mountpoint -q -- "${rootfs_path}" )
+        then
+            echo "To reset the root password, you can do:
+
+        lxc-start -n ${name}
+        lxc-attach -n ${name} -- passwd
+        lxc-stop -n ${name}
+"
+        else
            echo "
 The root password is set up as "expired" and will require it to be changed
 at first login, which you should do as soon as possible.  If you lose the
@@ -1478,4 +1487,5 @@ also reset the expired flag):
         chroot ${rootfs_path} passwd
 "
         fi
+    fi
 fi