## veeam报错

 : Failed to prepare the worker veeam: Failed to deploy the worker VM: Cannot access a closed Stream.  

## 解决方案

打开proxmox数据中心-存储-local

 
![image.png](/static/img/d52d1e93f346d5c1f3756f0c4cc68928.image.webp)

确保包含container template，并勾选enable

![image.png](/static/img/d51483f1a15e3fbebf3556b06e580b6c.image.webp)

重新备份

![image.png](/static/img/48fad072f47707c52fa5e4c3c5849835.image.webp)

veeam备份proxmox失败

>本文为转载文章
>
>原文作者: JiangOil
>
>原文链接:https://www.codebonobo.tech/post/37

## Ubuntu 24.04 安装 DaVinci Resolve

### Step1: 下载并安装
```bash
chmod +x DaVinci_Resolve_Studio_19.0_Linux.run
sudo ./DaVinci_Resolve_Studio_19.0_Linux.run -i
```

可能会遇到依赖的问题, 需要先安装以下的几个库, 再以跳过检测的方式安装.
```
sudo apt install libapr1 libaprutil1 libasound2 libglib2.0-0
sudo SKIP_PACKAGE_CHECK=1 ./DaVinci_Resolve_Studio_19.0_Linux.run -i
```

### Step2: 排错
启动时可能会遇到如下的错误:
```bash
/opt/resolve/bin/resolve
/opt/resolve/bin/resolve: symbol lookup error: /lib/x86_64-linux-gnu/libpango-1.0.so.0: undefined symbol: g_once_init_leave_pointer
```

主要问题是davinci用了一些自已的库, 这些库在ubuntu24.04上又不能正常运行. 其实这些库在ubuntu上是有自带的版本的. 我们需要把这些库给换个位置, 让davinci用系统自带的库.
```bash
sudo mkdir /opt/resolve/libs/unneeded
sudo mv /opt/resolve/libs/libgio* /opt/resolve/libs/unneeded/
sudo mv /opt/resolve/libs/libglib* /opt/resolve/libs/unneeded/
sudo mv /opt/resolve/libs/libgmodule* /opt/resolve/libs/unneeded/
```
>原文作者: JiangOil
>
>原文链接:https://www.codebonobo.tech/post/37
>
>版权声明:本博客所有文章除特别声明外，均采用 BY-NC-SA 许可协议。转载请注明出处！

ubuntu gxde等安装 DaVinci Resolve

背景：我现在想让git中dev分支加入Thunder分支的修改到dev分支，但是更改内容我来定，因为dev分支是适配某专门的设备有特定代码，Thunder分支是功能更新代码

git中A分支想加入B分支的修改到A分支

### 添加上游仓库
`git remote add upstream https://gitee.com/spark-store-project/Spark-Update-Tool.git`
### 查看
```
momen@momen-ASUS:~/Desktop/momen-clone/spark-store$ git remote -v
origin  https://gitee.com/momen_official/spark-store.git (fetch)
origin  https://gitee.com/momen_official/spark-store.git (push)
spark-update-tool       https://gitee.com/spark-store-project/Spark-Update-Tool.git (fetch)
spark-update-tool       https://gitee.com/spark-store-project/Spark-Update-Tool.git (push)
upstream        https://gitee.com/spark-store-project/spark-store.git (fetch)
upstream        https://gitee.com/spark-store-project/spark-store.git (push)
```
### 获取上游dev更新
git fetch spark-update-tool dev
git merge spark-update-tool/dev

### 把远程代码合并到你的本地目录
`git subtree pull --prefix=Spark-Update-Tool spark-update-tool dev`

`git subtree pull --prefix=Spark-Update-Tool spark-update-tool dev --squash`不保留远程提交日志）

### 强制保留远程修改
`git reset --hard Spark-Update-Tool/dev`

仓库里套子仓库单独拉取上游代码

### 添加上游仓库
git remote add upstream https://gitee.com/spark-store-project/spark-store.git

### 查看
```
momen@momen-ASUS:~/Desktop/momen-clone/spark-store$ git remote -v
origin  https://gitee.com/momen_official/spark-store.git (fetch)
origin  https://gitee.com/momen_official/spark-store.git (push)
upstream        https://gitee.com/spark-store-project/spark-store.git (fetch)
upstream        https://gitee.com/spark-store-project/spark-store.git (push)
```

### 获取上游更新
`git fetch upstream`

### 合并上游主分支更新

`git checkout master`
`git merge upstream/master`


### 错误解决：
`致命错误：您尚未结束您的合并（存在 MERGE_HEAD）。 请在合并前先提交您的修改。取消当前合并（安全回退）`

解决方案：`git merge --abort`

强制清理：`git reset --merge`

回退到某提交ID：`git checkout e49f4baa87eb8f3adba1616ce018765faeb90d9d`