From 2fcf0222f72d1610cb682ad156942597166da529 Mon Sep 17 00:00:00 2001 From: Tomas Barton Date: Fri, 11 Mar 2016 22:18:40 +0100 Subject: [PATCH 1/2] fix comparing string to a number --- common/download.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/download.sh b/common/download.sh index 900159b..38e8975 100755 --- a/common/download.sh +++ b/common/download.sh @@ -39,7 +39,7 @@ elif [ ${DISTRIBUTION} = 'fedora' -a "${RELEASE}" = 'rawhide' ]; then utils.lxc.create -t fedora --\ --release ${RELEASE} \ --arch ${ARCH} -elif [ ${DISTRIBUTION} = 'fedora' -a ${RELEASE} -ge 21 ]; then +elif [[ ( ${DISTRIBUTION} = 'fedora' ) && ( ${RELEASE} -ge 21 ) ]]; then ARCH=$(echo ${ARCH} | sed -e "s/38/68/" | sed -e "s/amd64/x86_64/") utils.lxc.create -t fedora --\ --release ${RELEASE} \ From 78ca2defaa58c79ed6bd1a4bba8f3540fb165686 Mon Sep 17 00:00:00 2001 From: Tomas Barton Date: Sat, 12 Mar 2016 16:24:46 +0100 Subject: [PATCH 2/2] disable password againg for root --- common/prepare-vagrant-user.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/common/prepare-vagrant-user.sh b/common/prepare-vagrant-user.sh index ae516e9..f45238a 100755 --- a/common/prepare-vagrant-user.sh +++ b/common/prepare-vagrant-user.sh @@ -22,6 +22,12 @@ elif [ ${DISTRIBUTION} = 'centos' -o ${DISTRIBUTION} = 'fedora' ]; then chroot ${ROOTFS} useradd --create-home -s /bin/bash -u 1000 vagrant &>> ${LOG} echo -n 'vagrant:vagrant' | chroot ${ROOTFS} chpasswd sed -i 's/^Defaults\s\+requiretty/# Defaults requiretty/' $ROOTFS/etc/sudoers + if [ ${RELEASE} -eq 6 ]; then + info 'Disabling password aging for root...' + # disable password aging (required on Centos 6) + # pretend that password was changed today (won't fail during provisioning) + chroot ${ROOTFS} chage -I -1 -m 0 -M 99999 -E -1 -d `date +%Y-%m-%d` root + fi else debug 'Creating vagrant user...' chroot ${ROOTFS} useradd --create-home -s /bin/bash vagrant &>> ${LOG}