Skip to content

Commit

Permalink
Fix message after {fedora|centos}container creation
Browse files Browse the repository at this point in the history
If the backingstore is not 'dir', then lxc shouldn't ask the user
to change the password by performing a 'chroot'. Rather, the user
should start, attach, use the passwd command, and then stop the
container.

Fixes #731

Signed-off-by: Nehal J Wani <nehaljw.kkd1@gmail.com>
  • Loading branch information
nehaljwani committed Jan 28, 2016
1 parent 6361a0f commit d510d52
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 2 deletions.
12 changes: 11 additions & 1 deletion templates/lxc-centos.in
Expand Up @@ -916,7 +916,16 @@ then
else
if [ ${root_expire_password} = "yes" ]
then
echo "
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
root password or wish to change it without starting the container, you
Expand All @@ -925,5 +934,6 @@ also reset the expired flag):
chroot ${rootfs_path} passwd
"
fi
fi
fi
12 changes: 11 additions & 1 deletion templates/lxc-fedora.in
Expand Up @@ -1468,7 +1468,16 @@ then
else
if [ ${root_expire_password} = "yes" ]
then
echo "
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
root password or wish to change it without starting the container, you
Expand All @@ -1477,5 +1486,6 @@ also reset the expired flag):
chroot ${rootfs_path} passwd
"
fi
fi
fi

0 comments on commit d510d52

Please sign in to comment.