diff --git a/Cargo.lock b/Cargo.lock index 989f0e8..59d33b4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2488,7 +2488,7 @@ dependencies = [ [[package]] name = "probe" -version = "0.6.7" +version = "0.6.8" dependencies = [ "anyhow", "clap", diff --git a/probe/Cargo.toml b/probe/Cargo.toml index 92aba9b..18b1ce9 100644 --- a/probe/Cargo.toml +++ b/probe/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "probe" -version = "0.6.7" +version = "0.6.8" edition = "2024" license-file = "../LICENSE" description = "Dynamic network probe daemon for Cheburcheck" diff --git a/probe/debian/cheburprobe.default b/probe/debian/cheburprobe.default index bc4a9e5..2e8156a 100644 --- a/probe/debian/cheburprobe.default +++ b/probe/debian/cheburprobe.default @@ -1,4 +1,4 @@ -# Required: probe ID and token. Request them at https://forms.gle/nZqBfXC65GebUKWB9. +# Required: reporter id and token. You can request them at support@cheburcheck.ru. PROBE_ID= PROBE_TOKEN= diff --git a/probe/install.sh b/probe/install.sh index 5a35dff..4216e71 100644 --- a/probe/install.sh +++ b/probe/install.sh @@ -235,7 +235,7 @@ install_package() { case "$PLATFORM" in debian) log "installing $PACKAGE" - apt-get install -y "$WORK_DIR/$PACKAGE" + apt-get -o Dpkg::Options::=--force-confold install -y "$WORK_DIR/$PACKAGE" ;; openwrt-apk) set -- "$WORK_DIR/$PACKAGE" diff --git a/probe/src/update.rs b/probe/src/update.rs index c598971..ce211f7 100644 --- a/probe/src/update.rs +++ b/probe/src/update.rs @@ -382,7 +382,10 @@ fn install(kind: PackageKind, package: &Path, luci_package: Option<&Path>) -> Re match kind { PackageKind::Debian => { run_paths("dpkg-deb", &[Path::new("--info"), package])?; - run_paths("dpkg", &[Path::new("-i"), package])?; + run_paths( + "dpkg", + &[Path::new("--force-confold"), Path::new("-i"), package], + )?; run_args("systemctl", &["try-restart", "cheburprobe.service"]) } PackageKind::Apk => {