X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;ds=sidebyside;f=fai%2Fconfig%2Fdistro-install-common%2Fend;h=79238a551213d54d33195b06719220c96bad1e83;hb=81e0e0b826ebffdee7d809ee4dff1338af7692e1;hp=e6e182b82a82afbdc58aff3af9834574f8ac584d;hpb=d3d495af167adba91b190e8dcb95649c34fa04c7;p=automated-distro-installer diff --git a/fai/config/distro-install-common/end b/fai/config/distro-install-common/end index e6e182b..79238a5 100755 --- a/fai/config/distro-install-common/end +++ b/fai/config/distro-install-common/end @@ -1,7 +1,7 @@ #!/bin/bash -x set -eE -o pipefail -trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR +trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR @@ -31,13 +31,10 @@ $ROOTCMD rm -rf /root/.unison $ROOTCMD ln -sf $dir /root $ROOTCMD ln -sf /q/p / +chown -R 1000:1000 $dir while true; do $ROOTCMD chown 1000:1000 $dir $ROOTCMD chmod 700 $dir dir=$(dirname $dir) [[ $dir != /q ]] || break done - -# kvm is normally created by some package, -# but unison doesn't like unknown groups, so make it now so initial sync works. -$ROOTCMD groupadd -r kvm || [[ $? == 9 ]]