← Back to branch summary

~rodsmith/maas-cert-server/fix-deployment-failures

« back to all changes in this revision

Viewing changes to usr/sbin/maniacs-setup

  • Committer: Jeff Lane
  • Author(s): Rod Smith
  • Date: 2016-04-06 14:45:29 UTC
  • mfrom: (50.1.1 012-fix-user-dir)
  • Revision ID: jeff_lane-20160406144529-fv5ktgyepptfkvmk
Fix maniacs-setup to support user directory with name other than username; for instance, if user fred's home directory is /home/flintstone.

Show diffs side-by-side

added added

removed removed

Lines of Context:
usr/sbin/maniacs-setup
131
131
        echo "Exiting!"
132
132
        exit 1
133
133
    fi
 
134
    DEFAULT_USERDIR=`eval echo ~$DEFAULT_USER`
134
135
    FIXED_POINT_URL=http://certification-static.canonical.com/fixed-point-releases/
135
136
    MIRROR_FROM_ARCHIVE=`grep -v -e cdrom -e extras -e deb-src -e "#" /etc/apt/sources.list | grep "main" | head -n1 | cut -d " " -f 2`
136
137
    # No check on MIRROR_FROM_ARCHIVE because it's shown to the user, who can
321
322
        return
322
323
    fi
323
324
    echo "* Setting up SSH keys for $DEFAULT_USER"
324
 
    if [ ! -e /home/$DEFAULT_USER/.ssh/id_rsa ]; then
325
 
        su -l $DEFAULT_USER -c "ssh-keygen -N '' -f /home/$DEFAULT_USER/.ssh/id_rsa"
 
325
    if [ ! -e $DEFAULT_USERDIR/.ssh/id_rsa ]; then
 
326
        su -l $DEFAULT_USER -c "ssh-keygen -N '' -f $DEFAULT_USERDIR/.ssh/id_rsa"
326
327
    fi
327
 
    maas admin sshkeys new key="$(cat /home/$DEFAULT_USER/.ssh/id_rsa.pub)" || true
328
 
    if [ -f /home/$DEFAULT_USER/.ssh/authorized_keys ] ; then
329
 
        echo "* Adding keys in /home/$DEFAULT_USER/.ssh/authorized_keys"
 
328
    maas admin sshkeys new key="$(cat /$DEFAULT_USERDIR/.ssh/id_rsa.pub)" || true
 
329
    if [ -f $DEFAULT_USERDIR/.ssh/authorized_keys ] ; then
 
330
        echo "* Adding keys in $DEFAULT_USERDIR/.ssh/authorized_keys"
330
331
        local line
331
332
        while read line ; do
332
333
            maas admin sshkeys new key="$line" || true
333
 
        done < /home/$DEFAULT_USER/.ssh/authorized_keys
 
334
        done < $DEFAULT_USERDIR/.ssh/authorized_keys
334
335
    fi
335
336
    if [ -f /etc/ssh/ssh_config ] ; then
336
337
        sed -i '/StrictHostKeyChecking/d' /etc/ssh/ssh_config
938
939
 
939
940
fi
940
941
 
941
 
if [ -f /home/$DEFAULT_USER/.maascli.db ] ; then
942
 
    chown $DEFAULT_USER: /home/$DEFAULT_USER/.maascli.db
 
942
if [ -f $DEFAULT_USERDIR/.maascli.db ] ; then
 
943
    chown $DEFAULT_USER: $DEFAULT_USERDIR/.maascli.db
943
944
fi
944
945
 
945
946
echo