From 331a8ea53b35aa26c266fed15951734dab996ac1 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 17 Aug 2023 17:37:35 -0400 Subject: [PATCH] Fix --sysroot The default sysroot we want is /, explicitly saying `--sysroot=/sysroot` today ends up confusing ostree because we don't bind mount `/boot` with `/sysroot/boot`. --- ostree-restore.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ostree-restore.sh b/ostree-restore.sh index b278fcb..aaafe8f 100755 --- a/ostree-restore.sh +++ b/ostree-restore.sh @@ -27,10 +27,10 @@ cp pull-secret.json /etc/ostree/auth.json ostree container unencapsulate --repo /ostree/repo $base_container | tee /tmp/unencapsulate.base ostree refs --create base $(cut -d ' ' -f 2 < /tmp/unencapsulate.base) -ostree admin os-init --sysroot /sysroot $new_osname +ostree admin os-init $new_osname log_it Deploying new stateroot -ostree admin deploy --retain --sysroot /sysroot --os $new_osname base -ostree_deploy=$(ostree admin status --sysroot /sysroot|awk /$new_osname/'{print $2}') +ostree admin deploy --retain --os $new_osname base +ostree_deploy=$(ostree admin status |awk /$new_osname/'{print $2}') log_it Restoring /var ostree cat backup /var.tgz | tar xzC /ostree/deploy/$new_osname --selinux