fixed mp-commit and its use

Now this is ugly: instead of commoditizing the repetitive code
the result ended up working differently by creating several
repositories for the target subdirs instead of the single one
for the generated subprofile as a whole.

This results in .disk/profile.tgz being basically useless
in every image since c4311108ea.
This commit is contained in:
Michael Shigorin 2013-02-06 10:54:00 +04:00
parent ec8bcac5ff
commit ad264c7033
2 changed files with 8 additions and 2 deletions

View File

@ -3,13 +3,19 @@
. shell-error . shell-error
INIT=
if [ "$1" = "-i" ]; then
INIT=yes
shift
fi
[ -d "$1" ] || fatal "$1 is not an existing directory" [ -d "$1" ] || fatal "$1 is not an existing directory"
if type -t git >&/dev/null && pushd "$1" >/dev/null; then if type -t git >&/dev/null && pushd "$1" >/dev/null; then
if [ -z "$(git config --global user.name)" ]; then if [ -z "$(git config --global user.name)" ]; then
exit 0 exit 0
fi fi
if [ ! -d .git ]; then if [ -n "$INIT" -a ! -d .git ]; then
git init -q || fatal "git init failed" git init -q || fatal "git init failed"
fi fi
if [ -n "$(git status -s)" ]; then if [ -n "$(git status -s)" ]; then

View File

@ -65,7 +65,7 @@ profile/init: distclean
fi >&2; \ fi >&2; \
exit 1; \ exit 1; \
fi; \ fi; \
mp-commit "$(BUILDDIR)" "derivative profile initialized"; \ mp-commit -i "$(BUILDDIR)" "derivative profile initialized"; \
if [ -w . ]; then \ if [ -w . ]; then \
rm -f "$(SYMLINK)" && \ rm -f "$(SYMLINK)" && \
ln -s "$(BUILDDIR)" "$(SYMLINK)" && \ ln -s "$(BUILDDIR)" "$(SYMLINK)" && \