diff --git a/parallel-debian/gnomeos-make-image.sh b/parallel-debian/gnomeos-make-image.sh index 4a4fbc7b..75123943 100755 --- a/parallel-debian/gnomeos-make-image.sh +++ b/parallel-debian/gnomeos-make-image.sh @@ -120,8 +120,8 @@ if ! test -d ${OBJ}; then fi done - $OSTREE init --repo=ostree/repo - (cd ostree/gnomeos-origin; find . '!' -type p | grep -v '^.$' | $OSTREE commit -b gnomeos -s 'Initial import' --repo=../repo --from-stdin) + $OSTREE --repo=ostree/repo init + (cd ostree/gnomeos-origin; find . '!' -type p | grep -v '^.$' | $OSTREE --repo=../repo commit -b gnomeos -s 'Initial import' --from-stdin) ) if test -d ${OBJ}; then mv ${OBJ} ${OBJ}.old @@ -142,17 +142,17 @@ if ! test -d ${OBJ}; then cp ${SRCDIR}/debian-setup.sh ostree/gnomeos-origin/ chroot ostree/gnomeos-origin ./debian-setup.sh rm ostree/gnomeos-origin/debian-setup.sh - (cd ostree/gnomeos-origin; find . '!' -type p | grep -v '^.$' | $OSTREE commit -b gnomeos -s 'Run debian-setup.sh' --repo=../repo --from-stdin) + (cd ostree/gnomeos-origin; find . '!' -type p | grep -v '^.$' | $OSTREE --repo=../repo commit -b gnomeos -s 'Run debian-setup.sh' --from-stdin) # This is the name for the real rootfs, not the chroot (cd ostree/gnomeos-origin; mkdir sysroot; - $OSTREE commit -b gnomeos -s 'Add sysroot' --repo=../repo --add=sysroot) + $OSTREE --repo=../repo commit -b gnomeos -s 'Add sysroot' --add=sysroot) (cd ostree; - rev=$($OSTREE rev-parse --repo=repo gnomeos) - $OSTREE checkout --repo=repo ${rev} gnomeos-${rev} - $OSTREE run-triggers --repo=repo gnomeos-${rev} + rev=$($OSTREE --repo=repo rev-parse gnomeos) + $OSTREE --repo=repo checkout ${rev} gnomeos-${rev} + $OSTREE --repo=repo run-triggers gnomeos-${rev} ln -s gnomeos-${rev} current rm -rf gnomeos-origin) )