From 794c0543f354563a3499220080b42e6d257e3838 Mon Sep 17 00:00:00 2001 From: Kroese Date: Sat, 20 May 2023 01:38:11 +0200 Subject: [PATCH 1/3] Packages --- run/install.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/run/install.sh b/run/install.sh index 3ddf6ce..992df1e 100644 --- a/run/install.sh +++ b/run/install.sh @@ -178,9 +178,10 @@ sfdisk -q "$SYSTEM" < "$PART" info "Install: Extracting system partition..." MOUNT="$TMP/system" - rm -rf "$MOUNT" && mkdir -p "$MOUNT" -mv -f "$HDA.tgz" "$HDA.txz" + +mv "$HDA.tgz" "$HDA.txz" +mv "$PKG/" "$MOUNT/.SynoUpgradePackages/" tar xpfJ "$HDP.txz" --absolute-names -C "$MOUNT/" tar xpfJ "$HDA.txz" --absolute-names -C "$MOUNT/" @@ -188,10 +189,6 @@ tar xpfJ "$IDB.txz" --absolute-names -C "$MOUNT/usr/syno/synoman/indexdb/" # Install Agent -LOC="$MOUNT/usr/local" -mkdir -p "$LOC" -mv "$PKG/" "$LOC/" - LOC="$MOUNT/usr/local/bin" mkdir -p "$LOC" cp /agent/agent.sh "$LOC/agent.sh" From 35c9167af4b7feaebb7c82693a7080bc3a59bf59 Mon Sep 17 00:00:00 2001 From: Kroese Date: Sat, 20 May 2023 01:48:40 +0200 Subject: [PATCH 2/3] Packages --- run/install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/run/install.sh b/run/install.sh index 992df1e..9103323 100644 --- a/run/install.sh +++ b/run/install.sh @@ -182,6 +182,7 @@ rm -rf "$MOUNT" && mkdir -p "$MOUNT" mv "$HDA.tgz" "$HDA.txz" mv "$PKG/" "$MOUNT/.SynoUpgradePackages/" +rm -f "$MOUNT/.SynoUpgradePackages/ActiveInsight.spk" tar xpfJ "$HDP.txz" --absolute-names -C "$MOUNT/" tar xpfJ "$HDA.txz" --absolute-names -C "$MOUNT/" From 8cbe226206d50cbad5164dee711a8ac336dca7c2 Mon Sep 17 00:00:00 2001 From: Kroese Date: Sat, 20 May 2023 01:53:46 +0200 Subject: [PATCH 3/3] Packages --- run/install.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/run/install.sh b/run/install.sh index 9103323..48ec952 100644 --- a/run/install.sh +++ b/run/install.sh @@ -97,8 +97,8 @@ PAT="/$BASE.pat" rm -f "$PAT" { wget "$URL" -O "$PAT" -q --no-check-certificate --show-progress "$PROGRESS"; rc=$?; } || : -(( rc != 0 )) && error "Failed to download $URL, reason: $rc" && exit 69 +(( rc != 0 )) && error "Failed to download $URL, reason: $rc" && exit 69 [ ! -f "$PAT" ] && error "Failed to download $URL" && exit 69 SIZE=$(stat -c%s "$PAT") @@ -129,7 +129,6 @@ HDP="$TMP/synohdpack_img" [ ! -d "$PKG" ] && error "The PAT file contains no packages." && exit 68 BOOT=$(find "$TMP" -name "*.bin.zip") - [ ! -f "$BOOT" ] && error "The PAT file contains no boot file." && exit 67 BOOT=$(echo "$BOOT" | head -c -5) @@ -142,7 +141,6 @@ SYSTEM_SIZE=4954537983 # Check free diskspace SPACE=$(df --output=avail -B 1 "$TMP" | tail -n 1) - (( SYSTEM_SIZE > SPACE )) && error "Not enough free space to create a 4 GB system disk." && exit 87 if ! fallocate -l "${SYSTEM_SIZE}" "${SYSTEM}"; then